Merge branch 'ise' of https://git.siwatsystem.com/ise-senior-iot/iot-firmware into ise

src/user_code.cpp

@@ -139,9 +139,9 @@ void ac_toggle_pop_callback(void *ptr)
 {
     //this function should set the state of the AC to toggle between off (mode 0) and the same state as before store in variable acmode
     if (ac_get_mode() == 0) {
-        ac_set_state(acmode, ac_get_temperature(), ac_get_fan_speed());
+        ac_set_state(user_acmode, ac_get_temperature(), ac_get_fan_speed());
     } else {
-        acmode = ac_get_mode();
+        user_acmode = ac_get_mode();
         ac_set_state(0, ac_get_temperature(), ac_get_fan_speed());
     }
 

src/user_code.hpp

@@ -61,7 +61,7 @@
 #define ANALOG_REPORTING_INTERVAL 500
 
 // User Defined Variables
-uint8_t acmode = 0;
+uint8_t user_acmode = 0;
 
 // User Defined Functions
 #define elcd ESPMega_EXTLCD