diff --git a/src/hal/bl602/hal_pins_bl602.c b/src/hal/bl602/hal_pins_bl602.c
index 2948b9538..7e83bd417 100644
--- a/src/hal/bl602/hal_pins_bl602.c
+++ b/src/hal/bl602/hal_pins_bl602.c
@@ -85,8 +85,11 @@ void HAL_PIN_PWM_Start(int index) {
 
 	if(pwm == -1) {
 		return;
-	}
-	bl_pwm_init(pwm, index, 1000);
+	}
+	
+	addLogAdv(LOG_INFO, LOG_FEATURE_MAIN,"HAL_PIN_PWM_Start: pin %i chose pwm %i\r\n",index,pwm);
+    //  Frequency must be between 2000 and 800000
+	bl_pwm_init(pwm, index, 2000);
 	bl_pwm_start(pwm);
 
 }
@@ -99,7 +102,13 @@ void HAL_PIN_PWM_Update(int index, int value) {
 	if(pwm == -1) {
 		return;
 	}
-	duty = value * 0.01f;
+	duty = value;
+/*duty is the PWM Duty Cycle (0 to 100). When duty=25, it means that in every PWM Cycle...
+--> PWM Ouput is 1 (High) for the initial 25% of the PWM Cycle
+--> Followed by PWM Output 0 (Low) for the remaining 75% of the PWM Cycle
+*/
+
+	addLogAdv(LOG_INFO, LOG_FEATURE_MAIN,"HAL_PIN_PWM_Update: pin %i had pwm %i, set %i\r\n",index,pwm,value);
 	bl_pwm_set_duty(pwm, duty);
 
 }
diff --git a/src/httpserver/http_fns.c b/src/httpserver/http_fns.c
index 6b6f9cf0f..88504acae 100644
--- a/src/httpserver/http_fns.c
+++ b/src/httpserver/http_fns.c
@@ -82,7 +82,7 @@ int http_fn_empty_url(http_request_t *request) {
 }
 int h_isChannelPWM(int tg_ch){
     int i;
-    for(i = 0; i < GPIO_MAX; i++) {
+    for(i = 0; i < PLATFORM_GPIO_MAX; i++) {
         int ch = PIN_GetPinChannelForPinIndex(i);
 		if(tg_ch != ch)
 			continue;
@@ -95,7 +95,7 @@ int h_isChannelPWM(int tg_ch){
 }
 int h_isChannelRelay(int tg_ch) {
     int i;
-    for(i = 0; i < GPIO_MAX; i++) {
+    for(i = 0; i < PLATFORM_GPIO_MAX; i++) {
         int ch = PIN_GetPinChannelForPinIndex(i);
 		if(tg_ch != ch)
 			continue;
@@ -314,7 +314,7 @@ int http_fn_cfg_mqtt_set(http_request_t *request) {
         CFG_SetMQTTBrokerName(tmpA);
     }
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 
     poststr(request,"Please wait for module to connect... if there is problem, restart it from Index html page...");
     
@@ -492,9 +492,7 @@ int http_fn_cfg_wifi_set(http_request_t *request) {
         }
         poststr(request,"WiFi mode set: connect to WLAN.");
     }
-    addLogAdv(LOG_INFO, LOG_FEATURE_HTTP,"HTTP_ProcessPacket: calling CFG_Save_IfThereArePendingChanges \r\n");
-	CFG_Save_IfThereArePendingChanges();
-    addLogAdv(LOG_INFO, LOG_FEATURE_HTTP,"HTTP_ProcessPacket: done CFG_Save_IfThereArePendingChanges \r\n");
+	CFG_Save_SetupTimer();
 
     poststr(request,"Please wait for module to reset...");
 	RESET_ScheduleModuleReset(3);
@@ -847,7 +845,7 @@ int http_fn_cfg_ha(http_request_t *request) {
     
     poststr(request,"<textarea rows=\"40\" cols=\"50\">");
 
-    for(i = 0; i < GPIO_MAX; i++) {
+    for(i = 0; i < PLATFORM_GPIO_MAX; i++) {
         int role = PIN_GetPinRoleForPinIndex(i);
         int ch = PIN_GetPinChannelForPinIndex(i);
         if(role == IOR_Relay || role == IOR_Relay_n || role == IOR_LED || role == IOR_LED_n) {
@@ -982,7 +980,7 @@ int http_fn_cfg_pins(http_request_t *request) {
 #if PLATFORM_BK7231N || PLATFORM_BK7231T
     poststr(request,"<h5>BK7231N/BK7231T supports PWM only on pins 6, 7, 8, 9, 24 and 26!</h5>");
 #endif
-    for(i = 0; i < GPIO_MAX; i++) {
+    for(i = 0; i < PLATFORM_GPIO_MAX; i++) {
         sprintf(tmpA, "%i",i);
         if(http_getArg(request->url,tmpA,tmpB,sizeof(tmpB))) {
             int role;
@@ -1030,12 +1028,12 @@ int http_fn_cfg_pins(http_request_t *request) {
         }
     }
     if(iChangedRequested>0) {
-		CFG_Save_IfThereArePendingChanges();
+		CFG_Save_SetupTimer();
         hprintf128(request, "Pins update - %i reqs, %i changed!<br><br>",iChangedRequested,iChanged);
     }
 //	strcat(outbuf,"<button type=\"button\">Click Me!</button>");
     poststr(request,"<form action=\"cfg_pins\">");
-    for(i = 0; i < GPIO_MAX; i++) {
+    for(i = 0; i < PLATFORM_GPIO_MAX; i++) {
         int si, ch, ch2;
         int j;
 		const char *alias;
diff --git a/src/httpserver/rest_interface.c b/src/httpserver/rest_interface.c
index cca5785d1..3bde1c6ab 100644
--- a/src/httpserver/rest_interface.c
+++ b/src/httpserver/rest_interface.c
@@ -763,7 +763,7 @@ static int http_rest_post_pins(http_request_t *request){
         }
     }
     if (iChanged){
-		CFG_Save_IfThereArePendingChanges();
+		CFG_Save_SetupTimer();
         ADDLOG_DEBUG(LOG_FEATURE_API, "Changed %d - saved to flash", iChanged);
     }
 
diff --git a/src/new_builtin_devices.c b/src/new_builtin_devices.c
index bbf0c4f3a..f2fd2db77 100644
--- a/src/new_builtin_devices.c
+++ b/src/new_builtin_devices.c
@@ -8,7 +8,7 @@
 void Setup_Device_Empty() {
 	CFG_ClearPins();
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 
 }
 
@@ -23,7 +23,7 @@ void Setup_Device_TuyaWL_SW01_16A() {
 	PIN_SetPinRoleForPinIndex(26, IOR_Button);
 	PIN_SetPinChannelForPinIndex(26, 1);
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 }
 // https://www.elektroda.pl/rtvforum/topic3822484.html
 //  WiFi Tuya SmartLife 4CH 10A
@@ -48,7 +48,7 @@ void Setup_Device_TuyaSmartLife4CH10A() {
 	PIN_SetPinRoleForPinIndex(26, IOR_Relay);
 	PIN_SetPinChannelForPinIndex(26, 4);
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 }
 // Tuya "12W" smart light bulb
 // "Tuya Wifi Smart Life Light Bulb Lamp E27 LED RGBCW Dimmable For Alexa/Google 18W
@@ -79,7 +79,7 @@ void Setup_Device_BK7231N_TuyaLightBulb_RGBCW_5PWMs() {
 	PIN_SetPinRoleForPinIndex(6, IOR_PWM);
 	PIN_SetPinChannelForPinIndex(6, 5);
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 }
 // https://www.elektroda.pl/rtvforum/viewtopic.php?p=19743751#19743751
 void Setup_Device_IntelligentLife_NF101A() {
@@ -94,7 +94,7 @@ void Setup_Device_IntelligentLife_NF101A() {
 	PIN_SetPinChannelForPinIndex(6, 1);
 
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 }	
 // https://www.elektroda.pl/rtvforum/topic3798114.html
 void Setup_Device_TuyaLEDDimmerSingleChannel() {
@@ -109,7 +109,7 @@ void Setup_Device_TuyaLEDDimmerSingleChannel() {
 	PIN_SetPinChannelForPinIndex(1, 1);
 
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 }
 
 
@@ -140,7 +140,7 @@ void Setup_Device_CalexLEDDimmerFiveChannel() {
 	PIN_SetPinChannelForPinIndex(26, 5);
 	PIN_SetPinRoleForPinIndex(26, IOR_PWM);
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 }
 
 void Setup_Device_CalexPowerStrip_900018_1v1_0UK() {
@@ -178,7 +178,7 @@ void Setup_Device_CalexPowerStrip_900018_1v1_0UK() {
 	PIN_SetPinChannelForPinIndex(24, 2);
 	PIN_SetPinRoleForPinIndex(24, IOR_LED);
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 }
 
 // https://www.bunnings.com.au/arlec-grid-connect-smart-9w-cct-led-downlight_p0168694
@@ -198,7 +198,7 @@ void Setup_Device_ArlecCCTDownlight() {
 	PIN_SetPinChannelForPinIndex(24, 2);
 	PIN_SetPinRoleForPinIndex(24, IOR_PWM);
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 }
 
 // https://www.elektroda.pl/rtvforum/topic3804553.html
@@ -226,7 +226,7 @@ void Setup_Device_NedisWIFIPO120FWT_16A() {
 	PIN_SetPinRoleForPinIndex(26, IOR_Relay_n);
 	PIN_SetPinChannelForPinIndex(26, 1);
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 }
 
 // https://www.elektroda.pl/rtvforum/topic3804553.html
@@ -251,7 +251,7 @@ void Setup_Device_NedisWIFIP130FWT_10A() {
 	PIN_SetPinRoleForPinIndex(26, IOR_Relay);
 	PIN_SetPinChannelForPinIndex(26, 1);
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 }
 
 // https://www.elektroda.com/rtvforum/topic3819498.html
@@ -285,7 +285,7 @@ void Setup_Device_EmaxHome_EDU8774() {
 	PIN_SetPinRoleForPinIndex(26, IOR_Relay);
 	PIN_SetPinChannelForPinIndex(26, 1);
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 }
 
 
@@ -305,7 +305,7 @@ void Setup_Device_BK7231N_CB2S_QiachipSmartSwitch() {
 	PIN_SetPinChannelForPinIndex(8, 1);
 	// Led
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 }
 void Setup_Device_BK7231T_WB2S_QiachipSmartSwitch() {
 	CFG_ClearPins();
@@ -319,7 +319,7 @@ void Setup_Device_BK7231T_WB2S_QiachipSmartSwitch() {
 	PIN_SetPinRoleForPinIndex(10, IOR_LED);
 	PIN_SetPinChannelForPinIndex(10, 1);
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 }
 
 
@@ -351,7 +351,7 @@ void Setup_Device_BK7231T_Raw_PrimeWiFiSmartOutletsOutdoor_CCWFIO232PK() {
 	PIN_SetPinChannelForPinIndex(24, 1);
 
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 }
 
 
@@ -373,7 +373,7 @@ void Setup_Device_TuyaSmartPFW02G() {
 	PIN_SetPinChannelForPinIndex(7, 1);
 
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 }
 
 
@@ -417,7 +417,7 @@ void Setup_Device_AvatarASL04() {
 	PIN_SetPinChannelForPinIndex(14, 3);
 
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 }
 
 
@@ -445,7 +445,7 @@ void Setup_Device_TuyaSmartWIFISwith_4Gang_CB3S(){
 	PIN_SetPinRoleForPinIndex(22, IOR_LED_WIFI);
 	PIN_SetPinChannelForPinIndex(22, 1);
 
-	CFG_Save_IfThereArePendingChanges();
+	CFG_Save_SetupTimer();
 }
 
 
diff --git a/src/new_cfg.c b/src/new_cfg.c
index b3c00f8da..610b9fb80 100644
--- a/src/new_cfg.c
+++ b/src/new_cfg.c
@@ -195,12 +195,20 @@ void CFG_Save_IfThereArePendingChanges() {
 	}
 }
 void PIN_SetPinChannelForPinIndex(int index, int ch) {
+	if(index < 0 || index >= PLATFORM_GPIO_MAX) {
+		addLogAdv(LOG_ERROR, LOG_FEATURE_CFG, "PIN_SetPinChannelForPinIndex: Pin index %i out of range <0,%i).",index,PLATFORM_GPIO_MAX);
+		return;
+	}
 	if(g_cfg.pins.channels[index] != ch) {
 		g_cfg_pendingChanges++;
 		g_cfg.pins.channels[index] = ch;
 	}
 }
 void PIN_SetPinChannel2ForPinIndex(int index, int ch) {
+	if(index < 0 || index >= PLATFORM_GPIO_MAX) {
+		addLogAdv(LOG_ERROR, LOG_FEATURE_CFG, "PIN_SetPinChannel2ForPinIndex: Pin index %i out of range <0,%i).",index,PLATFORM_GPIO_MAX);
+		return;
+	}
 	if(g_cfg.pins.channels2[index] != ch) {
 		g_cfg_pendingChanges++;
 		g_cfg.pins.channels2[index] = ch;
diff --git a/src/new_cfg.h b/src/new_cfg.h
index a91e754df..fe64d0984 100644
--- a/src/new_cfg.h
+++ b/src/new_cfg.h
@@ -25,6 +25,7 @@ const char *CFG_GetWebappRoot();
 int CFG_SetWebappRoot(const char *s);
 void CFG_InitAndLoad();
 void CFG_Save_IfThereArePendingChanges();
+void CFG_Save_SetupTimer();
 void CFG_IncrementOTACount();
 
 
diff --git a/src/new_pins.c b/src/new_pins.c
index 7b2f22102..557b54199 100644
--- a/src/new_pins.c
+++ b/src/new_pins.c
@@ -52,9 +52,9 @@ char g_enable_pins = 0;
 
 // it was nice to have it as bits but now that we support PWM...
 //int g_channelStates;
-int g_channelValues[GPIO_MAX] = { 0 };
+int g_channelValues[CHANNEL_MAX] = { 0 };
 
-pinButton_s g_buttons[GPIO_MAX];
+pinButton_s g_buttons[PLATFORM_GPIO_MAX];
 
 void (*g_channelChangeCallback)(int idx, int iVal) = 0;
 void (*g_doubleClickCallback)(int pinIndex) = 0;
@@ -64,22 +64,38 @@ void (*g_doubleClickCallback)(int pinIndex) = 0;
 
 void PIN_SetupPins() {
 	int i;
-	for(i = 0; i < GPIO_MAX; i++) {
+	for(i = 0; i < PLATFORM_GPIO_MAX; i++) {
 		PIN_SetPinRoleForPinIndex(i,g_cfg.pins.roles[i]);
 	}
 	addLogAdv(LOG_INFO, LOG_FEATURE_GENERAL,"PIN_SetupPins pins have been set up.\r\n");
 }
 
 int PIN_GetPinRoleForPinIndex(int index) {
+	if(index < 0 || index >= PLATFORM_GPIO_MAX) {
+		addLogAdv(LOG_ERROR, LOG_FEATURE_CFG, "PIN_GetPinRoleForPinIndex: Pin index %i out of range <0,%i).",index,PLATFORM_GPIO_MAX);
+		return 0;
+	}
 	return g_cfg.pins.roles[index];
 }
 int PIN_GetPinChannelForPinIndex(int index) {
+	if(index < 0 || index >= PLATFORM_GPIO_MAX) {
+		addLogAdv(LOG_ERROR, LOG_FEATURE_CFG, "PIN_GetPinChannelForPinIndex: Pin index %i out of range <0,%i).",index,PLATFORM_GPIO_MAX);
+		return 0;
+	}
 	return g_cfg.pins.channels[index];
 }
 int PIN_GetPinChannel2ForPinIndex(int index) {
+	if(index < 0 || index >= PLATFORM_GPIO_MAX) {
+		addLogAdv(LOG_ERROR, LOG_FEATURE_CFG, "PIN_GetPinChannel2ForPinIndex: Pin index %i out of range <0,%i).",index,PLATFORM_GPIO_MAX);
+		return 0;
+	}
 	return g_cfg.pins.channels2[index];
 }
 void RAW_SetPinValue(int index, int iVal){
+	if(index < 0 || index >= PLATFORM_GPIO_MAX) {
+		addLogAdv(LOG_ERROR, LOG_FEATURE_CFG, "RAW_SetPinValue: Pin index %i out of range <0,%i).",index,PLATFORM_GPIO_MAX);
+		return;
+	}
 	if (g_enable_pins) {
 		HAL_PIN_SetOutputValue(index, iVal);
 	}
@@ -115,6 +131,10 @@ void Button_OnLongPressHold(int index) {
 }
 
 bool BTN_ShouldInvert(int index) {
+	if(index < 0 || index >= PLATFORM_GPIO_MAX) {
+		addLogAdv(LOG_ERROR, LOG_FEATURE_CFG, "BTN_ShouldInvert: Pin index %i out of range <0,%i).",index,PLATFORM_GPIO_MAX);
+		return false;
+	}
 	if(g_cfg.pins.roles[index] == IOR_Button_n || g_cfg.pins.roles[index] == IOR_Button_ToggleAll_n|| g_cfg.pins.roles[index] == IOR_DigitalInput_n) {
 		return true;
 	}
@@ -158,7 +178,7 @@ int CHANNEL_GetType(int ch) {
 }
 bool CHANNEL_IsInUse(int ch) {
 	int i;
-	for(i = 0; i < GPIO_MAX; i++){
+	for(i = 0; i < PLATFORM_GPIO_MAX; i++){
 		if(g_cfg.pins.channels[i] == ch) {
 			switch(g_cfg.pins.roles[i])
 			{
@@ -181,7 +201,7 @@ void CHANNEL_SetAll(int iVal, bool bForce) {
 	int i;
 
 
-	for(i = 0; i < GPIO_MAX; i++) {	
+	for(i = 0; i < PLATFORM_GPIO_MAX; i++) {	
 		switch(g_cfg.pins.roles[i])
 		{
 		case IOR_Button:
@@ -216,7 +236,7 @@ void CHANNEL_SetStateOnly(int iVal) {
 	}
 
 	// is it already on on some channel?
-	for(i = 0; i < GPIO_MAX; i++) {
+	for(i = 0; i < PLATFORM_GPIO_MAX; i++) {
 		if(CHANNEL_IsInUse(i)) {
 			if(CHANNEL_Get(i) > 0) {
 				return;
@@ -246,6 +266,10 @@ void CHANNEL_DoSpecialToggleAll() {
 
 }
 void PIN_SetPinRoleForPinIndex(int index, int role) {
+	if(index < 0 || index >= PLATFORM_GPIO_MAX) {
+		addLogAdv(LOG_ERROR, LOG_FEATURE_CFG, "PIN_SetPinRoleForPinIndex: Pin index %i out of range <0,%i).",index,PLATFORM_GPIO_MAX);
+		return;
+	}
 #if 0
 	if(index == PIN_UART1_RXD) {
 		// default role to None in order to fix broken config
@@ -370,7 +394,7 @@ void Channel_OnChanged(int ch) {
 	I2C_OnChannelChanged(ch,iVal);
 #endif
 
-	for(i = 0; i < GPIO_MAX; i++) {
+	for(i = 0; i < PLATFORM_GPIO_MAX; i++) {
 		if(g_cfg.pins.channels[i] == ch) {
 			if(g_cfg.pins.roles[i] == IOR_Relay || g_cfg.pins.roles[i] == IOR_LED) {
 				RAW_SetPinValue(i,bOn);
@@ -400,16 +424,16 @@ void Channel_OnChanged(int ch) {
 
 }
 int CHANNEL_Get(int ch) {
-	if(ch < 0 || ch >= GPIO_MAX) {
-		addLogAdv(LOG_ERROR, LOG_FEATURE_GENERAL,"CHANNEL_Get: Channel index %i is out of range <0,%i)\n\r",ch,GPIO_MAX);
+	if(ch < 0 || ch >= CHANNEL_MAX) {
+		addLogAdv(LOG_ERROR, LOG_FEATURE_GENERAL,"CHANNEL_Get: Channel index %i is out of range <0,%i)\n\r",ch,CHANNEL_MAX);
 		return 0;
 	}
 	return g_channelValues[ch];
 }
 
 void CHANNEL_Set(int ch, int iVal, int bForce) {
-	if(ch < 0 || ch >= GPIO_MAX) {
-		addLogAdv(LOG_ERROR, LOG_FEATURE_GENERAL,"CHANNEL_Set: Channel index %i is out of range <0,%i)\n\r",ch,GPIO_MAX);
+	if(ch < 0 || ch >= CHANNEL_MAX) {
+		addLogAdv(LOG_ERROR, LOG_FEATURE_GENERAL,"CHANNEL_Set: Channel index %i is out of range <0,%i)\n\r",ch,CHANNEL_MAX);
 		return;
 	}
 	if(bForce == 0) {
@@ -427,8 +451,8 @@ void CHANNEL_Set(int ch, int iVal, int bForce) {
 	Channel_OnChanged(ch);
 }
 void CHANNEL_Toggle(int ch) {
-	if(ch < 0 || ch >= GPIO_MAX) {
-		addLogAdv(LOG_ERROR, LOG_FEATURE_GENERAL,"CHANNEL_Toggle: Channel index %i is out of range <0,%i)\n\r",ch,GPIO_MAX);
+	if(ch < 0 || ch >= CHANNEL_MAX) {
+		addLogAdv(LOG_ERROR, LOG_FEATURE_GENERAL,"CHANNEL_Toggle: Channel index %i is out of range <0,%i)\n\r",ch,CHANNEL_MAX);
 		return;
 	}
 	if(g_channelValues[ch] == 0)
@@ -439,8 +463,8 @@ void CHANNEL_Toggle(int ch) {
 	Channel_OnChanged(ch);
 }
 bool CHANNEL_Check(int ch) {
-	if(ch < 0 || ch >= GPIO_MAX) {
-		addLogAdv(LOG_ERROR, LOG_FEATURE_GENERAL,"CHANNEL_Check: Channel index %i is out of range <0,%i)\n\r",ch,GPIO_MAX);
+	if(ch < 0 || ch >= CHANNEL_MAX) {
+		addLogAdv(LOG_ERROR, LOG_FEATURE_GENERAL,"CHANNEL_Check: Channel index %i is out of range <0,%i)\n\r",ch,CHANNEL_MAX);
 		return 0;
 	}
 	if (g_channelValues[ch] > 0)
@@ -587,7 +611,7 @@ void PIN_ticks(void *param)
 	int i;
 	int value;
 
-	for(i = 0; i < GPIO_MAX; i++) {
+	for(i = 0; i < PLATFORM_GPIO_MAX; i++) {
 		if(g_cfg.pins.roles[i] == IOR_Button || g_cfg.pins.roles[i] == IOR_Button_n
 			|| g_cfg.pins.roles[i] == IOR_Button_ToggleAll || g_cfg.pins.roles[i] == IOR_Button_ToggleAll_n) {
 			//addLogAdv(LOG_INFO, LOG_FEATURE_GENERAL,"Test hold %i\r\n",i);
diff --git a/src/new_pins.h b/src/new_pins.h
index 1668f63e4..cba450d74 100644
--- a/src/new_pins.h
+++ b/src/new_pins.h
@@ -39,7 +39,14 @@ enum ChannelType {
 	ChType_Temperature_div10,
 	ChType_Toggle,
 };
-#define GPIO_MAX 27
+
+
+#if PLATFORM_BL602
+#define PLATFORM_GPIO_MAX 24
+#else
+#define PLATFORM_GPIO_MAX 27
+#endif
+
 #define CHANNEL_MAX 64
 
 typedef struct pinsState_s {
diff --git a/src/user_main.c b/src/user_main.c
index b92a8d8c6..13338be2b 100644
--- a/src/user_main.c
+++ b/src/user_main.c
@@ -49,6 +49,8 @@ static int g_reset = 0;
 // is connected to WiFi?
 int g_bHasWiFiConnected = 0;
 
+static int g_saveCfgAfter = 0;
+
 #define LOG_FEATURE LOG_FEATURE_MAIN
 
 
@@ -167,7 +169,9 @@ void Main_OnWiFiStatusChange(int code){
 }
 
 
-
+void CFG_Save_SetupTimer() {
+	g_saveCfgAfter = 3;
+}
 
 void Main_OnEverySecond()
 {
@@ -182,56 +186,63 @@ void Main_OnEverySecond()
 
 	g_secondsElapsed ++;
 	if(bSafeMode) { 
-		ADDLOGF_INFO("[SAFE MODE] Timer %i, free mem %d, MQTT state %i", g_secondsElapsed, xPortGetFreeHeapSize(),bMQTTconnected);
+		ADDLOGF_INFO("[SAFE MODE] Timer %i, free mem %d, MQTT state %i\n", g_secondsElapsed, xPortGetFreeHeapSize(),bMQTTconnected);
 	} else {
-		ADDLOGF_INFO("Timer %i, free mem %d, MQTT state %i", g_secondsElapsed, xPortGetFreeHeapSize(),bMQTTconnected);
+		ADDLOGF_INFO("Timer %i, free mem %d, MQTT state %i\n", g_secondsElapsed, xPortGetFreeHeapSize(),bMQTTconnected);
 	}
 
-  // print network info
-  if (!(g_secondsElapsed % 10)){
-    HAL_PrintNetworkInfo();
-  }
-
-  // when we hit 30s, mark as boot complete.
-  if (g_secondsElapsed == BOOT_COMPLETE_SECONDS){
-    boot_complete();
-  }
-
-  if (g_openAP){
-    g_openAP--;
-    if (0 == g_openAP){
-      HAL_SetupWiFiOpenAccessPoint(CFG_GetDeviceName());
-    }
-  }
-  if(g_connectToWiFi){
-	g_connectToWiFi --;
-	if(0 == g_connectToWiFi && g_bHasWiFiConnected == 0) {
-		const char *wifi_ssid, *wifi_pass;
-		wifi_ssid = CFG_GetWiFiSSID();
-		wifi_pass = CFG_GetWiFiPass();
-		HAL_ConnectToWiFi(wifi_ssid,wifi_pass);
-		// register function to get callbacks about wifi changes.
-		HAL_WiFi_SetupStatusCallback(Main_OnWiFiStatusChange);
-		ADDLOGF_DEBUG("Registered for wifi changes\r\n");
-		// reconnect after 10 minutes?
-		//g_connectToWiFi = 60 * 10; 
+	// print network info
+	if (!(g_secondsElapsed % 10)){
+		HAL_PrintNetworkInfo();
 	}
-  }
 
-  if (g_reset){
-      g_reset--;
-      if (!g_reset){
-        // ensure any config changes are saved before reboot.
-        CFG_Save_IfThereArePendingChanges(); 
-		ADDLOGF_INFO("Going to call HAL_RebootModule\r\n");
-        HAL_RebootModule(); 
-	  } else {
+	// when we hit 30s, mark as boot complete.
+	if (g_secondsElapsed == BOOT_COMPLETE_SECONDS){
+		boot_complete();
+	}
+
+	if (g_openAP){
+		g_openAP--;
+		if (0 == g_openAP){
+			HAL_SetupWiFiOpenAccessPoint(CFG_GetDeviceName());
+		}
+	}
+	if(g_connectToWiFi){
+		g_connectToWiFi --;
+		if(0 == g_connectToWiFi && g_bHasWiFiConnected == 0) {
+			const char *wifi_ssid, *wifi_pass;
+			wifi_ssid = CFG_GetWiFiSSID();
+			wifi_pass = CFG_GetWiFiPass();
+			HAL_ConnectToWiFi(wifi_ssid,wifi_pass);
+			// register function to get callbacks about wifi changes.
+			HAL_WiFi_SetupStatusCallback(Main_OnWiFiStatusChange);
+			ADDLOGF_DEBUG("Registered for wifi changes\r\n");
+			// reconnect after 10 minutes?
+			//g_connectToWiFi = 60 * 10; 
+		}
+	}
+
+	// config save moved here because of stack size problems
+	if (g_saveCfgAfter){
+		g_saveCfgAfter--;
+		if (!g_saveCfgAfter){
+			CFG_Save_IfThereArePendingChanges(); 
+		}
+	}
+	if (g_reset){
+		g_reset--;
+		if (!g_reset){
+			// ensure any config changes are saved before reboot.
+			CFG_Save_IfThereArePendingChanges(); 
+			ADDLOGF_INFO("Going to call HAL_RebootModule\r\n");
+			HAL_RebootModule(); 
+		} else {
+
+			ADDLOGF_INFO("Module reboot in %i...\r\n",g_reset);
+		}
+	}
 
-		ADDLOGF_INFO("Module reboot in %i...\r\n",g_reset);
-	  }
-  }
 
- 
 
 }