diff --git a/chinese.qm b/chinese.qm index 61348ff..73fa903 100644 Binary files a/chinese.qm and b/chinese.qm differ 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(); } }