yf_zjb %!s(int64=4) %!d(string=hai) anos
pai
achega
73dc04e746

+ 1 - 1
Application_CBD/.cproject

@@ -47,7 +47,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.target.other.2041717463" name="Other target flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.target.other" useByScannerDiscovery="true" value="" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit.1463655269" name="FPU Type" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit" useByScannerDiscovery="true" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit.default" valueType="enumerated"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1798638225" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-							<builder autoBuildTarget="all" buildPath="${workspace_loc:/Application_CBD}/Debug" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1736709688" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="GNU Make 构建器" parallelBuildOn="false" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
+							<builder autoBuildTarget="all" buildPath="${workspace_loc:/Application_CBD}/Debug" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1736709688" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="GNU Make Builder" parallelBuildOn="false" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.1810966071" name="GNU ARM Cross Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1072524326" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.161242639" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" useByScannerDiscovery="true" valueType="includePath">

BIN=BIN
Application_CBD/.settings/.rtmenus


+ 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="1370599309796052585" 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="1370330221103438797" 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 - 0
Application_CBD/.settings/org.eclipse.core.resources.prefs

@@ -1,3 +1,4 @@
+autoUpdatePkgs=false
 eclipse.preferences.version=1
 encoding//applications/control.c=UTF-8
 encoding//applications/control.h=UTF-8

+ 7 - 6
Application_CBD/applications/control.h

@@ -31,13 +31,13 @@
 #define VERSION_Robot       "1.0(robot)"            //展厅机器人
 #define CompileTime         rt_sprintf(device_status.driver_compile,"%s-%s",__DATE__,__TIME__)              //编译时间,每次更新代码修改
 /*********************************************************************/
-typedef struct{
+typedef struct  _packed
+{
     uint8_t iSave;          //存储标志位
     uint8_t dtype;          //设备类型
     uint8_t photo_ws;
     uint8_t power_status;
     uint8_t sun_test;
-    uint8_t sensor_sta;      //0-正常,1-平台获取温湿度
     uint8_t heat_status;     //加热状态   0-关   1-开
     uint8_t lamp_status;     //灯管1状态   0-关   1-开
     uint8_t lamp1_status;    //灯管2状态   0-关   1-开
@@ -60,7 +60,6 @@ typedef struct{
     uint8_t heat_time_min;  //实时加热时间
     uint8_t clt_time;       //收集时间
     uint8_t vol;            //音量
-    uint16_t thsp;          //息屏时间
     uint8_t refresh_num;    //DTU数据刷新时间
     uint8_t refresh_timeout;//刷新超时时间
     uint8_t sunBar;         //光控定时时间
@@ -68,10 +67,8 @@ typedef struct{
     uint8_t stopBar;        //时控结束时间
     uint8_t tph;            //高温保护
     int8_t tpl;             //低温保护
-    uint16_t shake_sec;      //震动时间
     uint8_t timeSwitch;     //模式0光控,1时控
     uint8_t link_sta;       //有线接入状态:0-未接入,1已接入
-    uint16_t dattim;         //数据上传间隔
     uint8_t heattem;        //加热仓温度(实时)
     uint8_t hmi_fresh;      //是否启动屏幕
     uint8_t update_flag;    //是否启动升级
@@ -80,7 +77,10 @@ typedef struct{
     uint8_t stop_in_bootloader;     //进入bootloader模式 1
     uint8_t account_status;         //卡状态
     uint8_t test_flag;              //测试标志
-    uint8_t sensor_485_sta;         //485传感器
+    volatile uint8_t sensor_485_sta;         //485传感器
+    uint16_t dattim;         //数据上传间隔
+    uint16_t shake_sec;      //震动时间
+    uint16_t thsp;           //息屏时间
     rt_uint32_t num_updata;         //
     rt_uint32_t rebootcnt;          //启动次数
     rt_uint32_t light_over_tim;     //光控定时差秒数,镇流器的结束时间
@@ -112,6 +112,7 @@ typedef struct{
     char *power;              //功率
     char *voltage;             //电池电压
 }Device_Status_typedef;
+
 /************************************************/
 #define ON 1
 #define OFF 0

+ 14 - 17
Application_CBD/applications/dtu_uart2.c

@@ -77,7 +77,6 @@ void DTU_Write(char *fmt, ...)
     str_length = rt_vsnprintf(dtu_str, sizeof(dtu_str) - 1, fmt, arg);
     if (str_length > 800 - 1)
         str_length = 800 - 1;
-
     rt_device_write(dtuserial, 0, dtu_str, str_length);
     if(strstr(dtu_str,"volume")!=RT_NULL)
     {
@@ -222,8 +221,10 @@ static void dtu_thread_entry_send(void *parameter)
                 else {
                     char *readinfo =  makeJson_ReadInfo();
                     rt_kprintf("upload data:%s\n",readinfo);
-                    UpLoad_Data();
+                    DTU_Write("%s",readinfo);
                     rt_free(readinfo);
+                    rt_thread_delay(1000);
+                    UpLoad_Data();
                     if(atoi(device_status.fuse_voltage)<1)
                     {
                         rt_thread_delay(500);
@@ -469,7 +470,7 @@ char * makeJson()
     else if (device_status.version_type==6) {
         rt_sprintf(device_status.driver,"%s-%s",VERSION_XCT,device_status.driver_4g);
     }
-    if(device_status.sensor_485_sta==1)
+    if(device_status.sensor_485_sta!=0)
     {
         if(strstr(device_status.driver,"485")==RT_NULL)
         strcat(device_status.driver,".485");
@@ -598,7 +599,7 @@ char * makeJson()
         rt_sprintf(utos, "%d",device_status.work_status);
         cJSON_AddStringToObject(pSubJson,"ws",utos);
 
-    char * p = cJSON_PrintUnformatted(pJsonRoot);
+    char *p = cJSON_PrintUnformatted(pJsonRoot);
     if(NULL == p)
     {
         cJSON_Delete(pJsonRoot);
@@ -609,7 +610,7 @@ char * makeJson()
     return p;
 }
 //JSON数据解析
-void parseDtu(char *json_string)
+int parseDtu(char *json_string)
 {
     extern int rt_hw_rtc_init(void);
     char* json_s = NULL;
@@ -658,7 +659,7 @@ void parseDtu(char *json_string)
     {
         cJSON_Delete(root);
         rt_kprintf("parse json err:%s",json_string);
-        return;
+        return -1;
     }
     else
     {
@@ -817,23 +818,20 @@ void parseDtu(char *json_string)
               //设置温湿度
               else if (strstr(item_cmd->valuestring,"sensor")!=RT_NULL) {
                   //2022-04-12add:485传感器正常,不再解析服务器下发的温湿度数据
-                  if(device_status.sensor_485_sta==1) return;
-
+                  //if(device_status.sensor_485_sta!=0) return 0;
                   hum = cJSON_GetObjectItem(item_ext,"new_hum");
                   tmp = cJSON_GetObjectItem(item_ext,"new_tem");
                   if(hum!=NULL&&tmp!=NULL)
                   {
-                      device_status.sensor_sta = 1;
                       //先判断是否是空字符再判断数值是否合理
-                      if(strcmp(hum->valuestring,"")!=0&&atoi(hum->valuestring)>=0&&atoi(hum->valuestring)<=100&&atoi(hum->valuestring)!=30)
+                      if(strcmp(hum->valuestring,"")!=0&&atoi(hum->valuestring)>=0&&atoi(hum->valuestring)<=100&&atoi(hum->valuestring)!=30&&device_status.sensor_485_sta==0)
                       {
                           if(atoi(hum->valuestring)!=atoi(device_status.humidity))
                           {
-                              rt_sprintf(device_status.humidity, "%s",hum->valuestring);
+                               rt_sprintf(device_status.humidity, "%s",hum->valuestring);
                                ef_set_env_blob("env_h",&device_status.humidity,sizeof(device_status.humidity));        //湿度
                                rt_kprintf("保存湿度成功:%d\n",atoi(device_status.humidity));
                           }
-                          rt_sprintf(device_status.humidity, "%s",hum->valuestring);
                           rt_kprintf("设置湿度成功:%d\n",atoi(device_status.humidity));
                       }
                       else
@@ -841,7 +839,7 @@ void parseDtu(char *json_string)
                           rt_kprintf("设置湿度失败:%s!!!\n",hum->valuestring);
                       }
                       //先判断是否是空字符再判断数值是否合理
-                      if(strcmp(tmp->valuestring,"")!=0&&atoi(tmp->valuestring)>-50&&atoi(tmp->valuestring)<=100)
+                      if(strcmp(tmp->valuestring,"")!=0&&atoi(tmp->valuestring)>-50&&atoi(tmp->valuestring)<=100&&device_status.sensor_485_sta==0)
                       {
                           if(atoi(tmp->valuestring)!=atoi(device_status.tempture))
                           {
@@ -849,7 +847,6 @@ void parseDtu(char *json_string)
                               ef_set_env_blob("env_t",&device_status.tempture,sizeof(device_status.tempture));        //湿度
                               rt_kprintf("保存温度成功:%d\n",atoi(device_status.tempture));
                           }
-                          rt_sprintf(device_status.tempture, "%s",tmp->valuestring);
                           rt_kprintf("设置温度成功:%d\n",atoi(device_status.tempture));
                       }
                       else {
@@ -1158,7 +1155,6 @@ void parseDtu(char *json_string)
                                       rt_kprintf("结束时间et设置失败参数错误!!!\n");
                                   }
                               }
-
                           }
 
                           if(collt!=NULL)
@@ -1490,7 +1486,7 @@ void parseDtu(char *json_string)
           }
         cJSON_Delete(root);
     }
-    return;
+    return 0;
 }
 
 void UpLoad_Data(void)
@@ -1498,8 +1494,9 @@ void UpLoad_Data(void)
 
     char *updata = makeJson();
     rt_kprintf("upload data:%d\n%s\n",rt_strlen(updata),updata);
-    DTU_Write("%s",updata);
     rt_free(updata);
+    DTU_Write("%s",updata);
+    updata = NULL;
     list_mem();
     //播放数据上传中语音
 }

+ 2 - 2
Application_CBD/applications/dtu_uart2.h

@@ -25,8 +25,8 @@ typedef struct{
 //{"cmd":"synchronization","ext":{"year":1,"month":1,"day":0,"hour":25,"min":0,"sec":0,"lat":"113.2056","lng":"21.0596","csq",31,"net",0,"iccid","123135453","imei":"895864646464464"}}
 void DTU_Write(char *fmt, ...);
 int dtu_data_play(void);
-void parseDtu(char *json_string);
-char *makeJson();
+int parseDtu(char *json_string);
+char *makeJson(void);
 char *makeJson_platform(char *plt);
 char *makeJson_Rtutakephoto();
 char *makeJson_ReadInfo();

+ 4 - 13
Application_CBD/applications/sht30_collect.c

@@ -37,7 +37,7 @@
 static char send_buf[64];
 
 //#define serial_printf(x,...) {sprintf(send_buf,x,##__VA_ARGS__);rt_kprintf(send_buf);}
-extern Device_Status_typedef device_status;
+Device_Status_typedef device_status;
 
 
 rt_device_t serial_485;   /*串口设备句柄*/
@@ -49,6 +49,7 @@ int8_t hum_value,tem_value;
 
 static rt_thread_t tid1 = RT_NULL;
 static rt_thread_t tid2 = RT_NULL;
+
 ADC_HandleTypeDef hadc1;
 /*串口初始化*/
 int UART_485_INIT(void)
@@ -67,7 +68,6 @@ int UART_485_INIT(void)
     return 0;
 }
 
-
 /* 入口函数 */
 static void sht30_collect_thread_entry(void *parameter)
 {
@@ -97,22 +97,13 @@ static void sht30_collect_thread_entry(void *parameter)
             }
             else {
                 sht3x_softreset(sht3x_device);
-//                if(device_status.sensor_sta==0)
-//                {
-//                    rt_sprintf(device_status.humidity,"30.0");
-//                    rt_sprintf(device_status.tempture,"25.0");
-//                }
             }
 ////          rt_kprintf("sht30 humidity   : %d.%d  ", (int)sht3x_device->humidity, (int)(sht3x_device->humidity * 10) % 10);
 ////          rt_kprintf("temperature: %d.%d\n", (int)sht3x_device->temperature, (int)(sht3x_device->temperature * 10) % 10);
         }
         else
         {
-//            if(device_status.sensor_sta==0)
-//            {
-//                rt_sprintf(device_status.humidity,"30.0");
-//                rt_sprintf(device_status.tempture,"25.0");
-//            }
+
             rt_kprintf("read sht3x fail.\r\n");
             //重新初始化
             sht3x_deinit(sht3x_device);
@@ -427,10 +418,10 @@ int Read_Ntc_Voltage(void)
     return adc12_ntc;
 }
 
+
 /* 创建线程 */
 int sht30_collect(void)
 {
-    //UART_485_INIT();
     /* 创建线程*/
     tid1 = rt_thread_create("sht30_collect_thread",sht30_collect_thread_entry, RT_NULL,THREAD_STACK_SIZE,THREAD_PRIORITY, THREAD_TIMESLICE);
     tid2 = rt_thread_create("Power Check thread", Power_ReadCheck, RT_NULL, P_THREAD_STACK_SIZE, P_THREAD_PRIORITY, P_THREAD_TIMESCLICE);

+ 0 - 141
Application_CBD/packages/freemodbus-latest/samples/sample_mb_master.c

@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2019-06-21     flybreak     first version
- */
-
-#include <rtthread.h>
-
-#include "mb.h"
-#include "mb_m.h"
-#include <user_mb_app.h>
-#include <control.h>
-#ifdef PKG_MODBUS_MASTER_SAMPLE
-#define SLAVE_ADDR      MB_SAMPLE_TEST_SLAVE_ADDR
-#define PORT_NUM        MB_MASTER_USING_PORT_NUM
-#define PORT_BAUDRATE   MB_MASTER_USING_PORT_BAUDRATE
-#else
-#define SLAVE_ADDR      0x01
-#define PORT_NUM        5
-#define PORT_BAUDRATE   9600
-#endif
-#define PORT_PARITY     MB_PAR_NONE
-
-#define MB_POLL_THREAD_PRIORITY  11
-#define MB_SEND_THREAD_PRIORITY  RT_THREAD_PRIORITY_MAX - 1
-
-//#define MB_SEND_REG_START  1034
-#define MB_SEND_REG_START  0
-
-#define MB_SEND_REG_NUM    10
-
-#define MB_POLL_CYCLE_MS   500
-extern Device_Status_typedef device_status;
-extern USHORT   usMRegInBuf[MB_MASTER_TOTAL_SLAVE_NUM][M_REG_INPUT_NREGS];
-extern USHORT usMRegHoldBuf[MB_MASTER_TOTAL_SLAVE_NUM][M_REG_HOLDING_NREGS];
-extern int mb_master_samlpe(void);
-static void send_thread_entry(void *parameter)
-{
-    eMBMasterReqErrCode error_code = MB_MRE_NO_ERR;
-    rt_uint16_t error_count = 0;
-    //USHORT data[3] = {0};
-    while (1)
-    {
-        /* Test Modbus Master */
-//        data[0] = (USHORT)(rt_tick_get() / 10);
-//        data[1] = (USHORT)(rt_tick_get() % 10);
-//        data[3] = data[1] + 1;
-//        error_code = eMBMasterReqWriteMultipleHoldingRegister(SLAVE_ADDR,          /* salve address */
-//                                                              MB_SEND_REG_START,   /* register start address */
-//                                                              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,1000);//读多个保持寄存器
-        rt_kprintf("error_code: %d \n",error_code);//一直出错,我便把错误返回值打印出来
-        if(error_code==0)
-        {
-            device_status.sensor_485_sta=1;
-            error_count = 0;
-            //温度=25并且湿度=30不更新,否则会导致屏幕上显示空
-//            if((int)usMRegHoldBuf[0][0]/10!=25&&(int)usMRegHoldBuf[0][1]/10!=30)
-//            {
-                rt_sprintf(device_status.tempture,"%d.%d",(int)usMRegHoldBuf[0][0]/100, (uint)usMRegHoldBuf[0][0] % 100);
-                rt_sprintf(device_status.humidity,"%d.%d",(int)usMRegHoldBuf[0][1]/100, (uint)usMRegHoldBuf[0][1] % 100);
-//            }
-        }
-        rt_kprintf("slave data-tem:%d,hum:%d\n",usMRegHoldBuf[0][0],usMRegHoldBuf[0][1]);//0代表从机ID=1
-        rt_kprintf("slave data-tem:%s,hum:%s\n",device_status.tempture,device_status.humidity);//0代表从机ID=1
-        rt_thread_delay(5000);
-        /* Record the number of errors */
-        if (error_code != 0)
-        {
-            error_count++;
-            if(error_count == 10)
-            {
-                error_count = 0;
-                device_status.sensor_485_sta = 0;
-//                rt_sprintf(device_status.tempture,"20.0");
-//                rt_sprintf(device_status.humidity,"100.0");
-            }
-        }
-    }
-}
-
-static void mb_master_poll(void *parameter)
-{
-    eMBMasterInit(MB_RTU, PORT_NUM, PORT_BAUDRATE, PORT_PARITY);
-    eMBMasterEnable();
-
-    while (1)
-    {
-        eMBMasterPoll();
-        rt_thread_mdelay(MB_POLL_CYCLE_MS);
-    }
-}
-
-int mb_master_samlpe(void)
-{
-    static rt_uint8_t is_init = 0;
-    rt_thread_t tid1 = RT_NULL, tid2 = RT_NULL;
-
-    if (is_init > 0)
-    {
-        rt_kprintf("sample is running\n");
-        return -RT_ERROR;
-    }
-    tid1 = rt_thread_create("md_m_poll", mb_master_poll, RT_NULL, 512, MB_POLL_THREAD_PRIORITY, 10);
-    if (tid1 != RT_NULL)
-    {
-        rt_thread_startup(tid1);
-    }
-    else
-    {
-        goto __exit;
-    }
-
-    tid2 = rt_thread_create("md_m_send", send_thread_entry, RT_NULL, 512, MB_SEND_THREAD_PRIORITY, 10);
-    if (tid2 != RT_NULL)
-    {
-        rt_thread_startup(tid2);
-    }
-    else
-    {
-        goto __exit;
-    }
-
-    is_init = 1;
-    return RT_EOK;
-
-__exit:
-    if (tid1)
-        rt_thread_delete(tid1);
-    if (tid2)
-        rt_thread_delete(tid2);
-
-    return -RT_ERROR;
-}
-MSH_CMD_EXPORT(mb_master_samlpe, run a modbus master sample);

+ 2 - 0
Application_CBD/readme.md

@@ -1,3 +1,5 @@
+# 2022-11-18 更新说明:
+- 1.修复内存溢出问题,不能再json处理函数中退出,会导致cJSON_Delete函数未被执行,内存无法释放;
 # 2022-11-06更新说明:
 ## define VERSION_HK          "1.47.41(HK)"        //4.0海康- 
 ## define VERSION_HK_2000W    "1.44.4(2000W)"      //4.0水稻