任立新 修改该温控系统的逻辑

othersoft/TemperatureControler/project/CMakeLists.txt

@@ -10,6 +10,7 @@ include_directories("../src/json")
 include_directories("../src/TimeWorker")
 include_directories("../src/Temperature")
 include_directories("../src/controler")
+include_directories("../src/sunfunction")
 set(CMAKE_MOC_VERBOSE TRUE)
 add_executable(TemperatureControler
         tempmain.cpp
@@ -18,6 +19,7 @@ add_executable(TemperatureControler
         ../src/Temperature/TemperaTureWoker.cpp
         ../src/Temperature/TG_Manager.cpp
         ../src/Temperature/TemperatureRegulator.cpp
+        ../src/sunfunction/sunupanddown.cpp
 
         )
 

othersoft/TemperatureControler/project/Constant_Temperature_Config.json

@@ -9,23 +9,29 @@
     "BaudRate": 115200,
     "Pin": {
       "TG": {
-        "Pin_H": 7,
-        "Pin_L": 10
+        "Pin_H": 2,
+        "Pin_L": 3
         },
       "Fan": {
-        "Pin": 11
+        "Pin": 10
         },
       "HOT": {
-        "Pin": 12
+        "Pin": 7
        }
     },
     "Constant_Temperature": {
-      "MaxTemp": 35,
-      "MinTemp": 30
+        "CoolBegin_Temp_Insight": 20,
+        "CoolBegin_Diff_Temp": 5,
+        "HeatingBegin_Temp_Insight": 0,
+      "IsCoolInDaylight": false
     },
-    "Temperature": {
-      "index_x": 0,
-        "index_y": 0
+    "Location": {
+      "latitude": 0,
+      "longitude": 0
+    },
+    "IndexInfo": {
+      "Insight": [{"x":7,"y":1},{"x":8,"y":1}],
+      "Outside": [{"x":1,"y":1},{"x":2,"y":1}]
     }
   }