zhunk před 2 roky
rodič
revize
4bd971fcb7

+ 33 - 3
Application_CBD/.config

@@ -127,7 +127,7 @@ CONFIG_RT_USING_PWM=y
 # CONFIG_RT_USING_PM is not set
 CONFIG_RT_USING_RTC=y
 # CONFIG_RT_USING_ALARM is not set
-CONFIG_RT_USING_SOFT_RTC=y
+# CONFIG_RT_USING_SOFT_RTC is not set
 # CONFIG_RT_USING_SDIO is not set
 CONFIG_RT_USING_SPI=y
 # CONFIG_RT_USING_QSPI is not set
@@ -229,7 +229,6 @@ CONFIG_RT_USING_RYM=y
 # CONFIG_PKG_USING_KAWAII_MQTT is not set
 # CONFIG_PKG_USING_BC28_MQTT is not set
 # CONFIG_PKG_USING_WEBTERMINAL is not set
-# CONFIG_PKG_USING_LIBMODBUS is not set
 CONFIG_PKG_USING_FREEMODBUS=y
 CONFIG_PKG_FREEMODBUS_PATH="/packages/iot/freemodbus"
 CONFIG_PKG_MODBUS_MASTER=y
@@ -280,6 +279,12 @@ CONFIG_PKG_FREEMODBUS_VER="latest"
 # end of Wiced WiFi
 
 # CONFIG_PKG_USING_RW007 is not set
+
+#
+# CYW43012 WiFi
+#
+# CONFIG_PKG_USING_WLAN_CYW43012 is not set
+# end of CYW43012 WiFi
 # end of Wi-Fi
 
 # CONFIG_PKG_USING_COAP is not set
@@ -314,6 +319,7 @@ CONFIG_PKG_OTA_DOWNLOADER_PATH="/packages/iot/ota_downloader"
 # CONFIG_OTA_DOWNLOADER_DEBUG is not set
 # CONFIG_PKG_USING_HTTP_OTA is not set
 CONFIG_PKG_USING_YMODEM_OTA=y
+# CONFIG_PKG_USING_OTA_DOWNLOADER_V010 is not set
 # CONFIG_PKG_USING_OTA_DOWNLOADER_V100 is not set
 CONFIG_PKG_USING_OTA_DOWNLOADER_LATEST_VERSION=y
 CONFIG_PKG_OTA_DOWNLOADER_VER="latest"
@@ -333,6 +339,7 @@ CONFIG_PKG_OTA_DOWNLOADER_VER="latest"
 # CONFIG_PKG_USING_NMEALIB is not set
 # CONFIG_PKG_USING_PDULIB is not set
 # CONFIG_PKG_USING_BTSTACK is not set
+# CONFIG_PKG_USING_BT_CYW43012 is not set
 # CONFIG_PKG_USING_LORAWAN_ED_STACK is not set
 # CONFIG_PKG_USING_WAYZ_IOTKIT is not set
 # CONFIG_PKG_USING_MAVLINK is not set
@@ -352,6 +359,8 @@ CONFIG_PKG_OTA_DOWNLOADER_VER="latest"
 # CONFIG_PKG_USING_ZFTP is not set
 # CONFIG_PKG_USING_WOL is not set
 # CONFIG_PKG_USING_ZEPHYR_POLLING is not set
+# CONFIG_PKG_USING_MATTER_ADAPTATION_LAYER is not set
+# CONFIG_PKG_USING_LHC_MODBUS is not set
 # end of IoT - internet of things
 
 #
@@ -410,7 +419,6 @@ CONFIG_PKG_CJSON_VER="v1.5.9"
 #
 # LVGL: powerful and easy-to-use embedded GUI library
 #
-# CONFIG_PKG_USING_LVGL is not set
 # CONFIG_PKG_USING_LITTLEVGL2RTT is not set
 # CONFIG_PKG_USING_LV_MUSIC_DEMO is not set
 # CONFIG_PKG_USING_GUI_GUIDER_DEMO is not set
@@ -512,6 +520,7 @@ CONFIG_PKG_EASYFLASH_VER_NUM=0x99999
 # CONFIG_PKG_USING_ARMV7M_DWT_TOOL is not set
 # CONFIG_PKG_USING_VOFA_PLUS is not set
 # CONFIG_PKG_USING_RT_TRACE is not set
+# CONFIG_PKG_USING_ZDEBUG is not set
 # end of tools packages
 
 #
@@ -554,6 +563,8 @@ CONFIG_PKG_EASYFLASH_VER_NUM=0x99999
 # end of Micrium: Micrium software products porting for RT-Thread
 
 # CONFIG_PKG_USING_FREERTOS_WRAPPER is not set
+# CONFIG_PKG_USING_LITEOS_SDK is not set
+# CONFIG_PKG_USING_TZ_DATABASE is not set
 # CONFIG_PKG_USING_CAIRO is not set
 # CONFIG_PKG_USING_PIXMAN is not set
 # CONFIG_PKG_USING_PARTITION is not set
@@ -611,6 +622,7 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_QBOOT is not set
 # CONFIG_PKG_USING_PPOOL is not set
 # CONFIG_PKG_USING_OPENAMP is not set
+# CONFIG_PKG_USING_RPMSG_LITE is not set
 # CONFIG_PKG_USING_LPM is not set
 # CONFIG_PKG_USING_TLSF is not set
 # CONFIG_PKG_USING_EVENT_RECORDER is not set
@@ -624,6 +636,11 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_AGILE_UPGRADE is not set
 # CONFIG_PKG_USING_FLASH_BLOB is not set
 # CONFIG_PKG_USING_MLIBC is not set
+# CONFIG_PKG_USING_TASK_MSG_BUS is not set
+# CONFIG_PKG_USING_SFDB is not set
+# CONFIG_PKG_USING_RTP is not set
+# CONFIG_PKG_USING_REB is not set
+# CONFIG_PKG_USING_R_RHEALSTONE is not set
 # end of system packages
 
 #
@@ -693,6 +710,7 @@ CONFIG_PKG_SHT3X_PATH="/packages/peripherals/sensors/sht3x"
 # CONFIG_PKG_USING_SHT3X_V100 is not set
 CONFIG_PKG_USING_SHT3X_LATEST_VERSION=y
 CONFIG_PKG_SHT3X_VER="latest"
+# CONFIG_PKG_USING_SHT4X is not set
 # CONFIG_PKG_USING_AD7746 is not set
 # CONFIG_PKG_USING_ADT74XX is not set
 # CONFIG_PKG_USING_MAX17048 is not set
@@ -714,6 +732,7 @@ CONFIG_PKG_SHT3X_VER="latest"
 # CONFIG_PKG_USING_FT5426 is not set
 # CONFIG_PKG_USING_FT6236 is not set
 # CONFIG_PKG_USING_XPT2046_TOUCH is not set
+# CONFIG_PKG_USING_CST816X is not set
 # end of touch drivers
 
 # CONFIG_PKG_USING_REALTEK_AMEBA is not set
@@ -799,6 +818,11 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_LRF_NV7LIDAR is not set
 # CONFIG_PKG_USING_AIP650 is not set
 # CONFIG_PKG_USING_FINGERPRINT is not set
+# CONFIG_PKG_USING_BT_ECB02C is not set
+# CONFIG_PKG_USING_UAT is not set
+# CONFIG_PKG_USING_VS1003 is not set
+# CONFIG_PKG_USING_X9555 is not set
+# CONFIG_PKG_USING_SYSTEM_RUN_LED is not set
 # end of peripheral libraries and drivers
 
 #
@@ -813,14 +837,18 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_ULAPACK is not set
 # CONFIG_PKG_USING_QUEST is not set
 # CONFIG_PKG_USING_NAXOS is not set
+# CONFIG_PKG_USING_R_TINYMAIX is not set
 # end of AI packages
 
 #
 # Signal Processing and Control Algorithm Packages
 #
 # CONFIG_PKG_USING_FIRE_PID_CURVE is not set
+# CONFIG_PKG_USING_QPID is not set
 # CONFIG_PKG_USING_UKAL is not set
 # CONFIG_PKG_USING_DIGITALCTRL is not set
+# CONFIG_PKG_USING_KISSFFT is not set
+# CONFIG_PKG_USING_CMSIS_DSP is not set
 # end of Signal Processing and Control Algorithm Packages
 
 #
@@ -855,6 +883,7 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_DONUT is not set
 # CONFIG_PKG_USING_COWSAY is not set
 # CONFIG_PKG_USING_MORSE is not set
+# CONFIG_PKG_USING_TINYSQUARE is not set
 # end of entertainment: terminal games and other interesting software packages
 
 # CONFIG_PKG_USING_LIBCSV is not set
@@ -863,6 +892,7 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_MINILZO is not set
 # CONFIG_PKG_USING_QUICKLZ is not set
 # CONFIG_PKG_USING_LZMA is not set
+# CONFIG_PKG_USING_RALARAM is not set
 # CONFIG_PKG_USING_MULTIBUTTON is not set
 # CONFIG_PKG_USING_FLEXIBLE_BUTTON is not set
 # CONFIG_PKG_USING_CANFESTIVAL is not set

+ 3 - 3
Application_CBD/.config.old

@@ -374,12 +374,12 @@ CONFIG_PKG_OTA_DOWNLOADER_VER="latest"
 #
 CONFIG_PKG_USING_CJSON=y
 CONFIG_PKG_CJSON_PATH="/packages/language/JSON/cJSON"
-CONFIG_PKG_USING_CJSON_V1715=y
+# CONFIG_PKG_USING_CJSON_V1715 is not set
 # CONFIG_PKG_USING_CJSON_V1714 is not set
-# CONFIG_PKG_USING_CJSON_V159 is not set
+CONFIG_PKG_USING_CJSON_V159=y
 # CONFIG_PKG_USING_CJSON_V102 is not set
 # CONFIG_PKG_USING_CJSON_LATEST_VERSION is not set
-CONFIG_PKG_CJSON_VER="v1.7.15"
+CONFIG_PKG_CJSON_VER="v1.5.9"
 # CONFIG_PKG_USING_LJSON is not set
 # CONFIG_PKG_USING_RT_CJSON_TOOLS is not set
 # CONFIG_PKG_USING_RAPIDJSON is not set

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 1
Application_CBD/.cproject


binární
Application_CBD/Debug/Application_CBD.bin


binární
Application_CBD/Debug/Application_CBD.elf


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 2970 - 3011
Application_CBD/Debug/Application_CBD.map


binární
Application_CBD/Debug/applications/control.o


binární
Application_CBD/Debug/applications/dtu_uart2.o


binární
Application_CBD/Debug/applications/main.o


binární
Application_CBD/Debug/packages/freemodbus-latest/port/user_mb_app_m.o


+ 0 - 59
Application_CBD/Debug/rt-thread/components/drivers/rtc/soft_rtc.d

@@ -1,59 +0,0 @@
-rt-thread/components/drivers/rtc/soft_rtc.o: \
- ../rt-thread/components/drivers/rtc/soft_rtc.c \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rtconfig_preinc.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtthread.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD/rtconfig.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtdebug.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtdef.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_signal.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD/cconfig.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtlibc.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_stat.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_errno.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_fcntl.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_ioctl.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_dirent.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_signal.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_fdset.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtservice.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtm.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\finsh/finsh_api.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\drivers\include/drivers/rtc.h
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rtconfig_preinc.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtthread.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD/rtconfig.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtdebug.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtdef.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_signal.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD/cconfig.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtlibc.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_stat.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_errno.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_fcntl.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_ioctl.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_dirent.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_signal.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_fdset.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtservice.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtm.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\finsh/finsh_api.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\drivers\include/drivers/rtc.h:

binární
Application_CBD/Debug/rt-thread/components/drivers/rtc/soft_rtc.o


+ 3 - 6
Application_CBD/Debug/rt-thread/components/drivers/rtc/subdir.mk

@@ -4,16 +4,13 @@
 
 # Add inputs and outputs from these tool invocations to the build variables 
 C_SRCS += \
-../rt-thread/components/drivers/rtc/rtc.c \
-../rt-thread/components/drivers/rtc/soft_rtc.c 
+../rt-thread/components/drivers/rtc/rtc.c 
 
 OBJS += \
-./rt-thread/components/drivers/rtc/rtc.o \
-./rt-thread/components/drivers/rtc/soft_rtc.o 
+./rt-thread/components/drivers/rtc/rtc.o 
 
 C_DEPS += \
-./rt-thread/components/drivers/rtc/rtc.d \
-./rt-thread/components/drivers/rtc/soft_rtc.d 
+./rt-thread/components/drivers/rtc/rtc.d 
 
 
 # Each subdirectory must supply rules for building sources it contributes

binární
Application_CBD/Debug/rt-thread/src/kservice.o


+ 1 - 1
Application_CBD/applications/control.c

@@ -2646,7 +2646,7 @@ static void IO_Check_thread_entry(void *parameter)
             GuangShan = false;
             GaoyYa_cnt = 500;
             GuangShan_cnt = 500;
-
+            rt_thread_delay(1000);
         }
         rt_thread_delay(20);
     }

+ 2 - 2
Application_CBD/applications/dtu_uart2.c

@@ -1307,8 +1307,8 @@ int parseDtu(char *json_string)
                   value_commn = cJSON_GetObjectItem(item_ext,"photo_sta");
                   if(value_commn!=RT_NULL)
                   {
-                      device_status.camera_sta = atoi(value_commn->valuestring);
-                      HMI_WRITE("menu.eth1_sta.val=%d",atoi(value_commn->valuestring));
+                      device_status.camera_sta = value_commn->valueint;
+                      HMI_WRITE("menu.eth1_sta.val=%d",!device_status.camera_sta);
                   }
                   value_commn = cJSON_GetObjectItem(item_ext,"cpu_tmp");
                   sprintf(device_status.cpu_temp,"%s",value_commn->valuestring);

+ 5 - 2
Application_CBD/rtconfig.h

@@ -93,7 +93,6 @@
 #define RT_USING_ADC
 #define RT_USING_PWM
 #define RT_USING_RTC
-#define RT_USING_SOFT_RTC
 #define RT_USING_SPI
 #define RT_USING_SFUD
 #define RT_SFUD_USING_SFDP
@@ -156,7 +155,7 @@
 #define RT_M_REG_INPUT_START 0
 #define RT_M_REG_INPUT_NREGS 10
 #define RT_M_REG_HOLDING_START 0
-#define RT_M_REG_HOLDING_NREGS 100
+#define RT_M_REG_HOLDING_NREGS 10
 #define RT_M_HD_RESERVE 0
 #define RT_M_IN_RESERVE 4
 #define RT_M_CO_RESERVE 0
@@ -178,6 +177,10 @@
 /* Wiced WiFi */
 
 /* end of Wiced WiFi */
+
+/* CYW43012 WiFi */
+
+/* end of CYW43012 WiFi */
 /* end of Wi-Fi */
 
 /* IoT Cloud */