diff --git a/src/httpserver/http_fns.c b/src/httpserver/http_fns.c
index ba55b3a4f..6b6f9cf0f 100644
--- a/src/httpserver/http_fns.c
+++ b/src/httpserver/http_fns.c
@@ -80,16 +80,36 @@ int http_fn_empty_url(http_request_t *request) {
 	poststr(request, NULL);
     return 0;
 }
-
+int h_isChannelPWM(int tg_ch){
+    int i;
+    for(i = 0; i < GPIO_MAX; i++) {
+        int ch = PIN_GetPinChannelForPinIndex(i);
+		if(tg_ch != ch)
+			continue;
+        int role = PIN_GetPinRoleForPinIndex(i);
+        if(role == IOR_PWM) {
+			return true;
+        }
+    }
+	return false;
+}
+int h_isChannelRelay(int tg_ch) {
+    int i;
+    for(i = 0; i < GPIO_MAX; i++) {
+        int ch = PIN_GetPinChannelForPinIndex(i);
+		if(tg_ch != ch)
+			continue;
+        int role = PIN_GetPinRoleForPinIndex(i);
+        if(role == IOR_Relay || role == IOR_Relay_n || role == IOR_LED || role == IOR_LED_n) {
+			return true;
+        }
+    }
+	return false;
+}
 int http_fn_index(http_request_t *request) {
-    int relayFlags;
-    int pwmFlags;
     int j, i;
 	char tmpA[128];
 
-    relayFlags = 0;
-    pwmFlags = 0;
-
     http_setup(request, httpMimeTypeHTML);
     poststr(request,htmlHeader);
     poststr(request,"<style>.r { background-color: red; } .g { background-color: green; }</style>");
@@ -117,16 +137,7 @@ int http_fn_index(http_request_t *request) {
         CHANNEL_Set(j,newPWMValue,1);
     }
 
-    for(i = 0; i < 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) {
-            BIT_SET(relayFlags,ch);
-        }
-        if(role == IOR_PWM) {
-            BIT_SET(pwmFlags,ch);
-        }
-    }
+
     for(i = 0; i < CHANNEL_MAX; i++) {
 		int channelType;
 
@@ -164,7 +175,7 @@ int http_fn_index(http_request_t *request) {
 
             hprintf128(request,"Humidity Channel %i value %f Percent<br>",i, fValue);
 
-		} else if(BIT_CHECK(relayFlags,i) || channelType == ChType_Toggle) {
+		} else if(h_isChannelRelay(i) || channelType == ChType_Toggle) {
             const char *c;
             if(CHANNEL_Check(i)) {
                 c = "r";
@@ -175,7 +186,7 @@ int http_fn_index(http_request_t *request) {
             hprintf128(request,"<input type=\"hidden\" name=\"tgl\" value=\"%i\">",i);
             hprintf128(request,"<input class=\"%s\" type=\"submit\" value=\"Toggle %i\"/></form>",c,i);
         }
-        else if(BIT_CHECK(pwmFlags,i)) {
+        else if(h_isChannelPWM(i)) {
             int pwmValue;
 
             pwmValue = CHANNEL_Get(i);
@@ -818,8 +829,6 @@ int http_fn_cfg_quick(http_request_t *request) {
 }
 
 int http_fn_cfg_ha(http_request_t *request) {
-    int relayFlags = 0;
-    int pwmFlags = 0;
     int relayCount = 0;
     int pwmCount = 0;
     const char *baseName;
@@ -842,18 +851,16 @@ int http_fn_cfg_ha(http_request_t *request) {
         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) {
-            BIT_SET(relayFlags,ch);
             relayCount++;
         }
         if(role == IOR_PWM) {
-            BIT_SET(pwmFlags,ch);
             pwmCount++;
         }
     }
     if(relayCount > 0) {
         poststr(request,"switch:\n");
         for(i = 0; i < CHANNEL_MAX; i++) {
-            if(BIT_CHECK(relayFlags,i)) {
+			if(h_isChannelRelay(i)) {
                 poststr(request,"  - platform: mqtt\n");
                 hprintf128(request,"    name: \"%s %i\"\n",baseName,i);
                 hprintf128(request,"    state_topic: \"%s/%i/get\"\n",baseName,i);
@@ -869,7 +876,7 @@ int http_fn_cfg_ha(http_request_t *request) {
     if(pwmCount > 0) {
         poststr(request,"light:\n");
         for(i = 0; i < CHANNEL_MAX; i++) {
-            if(BIT_CHECK(pwmFlags,i)) {
+			if(h_isChannelPWM(i)) {
                 poststr(request,"  - platform: mqtt\n");
                 hprintf128(request,"    name: \"%s %i\"\n",baseName,i);
                 hprintf128(request,"    state_topic: \"%s/%i/get\"\n",baseName,i);
diff --git a/src/logging/logging.c b/src/logging/logging.c
index e027d00f2..d0b4906eb 100644
--- a/src/logging/logging.c
+++ b/src/logging/logging.c
@@ -227,9 +227,9 @@ void addLogAdv(int level, int feature, char *fmt, ...){
 #if PLATFORM_XR809
     printf(tmp);
 #endif
-#if PLATFORM_BL602
-    printf(tmp);
-#endif
+//#if PLATFORM_BL602
+//    printf(tmp);
+//#endif
 
     if (direct_serial_log){
         bk_printf(tmp);
diff --git a/windowsTest_msvc2008.vcproj b/windowsTest_msvc2008.vcproj
index b7bc70acb..aca896660 100644
--- a/windowsTest_msvc2008.vcproj
+++ b/windowsTest_msvc2008.vcproj
@@ -637,7 +637,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\src\new_http.h"
+				RelativePath=".\src\httpserver\new_http.h"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -649,7 +649,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\httpserver\new_http.h"
+				RelativePath=".\src\new_http.h"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -795,6 +795,10 @@
 			<Filter
 				Name="BL602"
 				>
+				<File
+					RelativePath=".\src\hal\bl602\hal_flashConfig_bl602.c"
+					>
+				</File>
 				<File
 					RelativePath=".\src\hal\bl602\hal_generic_bl602.c"
 					>
@@ -815,6 +819,10 @@
 			<Filter
 				Name="BK7231"
 				>
+				<File
+					RelativePath=".\src\hal\bk7231\hal_flashConfig_bk7231.c"
+					>
+				</File>
 				<File
 					RelativePath=".\src\hal\bk7231\hal_generic_bk7231.c"
 					>
@@ -835,6 +843,10 @@
 			<Filter
 				Name="XR809"
 				>
+				<File
+					RelativePath=".\src\hal\xr809\hal_flashConfig_xr809.c"
+					>
+				</File>
 				<File
 					RelativePath=".\src\hal\xr809\hal_generic_xr809.c"
 					>