Merge branch 'master' of http://jiecheng2024.tpddns.cn:3000/liyuezong/SmartPDCode

output/t113s/push/tools/script.sh

@@ -56,7 +56,9 @@ rm -f  $obj
 echo ++++ upgrade ok! ++++
 echo ++++ reboot now! ++++
 
-reboot  -f
+reboot  -d 1
+
+exit 0
 
 
 

pro/CMakeLists.txt

@@ -271,7 +271,8 @@ set(PDU_SRC_LIST
 	${PROJECT_SOURCE_DIR}/src/hlw8110_handle.c
 	${PROJECT_SOURCE_DIR}/src/breaker_detection.c
 	${PROJECT_SOURCE_DIR}/src/cascade_slave_tcp.c
-	#${PROJECT_SOURCE_DIR}/src/Cellular.c
+	${PROJECT_SOURCE_DIR}/src/Cellular.c
+	${PROJECT_SOURCE_DIR}/src/wifi.c
 
 	${PROJECT_SOURCE_DIR}/modbus/src/modbus.c
 	${PROJECT_SOURCE_DIR}/modbus/src/modbus-data.c