From 97a0fd7afc3df59348b5015d4bf15bbc802ec784 Mon Sep 17 00:00:00 2001 From: huahaiyan <3686255842@qq.com> Date: Fri, 1 Mar 2024 14:00:47 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=98=BE=E7=A4=BA=EF=BC=9B=202=E3=80=81?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=BB=E6=99=B4=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chinese.qm | Bin 274533 -> 274807 bytes chinese.ts | 2245 ++++++++-------- datafile/datafiledsr.cpp | 18 + datafile/embdata.cpp | 10 +- english.ts | 2259 ++++++++--------- machine/comm/protocol.h | 4 +- .../patternsingleboard/mainUI/mainwidget.cpp | 4 +- 7 files changed, 2248 insertions(+), 2292 deletions(-) diff --git a/chinese.qm b/chinese.qm index 61348ff58564ae604375c8ae1edebb65f7735cbd..73fa903ee7c62790643db0b19ffd78b1da5fba82 100644 GIT binary patch delta 26043 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 delta 25833 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 BZ_WS! diff --git a/chinese.ts b/chinese.ts index a686d24..2cd7702 100644 --- a/chinese.ts +++ b/chinese.ts @@ -3377,7 +3377,7 @@ GLOBAL - + Init windows... 初始化窗体... @@ -3496,7 +3496,7 @@ - + Frequently used button1 常用按钮1 @@ -3539,15 +3539,67 @@ - - - - - - - - - + + + + + + + + + + + SpindleTest: + 主轴研车: + + + + + + + + + + + + + SewSetAnchorPoint: + + + + + + + + + + + + + + + + + + + + + + + + PunchSpindleJog: + 冲孔主轴点动: + + + + + + + + + + + @@ -3559,20 +3611,100 @@ - SpindleTest: - 主轴研车: + SewSpindleTest: + 缝纫主轴研车: - - - - - - + + + + + + + + + + + SewHookPosition: + + + + + + + + + + + + + + NeedleShuttleProofreading: + + + + + + + + + + + + + + Sewing head lifting: + 缝纫机头升降: + + + + + + + + - - - + + + + + + + + + + + + + + SewSpindleJog: + 缝纫主轴点动: + + + + + + + + + + + + + PunchSetStartPoint: + 定起始点: + + + + + + + + + + + + @@ -3583,20 +3715,58 @@ - PunchSpindleJog: - 冲孔主轴点动: + ChangeMachineSewHead: + 切换缝纫机头: - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + ChangeMachinePunchHead: + 切换冲孔机头: + + + + + + + + + + + + + Needle shuttle proofreading: + 针梭校对: + + + + + + + + + + + + @@ -3607,205 +3777,61 @@ - SewSpindleTest: - 缝纫主轴研车: - - - - - - - - - - - - - - - - - - - - - - - Sewing head lifting: - 缝纫机头升降: - - - - - - - - - - - - - - - - - - - - - - - SewSpindleJog: - 缝纫主轴点动: - - - - - - - - - - - - - - - - - - - - - - - PunchSetStartPoint: - 定起始点: - - - - - - - - - - - - - - - - - - - - - - - ChangeMachineSewHead: - 切换缝纫机头: - - - - - - - - - - - - - - - - - - - - - - - ChangeMachinePunchHead: - 切换冲孔机头: - - - - - - - - - - - - - Head 1 thread trimming: - 机头1剪线: - - - - - - - - - - - - - Head 2 thread trimming: - 机头2剪线: - - - - - - - - - - - - - - - - - - - - - - - Needle shuttle proofreading: - 针梭校对: - - - - - - - - - - - - - - - - - - - - - - BackCenter: 回中心点: + + + + + + + + + + + + + + + + + + + + + + BackAnchorPoint: + 回定位点: + + + + + + + + + + + + + EmbSetStartPoint: + 平绣定起始点: + + + + + + + + + + + + + EmbSpindleTest: + 平绣主轴研车: + @@ -3817,188 +3843,146 @@ - BackAnchorPoint: - 回定位点: - - - - - - - - - - - - - EmbSetStartPoint: - 平绣定起始点: - - - - - - - - - - - - - EmbSpindleTest: - 平绣主轴研车: - - - - - - - - - - - - EmbSpindleJog: 平绣主轴点动: - - - - - - - - - - + + + + + + + + + + EmbChangeColor: 平绣换色: - - - - - - - - - - + + + + + + + + + + EmbCutLine: 平绣剪线: - - - - - - - - - - + + + + + + + + + + ChangeMachineEmbHead: 切换平绣机头: - - - - - - - - - - + + + + + + + + + + Sew thread trimming: 缝纫剪线: - - - - - - - - - - + + + + + + + + + + Sew rotate proofreading: 缝纫旋转校对: - - - - - - - - - - + + + + + + + + + + Needle shuttle reposition: 针梭复位: - - - - - - - - - - + + + + + + + + + + Needle reset: 针复位: - - - - - - - - - - + + + + + + + + + + Shuttle reset: 梭复位: - - - - - - - - - - + + + + + + + + + + Sew rotate up: 缝纫旋转+: - - - - - - - - - - + + + + + + + + + + Sew rotate down: 缝纫旋转-: @@ -4024,25 +4008,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + AllToZero: 全部归零: @@ -4071,26 +4055,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + BackWorkPoint: 回工作点: @@ -4105,26 +4089,16 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + SetStartPoint: 定起始点: @@ -4139,26 +4113,16 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + BackStartPoint: 回起始点: @@ -4174,25 +4138,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + ForwardOrBackward: 前进回退: @@ -4207,26 +4171,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + PatternSelect: 花样选择: @@ -4241,26 +4205,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + Null: 无功能: @@ -4275,26 +4239,26 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + SetOffsetPoint: 定偏移点: @@ -4314,26 +4278,26 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + BackOffsetPoint: 回偏移点: @@ -4349,25 +4313,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + CheckFrame: 边框检查: @@ -4382,26 +4346,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + ManualColorChange: 手动换色: @@ -4430,26 +4394,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + SinglePunch: 单次冲孔: @@ -4464,26 +4428,16 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + FrameZero: 框架归零: @@ -4499,25 +4453,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + MoveToRightUp: 去右上角: @@ -4533,25 +4487,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + MoveToRightDown: 去右下角: @@ -4567,25 +4521,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + MoveToLeftUp: 去左上角: @@ -4601,25 +4555,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + MoveToLeftDown: 去左下角: @@ -4635,25 +4589,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + SetWorkRange: 定工作范围: @@ -4668,26 +4622,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + PunchStopLower: 冲头停下位: @@ -4721,64 +4675,64 @@ - - + + Frequently used button2 常用按钮2 - - + + Frequently used button3 常用按钮3 - - + + Frequently used button4 常用按钮4 - - + + Frequently used button5 常用按钮5 - - + + Frequently used button6 常用按钮6 - - + + Frequently used button7 常用按钮7 - - + + Frequently used button8 常用按钮8 - - + + Frequently used button9 常用按钮9 - - + + Frequently used button10 常用按钮10 @@ -4978,9 +4932,9 @@ - - - + + + Root 超级用户 @@ -5215,26 +5169,26 @@ 未连接 - + Ready Status：Ready 已就绪 - + Working Status: Working 工作中 - + Pattern para 花样参数 - - - + + + Parameter setting 参数设置 @@ -5254,29 +5208,29 @@ 富怡压胶控制系统 - - + + Needle setting 针杆设置 - - + + Accessibility > Needle setting 辅助功能 > 针杆设置 - + Pattern import 花样导入 - + Pattern export 花样导出 - + Pattern delete 花样删除 @@ -5333,145 +5287,145 @@ 花样设置 > 机头高度 - + Auxiliary function > Sensor signal 辅助功能>传感器信号 - + Auxiliary function > Control action 辅助功能 > 控制动作 - + Accessibility > Software setting 辅助功能 > 软件设置 - + Accessibility > Network Manage 辅助功能 > 网络管理 - + Accessibility > Time setting 辅助功能 > 时间设置 - + Accessibility > Common functions setting 辅助功能 > 常用设置 - - - + + + Accessibility > Root 辅助功能 > 超级用户 - + Pattern setting > Pattern import 花样设置 > 花样导入 - + Pattern setting > Pattern export 花样设置 > 花样导出 - + Pattern setting > Pattern delete 花样设置 > 花样删除 - + Undefined error, 未定义错误, - + Pattern setting > Pattern para 花样设置 > 花样参数 - + Frame angle setting 动框角度设置 - + Root > Frame angle setting 超级用户 > 动框角度设置 - + Position parameters 位置参数 - + Speed parameters 速度参数 - + Action parameters 动作参数 - + Detect parameters 检测参数 - + Work parameters 工作参数 - + pageNum: 页数: - + Setting parameters 设置参数 - + Parameter setting > 参数设置 > - + Parameter setting > Parameter setting 参数设定 > 参数设定 - + Sensor signal 传感器信号 - + Control action 控制动作 - - + + Accessibility 辅助功能 - + Time setting 时间设置 - + Common functions setting 常用功能设置 @@ -5504,51 +5458,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Prompt 提示 @@ -5556,8 +5510,8 @@ - - + + USB flash drive is not detected! 未检测到优盘！ @@ -5638,9 +5592,9 @@ - - - + + + MC Upgrade 主控升级 @@ -5676,17 +5630,17 @@ 回偏移点 - + The password cannot be less than 8 digits, please check! 密码不能小于8位，请检查！ - + Password input **** 密码输入**** - + Whether to exit the program? 是否退出程序？ @@ -5696,9 +5650,9 @@ 界面升级 - - - + + + EXB Upgrade 外围板升级 @@ -5735,25 +5689,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + The machine is about to move, please pay attention to safety! 机器即将运动,请注意安全！ @@ -5956,322 +5910,322 @@ - - + + Set anchor point 定定位点 - - + + Whether to set the current point as the anchor point? 是否将当前点设置为定位点? - + Punch head set start point 冲孔头定起始点 - + Punch head set anchor point 冲孔头定定位点 - + Emb head set start point 绣花头定起始点 - + Emb head set anchor point 绣花头定定位点 - + Border check 边框检查 - + Left side out of frame 左边界超限 - + Left side is ok 左边界正常 - + Right side out of frame 右边界超限 - + Right side is ok 右边界正常 - + Lower side out of frame 下边界超限 - + Lower side is ok 下边界正常 - + Upper side out of frame 上边界超限 - + Upper side is ok 上边界正常 - + Click OK button machine will make a frame check, click the Cancel button machine will not move and exit this interface! 点击确定按钮机器将进行边框检查的动作,点击取消按钮机器不会动作并退出此界面！ - + Sewing machine head thread cutting 缝纫机头剪线 - + Embroidered machine head thread cutting 绣花机头剪线 - + Punch rod zero 冲孔换杆归零 - + Manual change color 手动换色 - + embroidered Manual change color 绣花换杆 - + Single punch 单次冲孔 - + Work Pause 暂停工作 - + Do you want to suspend machine operation? 是否暂停机器工作？ - + Process reset 流程复位 - + The machine is about to reset, please pay attention to safety! 机器即将流程复位,请注意安全！ - + Goto gorner 回角点 - + Test adc 测试电位器 - + Punch ms down 冲头停下位 - + Draw outline 画轮廓线 - + Continuous oil supply 连续供油 - + Reset all 全部复位 - + Motor zeroing 电机归零 - + Station 1 gluing 工位1涂胶 - + Station 2 gluing 工位2涂胶 - + head Up Down 机头升降 - + to Station 1 Apos 回工位1起始点 - + to Station 2 Apos 回工位2起始点 - + Return to material waiting point 回等料点 - + Backflow glue point 回排胶点 - + Discharge glue once 排一次胶 - + Adjust glue height 校准胶管高度 - + Total punchs: 总冲孔数: - + Network error 网络错误 - + Moving frame parameter import 动框参数导入 - + Whether to import movable frame parameters? 是否动框参数导入? - + Frame parameter Import 动框参数导入 - + Root > Frame Parameter Import Root > Parameter Import 超级用户 > 动框参数导入 - + Moving frame parameter export 动框参数导出 - + Whether to export moving frame parameters? 是否动框参数导出? - + Is the pattern Fcg clear? 是否删除花样fcg文件？ - - - - + + + + The machine is about to cut the thread, please pay attention to safety! 机器即将剪线,请注意安全！ - + The scissors are about to move, please pay attention to safety! 剪刀即将动作,请注意安全！ - + Simulate frame 空走边框 - + Goto zero pos 框架归零 - + Set work range 定工作范围 - + If automatically set work range? 是否自动定工作范围? - + Manual oil 手动加油 - + If manual oil? 是否手动加油? - - + + Face line detection 面线检测 - + Exit successfully! 成功退出! - - + + Set start point 定起始点 @@ -6292,343 +6246,343 @@ - - + + Whether to set the current point as the start point? 是否将当前点设置为起始点? - + Back start point 回起始点 - + Cutting thread up 剪上线 - + Cutting thread down 剪下线 - + Upper cutter 上剪线 - + System info 版本信息 - + Spindle Gear Ratio Test 主轴齿轮比测试 - + Whether to test the gear ratio of the spindle? 是否测试齿轮比? - + Is the bottom line count reset? Is the bottom line count reset ? 是否底线计数复位? - + Are you sure to ManualSwitch? Are you sure to ManualSwitch? 是否手动工作状态切换? - + Are you sure to AutoSwitch? Are you sure to AutoSwitch? 是否自动工作状态切换? - - + + ssid is empty! ssid为空！ - + Password input 密码输入 - - + + Settings require screen restart to take effect! 设置需要重启屏幕才生效! - + IP input IP输入 - + Whether to enter debug mode? 是否进入调试模式？ - + whether to exit debug mode? 是否退出调试模式？ - + Please log in to super user again! 请重新登录超级用户！ - + read parameter... 读取参数中... - - + + Journal exported successfully! 文件日志导出成功！ - + Journal exported failed! 文件日志导出失败！ - + Password input * Password input ※ 密码输入 ※ - + Password input ** Password input ※※ 密码输入 ※※ - + Password input *** 密码输入 *** - + Three-level password successfully logged in! 三级密码成功登入! - + reset parameters password successfully logged in! 重置参数密码成功登入! - + Auto set softlimit 自动定软限位 - + Is the version restored? 是否版本恢复？ - + Do you delete the configuration file? 是否删除配置文件？ - - + + The settings take effect after restarting the interface! 重启界面后设置生效! - + Import csv file successful! 成功导入csv文件！ - + Do you delete the csv file? 是否删除csv文件？ - + Reset succeeded! 重置成功！ - + Is the pattern clear? 是否花样总清？ - + Delete complete! 删除完成! - + Delete complete,please reselect the file! 删除完成,请重新选择文件! - + Not cleaned up! 未清理完成! - + If reset the pattern Fcg data? 是否重置花样fcg文件数据？ - + Reset complete,please reselect the file! 重置完成,请重新选择文件! - + Whether to shut down the computer? 是否关闭计算机？ - + Production statistics 生产统计 - - + + No connection 未连接 - + Warrant 授权 - + Total number of patterns processed: 总共加工花样数量: - + Pattern name: 花样名称: - + Pattern break line num: 花样断线次数: - + Head 机头 - + break line num: 断线次数: - + Error Log 错误日志 - + Auxiliary Function > Error Log 辅助功能 > 错误日志 - + Breakage Log 断线日志 - + Auxiliary Function > Breakage Log 辅助功能 > 断线日志 - + ErrorLog 错误日志 - + Auxiliary Function > ErrorLog 辅助功能 > 错误日志 - + Day 天 - + Hour 时 - + Minutes 分钟 - + The remaining available time of the machine is 机器剩余可用时间为 - + Failed to upgrade the main control system! 主控系统升级失败! - + Perparalboard system upgrade failed! 外围板系统升级失败! - + Failed to send data file! 发送数据文件失败! - + The main control system has been successed, waiting until machine restart 主控系统升级成功,请等待机器重启 - + System will restart %1 s later 系统将在 %1 秒后重启 - + The external board system is upgraded! 外围板系统升级成功! - + The data file is send successfully! 数据文件发送成功! - + Main control system is being upgraded... 主控系统升级中... @@ -6638,49 +6592,49 @@ 辅助功能 > 界面升级 - + Auxiliary Function > Production statistics 辅助功能 > 生产统计 - + The external board system upgrade... 外围板系统升级中... - + Data file sending... 数据文件发送中... - + Primary password successfully logged in! 一级密码成功登入! - - - + + + The password is wrong,please re-enter! 密码错误,请重新输入密码! - + Root successfully logged in! 超级用户成功登入! - + HMI decrypt 界面解密 - + The interface program is licensed, and then take effect after restarting, please restart manually! 界面程序授权成功,重启后生效,请手动重启! - + Password error, interface program authorization failed! 密码错误,界面程序授权失败! @@ -14581,12 +14535,17 @@ 冲孔主轴点动 - + + Head trim + + + + Head 1 trim 机头1剪线 - + Head 2 trim 机头2剪线 @@ -14596,12 +14555,12 @@ 冲孔主轴研车 - + Set Offset 定偏移点 - + Back Offset 回偏移点 @@ -14611,74 +14570,74 @@ 缝纫主轴研车 - + Sew Anchor Sew Start 缝纫定起始点 - + Back Anchor Back Start 回起始点 - + To Work Point 回工作点 - + Check Frame 边框检查 - + Punch Change Tool 手动换刀 - + Forward And Back 前进回退 - + Needle shuttle proofread 针梭校对 - + Single Punch 单次冲孔 - + To Right Up 去右上角 - + To Right Down 去右下角 - + To Left Up 去左上角 - + To Left Down 去左下角 - + Scope Work 定工作范围 - + Punch Stop Lower 冲头停下位 @@ -14698,363 +14657,363 @@ 缝纫主轴去勾线位 - + Punch Anchor Punch Start 冲孔定起始点 - + Switch Sew Head 切换缝纫机头 - + Switch Punch Head 切换冲孔机头 - + To Center point 回中心点 - + SensorSign 传感器信号 - + Action 控制动作 - + HMIUpgrade 界面升级 - + MCUpgrade 主控升级 - + ParaImport 参数导入 - + ParaExport 参数导出 - + SoftwareSet 软件设置 - + SoftPower 软件授权 - + Network 网络管理 - + WIFI WIFI管理 - + NeedleSet 针杆设置 - + TimeSet 时间设置 - + ShortcutSet 常用设置 - + Productnum 生产统计 - + Version 版本信息 - + CountReset 底线计数复位 - + Root 超级用户 - + Select 花样选择 - + Para 花样参数 - + Color 花样色序 - + Import 花样导入 - + Export 花样导出 - + Delete 花样删除 - + OperatPara 操作参数 - + ActionSet 动作设定 - + SpeedPara 速度参数 - + LimitPara 限位参数 - + MCPara 机器参数 - + Start button 1 启动按钮1 - + Pause button 1 暂停按钮1 - + Jog button 1 点动按钮1 - + Air pressure protection input 气压保护输入 - + X zero position X零位 - + Y zero position Y零位 - + X deceleration X降速 - + Y deceleration Y降速 - + X negative limit X负限位 - + Y negative limit Y负限位 - + X positive limit X正限位 - + Y positive limit Y正限位 - + Sewing machine head 1 lifting upper limit 缝纫机头1升降上限位 - + Lower lifting limit of sewing machine head 1 缝纫机头1升降下限位 - + Sewing spindle 1 needle - parking space 缝纫主轴1针-停车位 - + Sewing spindle 1 needle - thread hooking position 缝纫主轴1针-勾线位 - + Sewing shuttle 1- parking space 缝纫旋梭1-停车位 - + Sewing rotary hook 1-thread hook position 缝纫旋梭1-勾线位 - + Punching spindle 1 zero position 冲孔主轴1零位 - + Punching spindle 1 position detection 冲孔主轴1位置检测 - + Punching 1 color change motor - zero position 冲孔1换色电机-零位 - + Punching 1 color change motor - negative limit 冲孔1换色电机-负限位 - + Punching 1 color change motor - positive limit 冲孔1换色电机-正限位 - + Sewing 1 thread breakage detection 缝纫1断线检测 - + Sewing 1 scissors return 缝纫1下剪刀回位 - + Safety input 安全输入 - + Punching 2 color change motor - zero position 冲孔2换色电机-零位 - + Punching 2 color change motor - negative limit 冲孔2换色电机-负限位 - + Punching 2 color change motor - positive limit 冲孔2换色电机-正限位 - + Sewing machine head 2 lifting upper limit 缝纫机头2升降上限位 - + Lower lifting limit of sewing machine head 2 缝纫机头2升降下限位 - + Sewing spindle 2 needle - parking space 缝纫主轴2针-停车位 - + Sewing spindle 2 needle - thread hooking position 缝纫主轴2针-勾线位 - + Sewing shuttle 2- parking space 缝纫旋梭2-停车位 - + Sewing rotary hook 2-thread hook position 缝纫旋梭2-勾线位 - + Punching spindle 2 zero position 冲孔主轴2零位 - + Punching spindle 2 position detection 冲孔主轴2位置检测 - + Sewing 2 thread breakage detection 缝纫2断线检测 - + Sewing 2 scissors return 缝纫2下剪刀回位 - + Small platen not closed 小台板未关闭 @@ -15423,84 +15382,94 @@ 更换冲头6 - + + Rotating driver alarm + + + + + Rotation 2 driver alarm + + + + Normal stop (0x0100)Normal stop 正常停止 - + Find zero success (0x0101)Find zero success 归零成功 - + work pause (0x0102)work pause 工作暂停 - + End of work (0x0103)End of work 工作结束 - + Work done (0x0104)Work done 工作完成 - + Complete production (0x0105)Complete production 完成产量 - + Execute success (0x0106)Execute success 执行成功 - + Execute false (0x0107)Execute false 执行失败 - + wait file (0x0108)wait file 等待文件 - + change the bobbin (0x0109)change the bobbin 更换梭芯 - + Execute finish (0x010A)Execute finish 执行完成 - + Execute runnibng (0x010B)Execute runnibng 执行过程中 - + Automatic soft limit setting completed 自动定软限位完成 - + Please feed 请上料 diff --git a/datafile/datafiledsr.cpp b/datafile/datafiledsr.cpp index 8159474..bca70cc 100644 --- a/datafile/datafiledsr.cpp +++ b/datafile/datafiledsr.cpp @@ -233,6 +233,7 @@ void DataFileDsr::convertDataToEmbAbs() } //画笔与冲孔之间的转换线需要转换为偏移 + int insertFlag = 0; if(ctrl == DSR_PUNCH) { if(dsrDataPtr != dsrDataBeg) @@ -242,6 +243,7 @@ void DataFileDsr::convertDataToEmbAbs() { ctrl = DSR_OFFSET; runflag = 1; + insertFlag = 1; } dsrDataPtr++; } @@ -328,6 +330,21 @@ void DataFileDsr::convertDataToEmbAbs() absData.append((char*)(&absItem), sizeof(DsAbsItem)); + //插入空针 + if(insertFlag == 1) + { + absItem.ctrl = dsrDataPtr->ctrl; + absItem.attr = 0; + absItem.action = 0; + absItem.ax = ax * xfactor; + absItem.ay = ay * yfactor; + absItem.ar = ar * rfactor; + + absData.append((char*)(&absItem), sizeof(DsAbsItem)); + stepidx++; + } + +#if(0) //插入空针，原地冲个孔 if(ctrl == DSR_OFFSET) { @@ -353,6 +370,7 @@ void DataFileDsr::convertDataToEmbAbs() } } } +#endif stepidx++; dsrDataPtr++; diff --git a/datafile/embdata.cpp b/datafile/embdata.cpp index 1a05dc9..0e8dcdd 100644 --- a/datafile/embdata.cpp +++ b/datafile/embdata.cpp @@ -2009,11 +2009,11 @@ int EmbData::createDs16FromAbs() //大针步转换为跳针 if(ctrlByte == DATA_PUNCH || ctrlByte == DATA_DRAWING)//功能码等于冲孔数据或画笔数据 { - // if(m == stepNum - 1) - // { - // ds16Item.ctrl = ctrlByte; - // } - // else +// if(m == stepNum - 1) +// { +// ds16Item.ctrl = ctrlByte; +// } +// else { ds16Item.ctrl = DATA_JUMP;//跳针 } diff --git a/english.ts b/english.ts index 7ae78ac..def590d 100644 --- a/english.ts +++ b/english.ts @@ -3377,7 +3377,7 @@ GLOBAL - + Init windows... @@ -3496,21 +3496,163 @@ - + Frequently used button1 - - - - - + + + + + + + + + + + SewSetAnchorPoint: + + + + + + + + + + + + + + + + + + + + + + + + PunchSpindleJog: + + + + + + + + + + + + + + + + + + + + + + + SewSpindleTest: + + + + + + + + + + + + + + SewHookPosition: + + + + + + + + + + + + + + NeedleShuttleProofreading: + + + + + + + + + + + + + + Sewing head lifting: + + + + + + + + + - - - + + + + + + + + + + + + + + SewSpindleJog: + + + + + + + + + + + + + + PunchSetStartPoint: + + + + + + + + + + + + + @@ -3521,20 +3663,58 @@ - PunchSpindleJog: + ChangeMachineSewHead: - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + ChangeMachinePunchHead: + + + + + + + + + + + + + + Needle shuttle proofreading: + + + + + + + + + + + + + @@ -3545,205 +3725,61 @@ - SewSpindleTest: - - - - - - - - - - - - - - - - - - - - - - - - Sewing head lifting: - - - - - - - - - - - - - - - - - - - - - - - - SewSpindleJog: - - - - - - - - - - - - - - - - - - - - - - - - PunchSetStartPoint: - - - - - - - - - - - - - - - - - - - - - - - - ChangeMachineSewHead: - - - - - - - - - - - - - - - - - - - - - - - - ChangeMachinePunchHead: - - - - - - - - - - - - - - Head 1 thread trimming: - - - - - - - - - - - - - - Head 2 thread trimming: - - - - - - - - - - - - - - - - - - - - - - - - Needle shuttle proofreading: - - - - - - - - - - - - - - - - - - - - - - - BackCenter: + + + + + + + + + + + + + + + + + + + + + + BackAnchorPoint: + + + + + + + + + + + + + + EmbSetStartPoint: + + + + + + + + + + + + + + EmbSpindleTest: + + @@ -3755,188 +3791,146 @@ - BackAnchorPoint: - - - - - - - - - - - - - - EmbSetStartPoint: - - - - - - - - - - - - - - EmbSpindleTest: - - - - - - - - - - - - - EmbSpindleJog: - - - - - - - - - - + + + + + + + + + + EmbChangeColor: - - - - - - - - - - + + + + + + + + + + EmbCutLine: - - - - - - - - - - + + + + + + + + + + ChangeMachineEmbHead: - - - - - - - - - - + + + + + + + + + + Sew thread trimming: - - - - - - - - - - + + + + + + + + + + Sew rotate proofreading: - - - - - - - - - - + + + + + + + + + + Needle shuttle reposition: - - - - - - - - - - + + + + + + + + + + Needle reset: - - - - - - - - - - + + + + + + + + + + Shuttle reset: - - - - - - - - - - + + + + + + + + + + Sew rotate up: - - - - - - - - - - + + + + + + + + + + Sew rotate down: @@ -3962,25 +3956,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + AllToZero: @@ -4009,26 +4003,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + BackWorkPoint: @@ -4043,26 +4037,16 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + SetStartPoint: @@ -4077,26 +4061,16 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + BackStartPoint: @@ -4112,25 +4086,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + ForwardOrBackward: @@ -4145,26 +4119,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + PatternSelect: @@ -4179,75 +4153,75 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + Null: - - + + Frequently used button2 - - + + Frequently used button3 - - + + Frequently used button4 - - + + Frequently used button5 - - + + Frequently used button6 - - + + Frequently used button7 - - + + Frequently used button8 @@ -4300,26 +4274,16 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + SpindleTest: @@ -4335,25 +4299,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + CheckFrame: @@ -4368,26 +4332,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + ManualColorChange: @@ -4416,26 +4380,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + SinglePunch: @@ -4450,26 +4414,16 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + FrameZero: @@ -4485,25 +4439,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + MoveToRightUp: @@ -4519,25 +4473,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + MoveToRightDown: @@ -4553,25 +4507,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + MoveToLeftUp: @@ -4587,25 +4541,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + MoveToLeftDown: @@ -4621,25 +4575,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + SetWorkRange: @@ -4654,26 +4608,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + PunchStopLower: @@ -4707,15 +4661,15 @@ - - + + Frequently used button9 - - + + Frequently used button10 @@ -4730,26 +4684,26 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + SetOffsetPoint: @@ -4764,26 +4718,26 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + BackOffsetPoint: @@ -4978,9 +4932,9 @@ - - - + + + Root @@ -5215,26 +5169,26 @@ - + Ready Status：Ready - + Working Status: Working - + Pattern para - - - + + + Parameter setting @@ -5254,29 +5208,29 @@ - - + + Needle setting - - + + Accessibility > Needle setting - + Pattern import - + Pattern export - + Pattern delete @@ -5333,145 +5287,145 @@ - + Auxiliary function > Sensor signal - + Auxiliary function > Control action - + Accessibility > Software setting - + Accessibility > Network Manage - + Accessibility > Time setting - + Accessibility > Common functions setting - - - + + + Accessibility > Root - + Pattern setting > Pattern import - + Pattern setting > Pattern export - + Pattern setting > Pattern delete - + Undefined error, - + Pattern setting > Pattern para - + Frame angle setting - + Root > Frame angle setting - + Position parameters - + Speed parameters - + Action parameters - + Detect parameters - + Work parameters - + pageNum: - + Setting parameters - + Parameter setting > - + Parameter setting > Parameter setting - + Sensor signal - + Control action - - + + Accessibility - + Time setting - + Common functions setting @@ -5504,51 +5458,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Prompt @@ -5556,8 +5510,8 @@ - - + + USB flash drive is not detected! @@ -5637,9 +5591,9 @@ - - - + + + MC Upgrade @@ -5660,12 +5614,12 @@ - + Password input **** - + Whether to exit the program? @@ -5675,9 +5629,9 @@ - - - + + + EXB Upgrade @@ -5714,25 +5668,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + The machine is about to move, please pay attention to safety! @@ -5808,282 +5762,282 @@ - - + + Set start point - - + + Whether to set the current point as the start point? - + Back start point - + Border check - + Cutting thread up - + Cutting thread down - + Upper cutter - + Spindle Gear Ratio Test - + Whether to test the gear ratio of the spindle? - + read parameter... - - + + Journal exported successfully! - + Password input *** - + reset parameters password successfully logged in! - + Network error - + Moving frame parameter import - + Whether to import movable frame parameters? - + Frame parameter Import - + Root > Frame Parameter Import Root > Parameter Import - + Moving frame parameter export - + Whether to export moving frame parameters? - - + + The settings take effect after restarting the interface! - + Import csv file successful! - + Do you delete the csv file? - + Reset succeeded! - + Is the pattern Fcg clear? - + Delete complete,please reselect the file! - + Not cleaned up! - + If reset the pattern Fcg data? - + Reset complete,please reselect the file! - - - - + + + + The machine is about to cut the thread, please pay attention to safety! - + The scissors are about to move, please pay attention to safety! - + Simulate frame - + Goto zero pos - + Set work range - + If automatically set work range? - + Manual oil - + If manual oil? - - + + Face line detection - + Exit successfully! - + System info - + Is the bottom line count reset? Is the bottom line count reset ? - + Are you sure to ManualSwitch? Are you sure to ManualSwitch? - + Are you sure to AutoSwitch? Are you sure to AutoSwitch? - + Password input * Password input ※ - + Password input ** Password input ※※ - + Three-level password successfully logged in! - + Auto set softlimit - + Is the version restored? - + Do you delete the configuration file? - + Is the pattern clear? - + Delete complete! - + Whether to shut down the computer? - + Production statistics @@ -6231,311 +6185,311 @@ - - + + Set anchor point - - + + Whether to set the current point as the anchor point? - + Punch head set start point - + Punch head set anchor point - + Emb head set start point - + Emb head set anchor point - + Left side out of frame - + Left side is ok - + Right side out of frame - + Right side is ok - + Lower side out of frame - + Lower side is ok - + Upper side out of frame - + Upper side is ok - + Click OK button machine will make a frame check, click the Cancel button machine will not move and exit this interface! - + Sewing machine head thread cutting - + Embroidered machine head thread cutting - + Punch rod zero - + Manual change color - + embroidered Manual change color - + Single punch - + Work Pause - + Do you want to suspend machine operation? - + Process reset - + The machine is about to reset, please pay attention to safety! - + Goto gorner - + Test adc - + Punch ms down - + Draw outline - + Continuous oil supply - - + + No connection - + Warrant - + Reset all - + Motor zeroing - + Station 1 gluing - + Station 2 gluing - + head Up Down - + to Station 1 Apos - + to Station 2 Apos - + Return to material waiting point - + Backflow glue point - + Discharge glue once - + Adjust glue height - + Total number of patterns processed: - + Total punchs: - + Pattern name: - + Pattern break line num: - + Head - + break line num: - + Day - + Hour - + Minutes - + The remaining available time of the machine is - + Failed to upgrade the main control system! - + Perparalboard system upgrade failed! - + Failed to send data file! - + The main control system has been successed, waiting until machine restart - + System will restart %1 s later - + The external board system is upgraded! - + The data file is send successfully! - + Main control system is being upgraded... @@ -6560,126 +6514,126 @@ - + Auxiliary Function > Production statistics - + Error Log - + Auxiliary Function > Error Log - + Breakage Log - + Auxiliary Function > Breakage Log - + ErrorLog - + Auxiliary Function > ErrorLog - - + + ssid is empty! - + Password input - + The password cannot be less than 8 digits, please check! - - + + Settings require screen restart to take effect! - + IP input - + Whether to enter debug mode? - + whether to exit debug mode? - + Please log in to super user again! - + The external board system upgrade... - + Data file sending... - + Journal exported failed! - + Primary password successfully logged in! - - - + + + The password is wrong,please re-enter! - + Root successfully logged in! - + HMI decrypt - + The interface program is licensed, and then take effect after restarting, please restart manually! - + Password error, interface program authorization failed! @@ -14579,12 +14533,17 @@ - + + Head trim + + + + Head 1 trim - + Head 2 trim @@ -14594,12 +14553,12 @@ - + Set Offset - + Back Offset @@ -14609,74 +14568,74 @@ - + Sew Anchor Sew Start - + Back Anchor Back Start - + To Work Point - + Check Frame - + Punch Change Tool - + Forward And Back - + Needle shuttle proofread - + Single Punch - + To Right Up - + To Right Down - + To Left Up - + To Left Down - + Scope Work - + Punch Stop Lower @@ -14696,363 +14655,363 @@ - + Punch Anchor Punch Start - + Switch Sew Head - + Switch Punch Head - + To Center point - + SensorSign - + Action - + HMIUpgrade - + MCUpgrade - + ParaImport - + ParaExport - + SoftwareSet - + SoftPower - + Network - + WIFI - + NeedleSet - + TimeSet - + ShortcutSet - + Productnum - + Version - + CountReset - + Root - + Select - + Para - + Color - + Import - + Export - + Delete - + OperatPara - + ActionSet - + SpeedPara - + LimitPara - + MCPara - + Start button 1 - + Pause button 1 - + Jog button 1 - + Air pressure protection input - + X zero position - + Y zero position - + X deceleration - + Y deceleration - + X negative limit - + Y negative limit - + X positive limit - + Y positive limit - + Sewing machine head 1 lifting upper limit - + Lower lifting limit of sewing machine head 1 - + Sewing spindle 1 needle - parking space - + Sewing spindle 1 needle - thread hooking position - + Sewing shuttle 1- parking space - + Sewing rotary hook 1-thread hook position - + Punching spindle 1 zero position - + Punching spindle 1 position detection - + Punching 1 color change motor - zero position - + Punching 1 color change motor - negative limit - + Punching 1 color change motor - positive limit - + Sewing 1 thread breakage detection - + Sewing 1 scissors return - + Safety input - + Punching 2 color change motor - zero position - + Punching 2 color change motor - negative limit - + Punching 2 color change motor - positive limit - + Sewing machine head 2 lifting upper limit - + Lower lifting limit of sewing machine head 2 - + Sewing spindle 2 needle - parking space - + Sewing spindle 2 needle - thread hooking position - + Sewing shuttle 2- parking space - + Sewing rotary hook 2-thread hook position - + Punching spindle 2 zero position - + Punching spindle 2 position detection - + Sewing 2 thread breakage detection - + Sewing 2 scissors return - + Small platen not closed @@ -15421,84 +15380,94 @@ - + + Rotating driver alarm + + + + + Rotation 2 driver alarm + + + + Normal stop (0x0100)Normal stop - + Find zero success (0x0101)Find zero success - + work pause (0x0102)work pause - + End of work (0x0103)End of work - + Work done (0x0104)Work done - + Complete production (0x0105)Complete production - + Execute success (0x0106)Execute success - + Execute false (0x0107)Execute false - + wait file (0x0108)wait file - + change the bobbin (0x0109)change the bobbin - + Execute finish (0x010A)Execute finish - + Execute runnibng (0x010B)Execute runnibng - + Automatic soft limit setting completed - + Please feed diff --git a/machine/comm/protocol.h b/machine/comm/protocol.h index 86b27c2..63ede0c 100644 --- a/machine/comm/protocol.h +++ b/machine/comm/protocol.h @@ -1119,7 +1119,7 @@ typedef struct #define OT_FOLLOW_EN 0x0002 // 随动允许 #define OT_UCUT_THREAD 0x0003 // 压脚 //上剪刀剪线 #define OT_DCUT_THREAD 0x0004 // 下剪刀剪线 -#define OT_CLIP_UPLINE 0x0005 // 夹面线 +#define OT_FRAME 0x0005 // 气框 #define OT_OIL 0x0006 // 加油 #define OT_LIGHT 0x0007 // 照明灯 #define OT_CUT_UP 0x0008 // 上剪线 @@ -1147,7 +1147,7 @@ typedef struct #define OT_HEAD_R_LOOSE_UTRD2 0x001D // 右机头松紧线2 #define OT_CUTTER_LIFT 0x001E // 切刀机头 #define OT_PRESS_KNOT 0x001F // 压枣控制 -#define OT_FRAME 0x0020// 气框开合 +//#define OT_FRAME 0x0020// 气框开合 #define OT_FRAME_TEN 0x0021 // 气框拉伸 #define OT_FRAME_PRE 0x0022 // 气框压紧 #define OT_CLIP_EXTEND 0x0024 // 勾线动作 伸缩 diff --git a/mctype/patternsingleboard/mainUI/mainwidget.cpp b/mctype/patternsingleboard/mainUI/mainwidget.cpp index 4076ee7..29939a0 100644 --- a/mctype/patternsingleboard/mainUI/mainwidget.cpp +++ b/mctype/patternsingleboard/mainUI/mainwidget.cpp @@ -4440,7 +4440,7 @@ void MainWidget::onFiveSecondTimer() } else { - g_pMachine->setTcpConnectState(1);//将连接状态置为1 + //g_pMachine->setTcpConnectState(1);//将连接状态置为1 } m_conFlag = -1; } @@ -4568,7 +4568,7 @@ void MainWidget::on_buttonParaSet_clicked() m_pParameterSetDlg->setMainTitle(tr("Parameter setting")); m_pParameterSetDlg->setSubTitle(tr("Parameter setting > Parameter setting")); //机器参数和工作参数 - m_pParameterSetDlg->setItemList(operate,PARA_TYPE_MACH|PARA_TYPE_WORK,MC_SORT_SETTING|MC_SORT_POSITION|MC_SORT_SPEED|MC_SORT_DETECT|MC_SORT_ACTION); + m_pParameterSetDlg->setItemList(operate,PARA_TYPE_MACH|PARA_TYPE_WORK,MC_SORT_SPEED|MC_SORT_ACTION|MC_SORT_DETECT|MC_SORT_POSITION|MC_SORT_SETTING|MC_SORT_WORK); m_pParameterSetDlg->exec(); } }