zhunk 2 lat temu
rodzic
commit
1fee73a685

+ 2 - 2
Application_CBD/applications/control.h

@@ -25,8 +25,8 @@
     #define VERSION_HK          "1.(3ledV9).41(HK)"      //4.0海康-三色光源
     #define VERSION_HK          "1.(3ledV9).41(HK)"      //4.0海康-三色光源
     #define VERSION_HK_2000W    "1.3led.40(2000W)"       //水稻
     #define VERSION_HK_2000W    "1.3led.40(2000W)"       //水稻
 #else
 #else
-    #define VERSION_HK          "1.53.41(HK)"            //4.0海康-1200W
-    #define VERSION_HK_2000W    "1.52.40(2000W)"         //4.0水稻
+    #define VERSION_HK          "1.54.41(HK)"            //4.0海康-1200W
+    #define VERSION_HK_2000W    "1.53.40(2000W)"         //4.0水稻
 #endif
 #endif
 
 
 #define VERSION_ZP          "1.45.1(ZP)"            //1.0转盘
 #define VERSION_ZP          "1.45.1(ZP)"            //1.0转盘

+ 2 - 1
Application_CBD/applications/dtu_uart2.c

@@ -1128,7 +1128,8 @@ int parseDtu(char *json_string)
                   }
                   }
                   else if(strstr(type->valuestring,"takephoto")!=RT_NULL)
                   else if(strstr(type->valuestring,"takephoto")!=RT_NULL)
                   {
                   {
-                      HK_TakePhoto();
+                      //HK_TakePhoto();
+                      device_status.photo_ws = 1;
                       char *photo = makeJson_Warn("takephoto","control");
                       char *photo = makeJson_Warn("takephoto","control");
                       DTU_Write("%s",photo);
                       DTU_Write("%s",photo);
                       rt_free(photo);
                       rt_free(photo);

+ 1 - 1
Application_CBD/applications/sht30_collect.h

@@ -10,7 +10,7 @@
 #ifndef APPLICATIONS_INC_SHT30_COLLECT_H_
 #ifndef APPLICATIONS_INC_SHT30_COLLECT_H_
 #define APPLICATIONS_INC_SHT30_COLLECT_H_
 #define APPLICATIONS_INC_SHT30_COLLECT_H_
 #define ADC_VOL_BASE                            1.20 //ADC内部电压基准,后续版本可改为针对每一块板子实际测量后写入 flash
 #define ADC_VOL_BASE                            1.20 //ADC内部电压基准,后续版本可改为针对每一块板子实际测量后写入 flash
-#define N 11        //adc采样计算次数
+#define N 5        //adc采样计算次数
 #define UART_485 "uart5"  /*串口设备名称*/
 #define UART_485 "uart5"  /*串口设备名称*/
 
 
 
 

+ 6 - 0
Application_CBD/readme.md

@@ -1,3 +1,9 @@
+
+
+# 2024-10-10 更新说明
+1. 修改ADC采样滤波次数11>5,减少雨控的检测时间
+2. 修复四情平台下发测试拍照没有提前开灯导致图片颜色发绿问题;
+
 # 2024-09-07 更新说明
 # 2024-09-07 更新说明
 #define VERSION_HK          "1.53.41(HK)"       //4.0海康-1200W
 #define VERSION_HK          "1.53.41(HK)"       //4.0海康-1200W
 #define VERSION_HK_2000W    "1.52.40(2000W)"         //4.0水稻
 #define VERSION_HK_2000W    "1.52.40(2000W)"         //4.0水稻