yf_zjb преди 5 години
родител
ревизия
4804a5d81d

+ 1 - 1
Application_BZY/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1695594316941501023" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1311459764963303771" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 1 - 1
Application_CBD/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1659367733086915474" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1277915824988273133" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

BIN
Application_CBD/Debug/packages/freemodbus-latest/samples/sample_mb_master.o


BIN
Application_CBD/Debug/rt-thread/src/kservice.o


+ 9 - 9
Application_CBD/applications/control.c

@@ -326,7 +326,7 @@ uint8_t ctr_clear(uint16_t status_clear)
         rt_free(Clear_ERR);
         rt_pin_write(CLEAR_R,OFF);
         rt_pin_write(CLEAR_L,OFF);
-        break;
+        return 0;
     }
     clear_num = 0;
     rt_thread_delay(1000);
@@ -360,17 +360,17 @@ void ctr_TG_Clear(uint16_t clear_timeout)
     {
         rt_pin_write(CLEAR_R,ON);
         rt_pin_write(CLEAR_L,OFF);
-        clear_timeout--;
+        clear_count--;
         rt_thread_delay(100);
     }
     rt_pin_write(CLEAR_R,OFF);
     rt_pin_write(CLEAR_L,OFF);
     rt_thread_delay(2000);
-    while(clear_timeout!=clear_timeout)
+    while(clear_timeout!=clear_count)
     {
         rt_pin_write(CLEAR_R,OFF);
         rt_pin_write(CLEAR_L,ON);
-        clear_timeout++;
+        clear_count++;
         rt_thread_delay(100);
     }
     rt_pin_write(CLEAR_R,OFF);
@@ -1247,11 +1247,11 @@ void WorkTast(void)
         rt_thread_delay(1000);
         //关闭下仓门
         device_status.ctr_down_motor = 2;
-//        while(device_status.ctr_down_motor!=0)
-//        {
-//            rt_thread_delay(100);
-//            rt_kprintf("等待下仓门关闭!!!\n");
-//        }
+        while(device_status.ctr_down_motor!=0)
+        {
+            rt_thread_delay(100);
+            rt_kprintf("等待下仓门关闭!!!\n");
+        }
         if(device_status.version_type==4)
         {
             //震动

+ 2 - 2
Application_CBD/applications/control.h

@@ -13,8 +13,8 @@
 #include <board.h>
 
 #include <rtdevice.h>
-#define VERSION_HK "1.1.41(HK)"         //版本
-#define VERSION_ZP "1.1.1(ZP)"         //版本
+#define VERSION_HK "1.2.41(HK)"         //版本
+#define VERSION_ZP "1.2.1(ZP)"         //版本
 
 #define CompileTime "20210305"
 

+ 2 - 2
Application_CBD/applications/dtu_uart2.c

@@ -283,7 +283,7 @@ char * makeJson_takephoto()
         return NULL;
     }
     cJSON_Delete(takephoto);
-    return r;
+    return takephoto_str;
 }
 char * makeJson_Rtutakephoto()
 {
@@ -347,7 +347,7 @@ char *makeJson_Warn(char * s,char *t)
 char * makeJson()
 {
     //如果设备工作并且电流小于500,灯管异常
-    if(atoi(device_status.power)<500&&device_status.work_status==1)
+    if(atoi(device_status.power)<400&&device_status.work_status==1)
     {
         device_status.lamp_status = 1;
     }

+ 3 - 3
Application_CBD/applications/hmi.c

@@ -28,9 +28,9 @@
 #include <shell.h>
 #include "dtu_uart2.h"
 #include <fal.h>
-#define HMI_THREAD_PRIORITY         21          //线程优先级
+#define HMI_THREAD_PRIORITY         26          //线程优先级
 #define HMI_THREAD_STACK_SIZE       2048        //线程栈空间大小
-#define HMI_THREAD_TIMESLICE        5           //时间片
+#define HMI_THREAD_TIMESLICE        10           //时间片
 
 #define CONTROL_MOTOR_PRIORITY      18
 #define CONTROL_MOTOR_STACK_SIZE    2048
@@ -573,7 +573,7 @@ static void Ctr_Mortor_entry(void* parameter)
         if(device_status.clear_status==1)
         {
             device_status.clear_status = 0;
-            if(ctr_clear(1200)==0)
+            if(ctr_clear(650)==0)
             ctr_TG_Clear(200);
         }
         rt_thread_delay(100);

+ 2 - 2
Application_CBD/packages/freemodbus-latest/samples/sample_mb_master.c

@@ -25,7 +25,7 @@
 #endif
 #define PORT_PARITY     MB_PAR_NONE
 
-#define MB_POLL_THREAD_PRIORITY  10
+#define MB_POLL_THREAD_PRIORITY  11
 #define MB_SEND_THREAD_PRIORITY  RT_THREAD_PRIORITY_MAX - 1
 
 #define MB_SEND_REG_START  0
@@ -51,7 +51,7 @@ static void send_thread_entry(void *parameter)
 //                                                              MB_SEND_REG_NUM,     /* register total number */
 //                                                              data,                /* data to be written */
 //                                                              RT_WAITING_FOREVER); /* timeout */
-        error_code = eMBMasterReqReadHoldingRegister(SLAVE_ADDR, MB_SEND_REG_START,2,RT_WAITING_FOREVER);//读多个保持寄存器
+        error_code = eMBMasterReqReadHoldingRegister(SLAVE_ADDR, MB_SEND_REG_START,2,100);//读多个保持寄存器
         rt_kprintf("error_code: %d \n",error_code);//一直出错,我便把错误返回值打印出来
         if(error_code==3)
         {

+ 5 - 1
Application_CBD/readme.md

@@ -30,4 +30,8 @@ void ymodem_ota(uint8_t argc, char **argv)
 ## 2021-03-19-版本:1.1.41(HK)
 - 最新2000万像素测报灯结构修改,清扫电机改为推杆电机.
 - 拍照增加发送 {"cmd":"takephoto"}
-- 增加补光时间60s
+- 增加补光时间60s
+## 2021-03-20-版本:1.2.41(HK)
+- 清扫-一个流程时间20s
+- 流程
+- 温湿度

+ 1 - 1
CBD_FOTA_BootLoader/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1680285775243638895" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1270605846132682832" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>