20240326

1、合并任晴的代码；

items/cmdconfig.h

@@ -129,6 +129,7 @@ enum SHORTCUT_FUNCTION {
                             FUN_QUANTITYMOVEFRAME,      // 定量移框
                             FUN_NEEDLERODPOSITION,  //针杆定位
                             FUN_SIMULATEFRAME,    //空走边框
+                            FUN_TOWELCABLE,//毛巾拉线
                             FUN_PROCESSRESET,    //流程复位
                             FUN_SETFEEDINGPOINT,    //定上料点
                             FUN_BACKFEEDINGPOINT,    //回上料点

items/itemsmanage.cpp

@@ -91,8 +91,8 @@ void initSoftwareParasList(QList <ParaItem> & parasList)
                                    0 ,
                                    SET_LANGUAGE, 0, 0, PARA_VALUE_TYPE_LIST,
                                    QCoreApplication::translate("GLOBAL", "Language"),//语言
-                                   chinese, chinese, uzbek, chinese, 0, "", "",
+                                   chinese, chinese, turkey, chinese, 0, "", "",
-                                   QCoreApplication::translate("GLOBAL", "Chinese:0;English:1;Spanish:2;Bengal:3;Portugal:4;French:5;Arabic:6;Ukrainian:7;Korean:8;Russian:9;Uzbek:10"),
+                                   QCoreApplication::translate("GLOBAL", "Chinese:0;English:1;Spanish:2;Bengal:3;Portugal:4;French:5;Arabic:6;Ukrainian:7;Korean:8;Russian:9;Uzbek:10;vietnamese:11;turkey:12"),
                                    0, 0, 0x0002, operate));
 
     //软件设置参数-字体大小；单位：无 ，范围0-1，默认0
@@ -903,7 +903,7 @@ void initNetworkParasList(QList <ParaItem> & parasList)
                                    0 ,
                                    SET_LOCALIP, 0, 0, PARA_VALUE_TYPE_STRINPUT,
                                    QCoreApplication::translate("GLOBAL", "Local IP settings"),//本地IP设置
-                                   0, 0, 0, 0, 0, "", "192.168.16.100",
+                                   0, 0, 0, 0, 0, "", "192.168.16.41",
                                    "",
                                    0, 0, 0x0009, operate));
 

machine/comm/protocol.h

@@ -1235,6 +1235,7 @@ typedef struct
 #define	CHENILLE_MS_JOG			    0x0045	// 毛巾点动
 #define CHENILLE_SPINDLE_TO_ANGLE	0x0046	// 毛巾主轴去指定角度
 #define CHENILLE_M_TO_ANGLE		        0x0047	// 毛巾M轴去指定角度
+#define    CHENILLE_LINE_UP        0x0049    // 毛巾拉线
 #define   CHENILLE_SW_DEBUG		0x004A// 毛巾换色调试
 #define	TEST_ADC_POTVAL			0x0102	// 测试电位器
 #define   TEST_EMB_SPINDLE_RATIO     	        0x0103	// 测试平绣主轴齿轮比

main.cpp

@@ -57,6 +57,9 @@ QString switchLanguage(int language,QDir appPath)
     case vietnamese://越南文
         sourcePath = appPath.path() + appPath.separator() + "vietnamese.qm";
         break;
+    case turkey://土耳其文
+        sourcePath = appPath.path() + appPath.separator() + "turkey.qm";
+        break;
     default://中文
         sourcePath = appPath.path() + appPath.separator() + "chinese.qm";
         break;
@@ -358,7 +361,7 @@ int main(int argc, char *argv[])
         //g_pSettings->writeToIniFile("PatternPara/stepCompensation",20);
         g_pSettings->writeToInHMIiFile("PatternPara/xCompensation",20);
         g_pSettings->writeToInHMIiFile("PatternPara/yCompensation",20);
-        g_pSettings->writeToInHMIiFile("PatternPara/lockNeedlesNum",2);     // 锁针次数
+        //g_pSettings->writeToInHMIiFile("PatternPara/lockNeedlesNum",2);     // 锁针次数
         g_pSettings->writeToInHMIiFile("PatternPara/lockNeedlesStepNum",1);  // 锁针步数
         g_pSettings->writeToInHMIiFile("PatternPara/lockNeedlesStepLength",100);   // 锁针针步长度
         g_pSettings->writeToInHMIiFile("PatternPara/minStep",0);   // 过滤针步长度

main.h

@@ -171,7 +171,8 @@ enum Language
     korean = 8,   //韩语
     russian=9,  //俄语
     uzbek = 10,  //乌兹别克语
-    vietnamese = 11//越南文
+    vietnamese = 11,//越南文
+    turkey = 12  //土耳其文
 };
 
 //字体大小

mctype/mainwidgetfunction.cpp

@@ -3004,7 +3004,24 @@ void MainWidgetFunction::funSimulateFrame()
         g_pMachine->simulateFrame();    // 发给下位机，空走边框
     }
 }
+//毛巾拉线
+void MainWidgetFunction::funTowelCable()
+{
+    m_pPromptDlg->initDialog(PromptDialog::BTN_OK_CANCEL);
+    m_pPromptDlg->setTitleStr(tr("Towel cable"));//毛巾拉线
 
+    QString str;
+    str = tr("The machine is about to move, please pay attention to safety!");//机器即将运动，请注意安全！
+    m_pPromptDlg->setContentStr(str);
+
+    if(m_pPromptDlg->exec() == 1)
+    {
+        if(g_pMachine != NULL)
+        {
+            g_pMachine->manualAction( CHENILLE_LINE_UP);
+        }
+    }
+}
 //流程复位
 void MainWidgetFunction::funProcessReset()
 {
@@ -4799,7 +4816,8 @@ HMILotData MainWidgetFunction::getHMILotData()
     memset(&lotFata, 0, sizeof(HMILotData));
 
     memcpy(lotFata.HMIVerStr, getVersionStr().data(), getVersionStr().length());   // 版本信息
-    memcpy(lotFata.fileName, m_fileName.data(), m_fileName.length());   // 文件名称
+    //lotFata.fileName = m_fileName;
+    //memcpy(lotFata.fileName, m_fileName.data(), m_fileName.length());   // 文件名称
 
     u32 rackNum = g_pSettings->readFromIniFile("IOT/rackNumber").toInt();//机架号
     lotFata.machineNumber = rackNum;   // 机架号
@@ -5383,6 +5401,11 @@ void MainWidgetFunction::slotSendLotData()
     QString keyStr;
     keyStr.clear();
 
+    keyStr = compositionJson(U00054, m_fileName);   //文件名称
+    lotStr += keyStr;
+
+    m_mcStatus = g_pMachine->getMcStatus();
+
     if(g_pLotMachine != NULL)
     {
         if(g_pMachine == NULL)
@@ -5396,7 +5419,7 @@ void MainWidgetFunction::slotSendLotData()
 
             qint64 time = 0;
 #ifdef Q_OS_LINUX
-            time = QDateTime::currentDateTime().toMSecsSinceEpoch() - 28800000;//mcgs下时间差8个小时
+            time = QDateTime::currentDateTime().toMSecsSinceEpoch() ;//mcgs下时间差8个小时
 #endif
 
 #ifdef Q_OS_WIN
@@ -5412,7 +5435,7 @@ void MainWidgetFunction::slotSendLotData()
             {
                 qint64 time = 0;
 #ifdef Q_OS_LINUX
-                time = QDateTime::currentDateTime().toMSecsSinceEpoch() - 28800000;//mcgs下时间差8个小时
+                time = QDateTime::currentDateTime().toMSecsSinceEpoch() ;//mcgs下时间差8个小时
 #endif
 
 #ifdef Q_OS_WIN
@@ -5423,6 +5446,9 @@ void MainWidgetFunction::slotSendLotData()
             }
             keyStr = compositionJson(U00048, QString::number(S0506));   //设备状态
             lotStr += keyStr;
+
+            keyStr = compositionJson(U00053,  QString::number(m_mcStatus.runSpeed));   //工作速度
+            lotStr += keyStr;
         }
         else
         {
@@ -5430,7 +5456,7 @@ void MainWidgetFunction::slotSendLotData()
             {
                 qint64 time = 0;
 #ifdef Q_OS_LINUX
-                time = QDateTime::currentDateTime().toMSecsSinceEpoch() - 28800000;//mcgs下时间差8个小时
+                time = QDateTime::currentDateTime().toMSecsSinceEpoch() ;//mcgs下时间差8个小时
 #endif
 
 #ifdef Q_OS_WIN

mctype/mainwidgetfunction.h

@@ -181,6 +181,7 @@ public:
     void funNeedleRodPosition();//针杆定位
     void funSimulateFrame();//空走边框
     void funProcessReset();//流程复位
+    void funTowelCable();//毛巾拉线
     void funSetFeedPoint();//定上料点
     void funBackFeedPoint();//回上料点
     void funManualOil();//手动加油

mctype/patternsingleboard/function/flatembroidery.cpp

@@ -1139,13 +1139,13 @@ void FlatEmbroidery::initPatternsParasList()
                                         tr(""), 0, 0,0x000B, factory));
 
     //绣花机-超级用户花样参数-花样设置参数-锁针次数；单位:次  范围0-10，默认2    -lxs
-    m_allParasList.append(makeAParaItem(0,
+//    m_allParasList.append(makeAParaItem(0,
-                                        PARA_TYPE__ROOT_PATTERN,
+//                                        PARA_TYPE__ROOT_PATTERN,
-                                        0 ,
+//                                        0 ,
-                                        SET_LOCKNEEDLESNUM, 0, 0, PARA_VALUE_TYPE_INT,
+//                                        SET_LOCKNEEDLESNUM, 0, 0, PARA_VALUE_TYPE_INT,
-                                        tr("Lock needle times"),//锁针次数
+//                                        tr("Lock needle times"),//锁针次数
-                                        2, 0, 10, 2, 0, tr(""), tr(""),
+//                                        2, 0, 10, 2, 0, tr(""), tr(""),
-                                        tr(""), 0, 0,0x000C, factory));
+//                                        tr(""), 0, 0,0x000C, factory));
 
     //绣花机-超级用户花样参数-花样设置参数-锁针步数；单位：步 ，范围0-10，默认1    -lxs
     m_allParasList.append(makeAParaItem(0,
@@ -1378,7 +1378,7 @@ void FlatEmbroidery::initMcParasList()
                                         0, 0, 0x0008, root));
 
 
-    // 平绣换色启动方式， 0:自动启动；1:手动启动；无单位， 范围0-1，默认0
+    // 平绣换色启动方式，bit2， 0:自动启动；1:手动启动；无单位， 范围0-1，默认0
     m_allParasList.append(makeAParaItem(0,
                                         PARA_TYPE_MACH,
                                         MC_SORT_SETTING,//公用参数（设置参数）
@@ -1388,6 +1388,16 @@ void FlatEmbroidery::initMcParasList()
                                         tr("Automatic:0;Manual:1"),
                                         0, 0, 0x0009, operate));
 
+    // Y 向零位传感器，bit3，, 0 有，1,无
+    m_allParasList.append(makeAParaItem(0,
+                                        PARA_TYPE_MACH,
+                                        MC_SORT_SETTING,//公用参数（设置参数）
+                                        15, 4, 0, PARA_VALUE_TYPE_LIST,
+                                        tr("Y-axis zero position sensor"),// Y 向零位传感器
+                                        0, 0, 1, 0, 0, tr(""), tr(""),
+                                        tr("have:0;not have:1"),
+                                        0, 0, 0x0009, operate));
+
     // 平绣跳针变越框针数, 范围 0--100，单位：无，默认 5
     m_allParasList.append(makeAParaItem(0,
                                         PARA_TYPE_MACH,
@@ -6196,6 +6206,7 @@ void FlatEmbroidery::initShortCutList()
     m_allShortCutList.append(makeAShortCutItem(0,0x0010,tr("MoveBorder"),"buttonQuantityMoveFrame",FUN_QUANTITYMOVEFRAME));//定量移框
     m_allShortCutList.append(makeAShortCutItem(0,0x0011,tr("RodPosition"),"buttonNeedleRodPosition",FUN_NEEDLERODPOSITION));//针杆定位
     m_allShortCutList.append(makeAShortCutItem(0,0x0012,tr("Border"),"buttonSimulateFrame",FUN_SIMULATEFRAME));//空走边框
+
     //m_allShortCutList.append(makeAShortCutItem(0,0x0013,tr("Reset"),"buttonProcessReset",FUN_PROCESSRESET));//流程复位
     m_allShortCutList.append(makeAShortCutItem(0,0x0016,tr("Oil"),"buttonManualOil",FUN_MANUALOIL));//手动加油-
     // m_allShortCutList.append(makeAShortCutItem(0,0x000C,tr("EmbWorkArea"),"buttonBorderEmb",FUN_EMBWORKAREA));//平绣设置可工作区域
@@ -6209,11 +6220,18 @@ void FlatEmbroidery::initShortCutList()
     {
         m_allShortCutList.append(makeAShortCutItem(0,0x000C,tr("SwitchHead"),"buttonSinglePunch",FUN_SWITCHHEAD));//机头切换
         m_allShortCutList.append(makeAShortCutItem(0,0x000C,tr("MRotate"),"buttonSpindleRotate",FUN_MS_ROTATE));//M轴旋转
+
+    }
+
+    if( coil !=1&& towel ==1)//有毛巾没有缠绕
+    {
+        m_allShortCutList.append(makeAShortCutItem(0,0x0012,tr("TowelCable"),"buttonSimulateFrame",FUN_TOWELCABLE));//毛巾拉线
     }
 
     if (g_emProductType == PRODUCT_CHEN)
     {
         m_allShortCutList.append(makeAShortCutItem(0,0x000C,tr("MRotate"),"buttonSpindleRotate",FUN_MS_ROTATE));//M轴旋转
+        m_allShortCutList.append(makeAShortCutItem(0,0x0012,tr("TowelCable"),"buttonSimulateFrame",FUN_TOWELCABLE));//毛巾拉线
     }
 
 

mctype/patternsingleboard/function/quiembroidery.cpp

@@ -879,6 +879,15 @@ void Quiembroidery::initPatternsParasList()
                                         0, 0, 80, 0, 2, tr("mm"), tr(""),
                                         tr(""), 0, 0,0x000E, factory));
 
+    //绣花机-花样参数-花样设置参数-跳针变越框锁针针数；单位：无，范围0-20，默认3
+    m_allParasList.append(makeAParaItem(0,
+                                        PARA_TYPE_PATTERN,
+                                        0 ,
+                                        SET_JUMPNEEDLECHANGE, 0, 0, PARA_VALUE_TYPE_INT,
+                                        tr("Skip stitch to cross frame lock stitch count"),//跳针变越框锁针针数
+                                        3, 0, 20, 3, 0, tr(""), tr(""),
+                                        tr(""), 0, 0,0x000E, operate));//12
+
     //花样参数---------------------------
 }
 
@@ -2624,6 +2633,12 @@ void Quiembroidery::initAssistList()
     m_allAssistList.append(makeAAssistItem(0,0x0008,tr("Software"),"buttonSoftwareSet",ASSIST_SOFTWARESET));//软件设置
     m_allAssistList.append(makeAAssistItem(0,0x0009,tr("Authorize"),"buttonSoftwareAuthor",ASSIST_AUTHORIZATION));//软件授权
     m_allAssistList.append(makeAAssistItem(0,0x000A,tr("Network"),"buttonNetworkManage",ASSIST_NETWORK));//网络管理
+    s16 wifi = g_pSettings->readFromInHMIiFile("HMI/wifi").toInt();//是否有wifi
+    if(wifi == 1)
+    {
+        m_allAssistList.append(makeAAssistItem(0,0x000A,tr("WIFI"),"buttonWIFI",ASSIST_WIFI));//WIFI管理
+    }
+
     m_allAssistList.append(makeAAssistItem(0,0x000B,tr("NeedleSet"),"buttonNeedleSet",ASSIST_NEEDLESET));//针杆设置
     m_allAssistList.append(makeAAssistItem(0,0x000D,tr("Time"),"buttonTimeSet",ASSIST_TIMESET));//时间设置
     //m_allAssistList.append(makeAAssistItem(0,0x000E,tr("Shortcut"),"buttonCommonFunction",ASSIST_SHORTCUTSET));//常用设置

mctype/patternsingleboard/mainUI/mainwidget.cpp

@@ -3341,6 +3341,9 @@ void MainWidget::runCommonBtnFunction(int idx)
     case FUN_SIMULATEFRAME://空走边框
         m_pMainWidgetFunction->funSimulateFrame();
         break;
+    case FUN_TOWELCABLE://毛巾拉线
+        m_pMainWidgetFunction->funTowelCable();
+        break;
     case FUN_PROCESSRESET://流程复位
         m_pMainWidgetFunction->funProcessReset();
         break;
@@ -4619,11 +4622,11 @@ void MainWidget::slotShowPatternPara(QString filePath,s16 showFlag)
     QFile fileFcg(filePath);
     if(!fileFcg.exists())//不存在fcg文件时，以下是默认的经验值  -rq
     {
-        u32 lockNeedlesNum = g_pSettings->readFromInHMIiFile("PatternPara/lockNeedlesNum").toInt(); // 锁针次数
+        //u32 lockNeedlesNum = g_pSettings->readFromInHMIiFile("PatternPara/lockNeedlesNum").toInt(); // 锁针次数
         u32 lockNeedlesStepNum =  g_pSettings->readFromInHMIiFile("PatternPara/lockNeedlesStepNum").toInt(); // 锁针步数
         u32 lockNeedlesStepLength =  g_pSettings->readFromInHMIiFile("PatternPara/lockNeedlesStepLength").toInt();   // 锁针针步长度
         u32 minStep = g_pSettings->readFromInHMIiFile("PatternPara/minStep").toInt();   // 过滤针步长度
-        fileHead.lockNeedlesNum = lockNeedlesNum;
+        //fileHead.lockNeedlesNum = lockNeedlesNum;
         fileHead.lockNeedlesStepNum = lockNeedlesStepNum;
         fileHead.lockNeedlesStepLength = lockNeedlesStepLength;
         fileHead.minStep = minStep;
@@ -4763,7 +4766,7 @@ void MainWidget::slotShowPatternPara(QString filePath,s16 showFlag)
         m_fileHead.yRepeatNum = m_pParameterSetDlg->getItemValue(SET_YREPEATNUM);      //Y向反复次数
         m_fileHead.xRepeatSpace = m_pParameterSetDlg->getItemValue(SET_XREPEATSPACE);  //X向反复间距
         m_fileHead.yRepeatSpace = m_pParameterSetDlg->getItemValue(SET_YREPEATSPACE);  //Y向反复间距
-        m_fileHead.lockNeedlesNum = m_pParameterSetDlg->getItemValue(SET_LOCKNEEDLESNUM);  //锁针次数
+        //m_fileHead.lockNeedlesNum = m_pParameterSetDlg->getItemValue(SET_LOCKNEEDLESNUM);  //锁针次数
         m_fileHead.lockNeedlesStepNum = m_pParameterSetDlg->getItemValue(SET_LOCKNEEDLESSTEPNUM);  //锁针针步
         m_fileHead.lockNeedlesStepLength = m_pParameterSetDlg->getItemValue(SET_LOCKNEEDLESSTEPLENTH);  //锁针针步长度
         m_fileHead.coloLockrNeedle = m_pParameterSetDlg->getItemValue(SET_CHANGLOOKNEEDLE);  //换色锁针针数
@@ -6955,7 +6958,22 @@ void MainWidget::on_buttonNeedleBegin_clicked()
 
 void MainWidget::on_buttonNeedleEnd_clicked()
 {
-    m_forwardBackNeedleIdx = g_pCurEmbData->getStitchNums();  //总针数
+    int needleNum = g_pCurEmbData->getStitchNums(); //总针数
+    //m_forwardBackNeedleIdx = g_pCurEmbData->getStitchNums(); //总针数
+    //可设置针数
+    int rslt;
+    NumerInputDialog ndlg(this);
+    ndlg.setTitleStr(tr("needle num"));//针数
+    ndlg.setUnitStr("");
+    ndlg.setValueAndRange(m_forwardBackNeedleIdx, 1, needleNum, 0);
+    rslt = ndlg.exec();
+
+    if (rslt == 1)
+    {
+        s32 val = ndlg.getValue();
+        m_forwardBackNeedleIdx = val;
+    }
+
     addOrDecNeedleIdx(m_forwardBackNeedleIdx);
 }
 

settings/lotsettings.h

@@ -61,6 +61,9 @@
 #define U00050	"EndTime"                         //结束时间
 #define U00051	"Pins"                                //区间针数
 #define U00052	"CurrentProduction"         //当前产量 int
+#define U00053	"speed"         //工作速度
+#define U00054	"FileName"         //花样名称
+
 
 #define U000102 "electric_total"                  //电机总数 int
 #define U000103 "sensor_total"                   //传感器总数 int

sharedviews/parametersetdialog.cpp

@@ -2234,7 +2234,7 @@ void ParameterSetDialog::execItemClickEvent(s16 fun)
         //setItemValue(SET_STEPCOMPENSATE,g_pSettings->readFromIniFile( "PatternPara/stepCompensation").toInt());
         setItemValue(SET_XCOMPENSATE,g_pSettings->readFromInHMIiFile("PatternPara/xCompensation").toInt());
         setItemValue(SET_YCOMPENSATE,g_pSettings->readFromInHMIiFile("PatternPara/yCompensation").toInt());
-        setItemValue(SET_LOCKNEEDLESNUM,g_pSettings->readFromInHMIiFile("PatternPara/lockNeedlesNum").toInt());// 锁针次数
+        //setItemValue(SET_LOCKNEEDLESNUM,g_pSettings->readFromInHMIiFile("PatternPara/lockNeedlesNum").toInt());// 锁针次数
         setItemValue(SET_LOCKNEEDLESSTEPNUM,g_pSettings->readFromInHMIiFile("PatternPara/lockNeedlesStepNum").toInt());// 锁针步数
         setItemValue(SET_LOCKNEEDLESSTEPLENTH,g_pSettings->readFromInHMIiFile("PatternPara/lockNeedlesStepLength").toInt());// 锁针针步长度
         setItemValue(SET_MINSTEP,g_pSettings->readFromInHMIiFile("PatternPara/minStep").toInt());// 过滤针步长度
@@ -2808,7 +2808,7 @@ void ParameterSetDialog::setNetworkItemList(int64_t type)
     configfile = apppath.path() + apppath.separator() + "mcconfig.ini";//读取的配置文件名字
     QSettings configIni(configfile, QSettings::IniFormat);
     serverip = configIni.value("server/ip", QVariant("192.168.16.253")).toString();//把配置文件里的号转换成字符串
-    localip = configIni.value("local/ip", QVariant("192.168.16.100")).toString();
+    localip = configIni.value("local/ip", QVariant("192.168.16.41")).toString();
 
     ParaItem sIpItem;
     sIpItem.indexInPara = idx;
@@ -3342,8 +3342,8 @@ void ParameterSetDialog::on_buttonOk_clicked()
         g_pSettings->writeToInHMIiFile("PatternPara/xCompensation",StepXCompensation);
         int StepYCompensation = getItemValue(SET_YCOMPENSATE);    //Y针步补偿
         g_pSettings->writeToInHMIiFile("PatternPara/yCompensation",StepYCompensation);
-        int StepLockNeedlesNum = getItemValue(SET_LOCKNEEDLESNUM);    // 锁针次数
+//        int StepLockNeedlesNum = getItemValue(SET_LOCKNEEDLESNUM);    // 锁针次数
-        g_pSettings->writeToInHMIiFile("PatternPara/lockNeedlesNum",StepLockNeedlesNum);
+//        g_pSettings->writeToInHMIiFile("PatternPara/lockNeedlesNum",StepLockNeedlesNum);
         int StepLockNeedlesStepNum = getItemValue(SET_LOCKNEEDLESSTEPNUM);    // 锁针步数
         g_pSettings->writeToInHMIiFile("PatternPara/lockNeedlesStepNum",StepLockNeedlesStepNum);
         int StepLockNeedlesStepLength = getItemValue(SET_LOCKNEEDLESSTEPLENTH);    // 锁针针步长度

sharedviews/patternselectwidget.cpp

@@ -894,7 +894,7 @@ void PatternSelectWidget::createCurDirPatterns()
     DataFileDsr dsr;
 
     dir.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);  // 设置类型过滤器，只为文件夹和dst文件格式
-    dir.setSorting(QDir::DirsFirst | QDir::IgnoreCase);  // 设置排序方式
+    dir.setSorting(QDir::DirsFirst | QDir::Time | QDir::IgnoreCase);  // 设置排序方式
 
     QFileInfoList fileList = dir.entryInfoList();
     int count = fileList.count();