Merge branch 'new_mbed_tls' of https://192.168.14.200:3000/dtelenkov/bt-670x into new_mbed_tls

.cproject

@@ -88,6 +88,21 @@
 				<useDefaultCommand>true</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
+			<target name="debug_bt_6702" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildTarget>HARDWARE=bt6702 VERBOSE=1 DEBUG=1 PRINTF=custom MAC=EC-4C-4D-00-00-0A</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="HARDWARE=bt6708 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-00-0A" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments/>
+				<buildTarget>HARDWARE=bt6708 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-00-0A</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
 		</buildTargets>
 	</storageModule>
 </cproject>

config/board.h

@@ -3,7 +3,7 @@
 
 #if defined HARDWARE_BT6702
 #include "board_bt6702.h"
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
 #include "board_bt6706.h"
 #endif
 

config/common_config.h

@@ -23,6 +23,8 @@
 #define HW_REV                          "BT-6706"
 #elif HARDWARE_BT6702
 #define HW_REV                          "BT-6702"
+#elif HARDWARE_BT6708
+#define HW_REV                          "BT-6708"
 #endif
 
 

iap/Modules/Ethernet/fsdata.c

@@ -37,10 +37,10 @@ Content-Encoding: gzip
 0x70,0x6c,0x69,0x63,0x61,0x74,0x69,0x6f,0x6e,0x2f,0x78,0x2d,0x6a,0x61,0x76,0x61,
 0x73,0x63,0x72,0x69,0x70,0x74,0x0d,0x0a,0x43,0x6f,0x6e,0x74,0x65,0x6e,0x74,0x2d,
 0x45,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3a,0x20,0x67,0x7a,0x69,0x70,0x0d,0x0a,
-/* "ETag: "nDSMsRN636l3uGC"
+/* "ETag: "r1YlG0QAthB3307"
 " (25 bytes) */
-0x45,0x54,0x61,0x67,0x3a,0x20,0x22,0x6e,0x44,0x53,0x4d,0x73,0x52,0x4e,0x36,0x33,
-0x36,0x6c,0x33,0x75,0x47,0x43,0x22,0x0d,0x0a,0x0d,0x0a,
+0x45,0x54,0x61,0x67,0x3a,0x20,0x22,0x72,0x31,0x59,0x6c,0x47,0x30,0x51,0x41,0x74,
+0x68,0x42,0x33,0x33,0x30,0x37,0x22,0x0d,0x0a,0x0d,0x0a,
 
 /* raw file data (846 bytes) */
 0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x04,0x0a,0xb5,0x54,0xd1,0x4a,0x1b,0x41,
@@ -126,10 +126,10 @@ static const unsigned char data__favicon_ico[] = {
 " (28 bytes) */
 0x43,0x6f,0x6e,0x74,0x65,0x6e,0x74,0x2d,0x74,0x79,0x70,0x65,0x3a,0x20,0x69,0x6d,
 0x61,0x67,0x65,0x2f,0x78,0x2d,0x69,0x63,0x6f,0x6e,0x0d,0x0a,
-/* "ETag: "zdkIjdkLOR2ugvo"
+/* "ETag: "GCUjqQVwmDuhYUq"
 " (25 bytes) */
-0x45,0x54,0x61,0x67,0x3a,0x20,0x22,0x7a,0x64,0x6b,0x49,0x6a,0x64,0x6b,0x4c,0x4f,
-0x52,0x32,0x75,0x67,0x76,0x6f,0x22,0x0d,0x0a,0x0d,0x0a,
+0x45,0x54,0x61,0x67,0x3a,0x20,0x22,0x47,0x43,0x55,0x6a,0x71,0x51,0x56,0x77,0x6d,
+0x44,0x75,0x68,0x59,0x55,0x71,0x22,0x0d,0x0a,0x0d,0x0a,
 
 /* raw file data (1150 bytes) */
 0x00,0x00,0x01,0x00,0x01,0x00,0x10,0x10,0x00,0x00,0x00,0x00,0x20,0x00,0x68,0x04,
@@ -222,10 +222,10 @@ static const unsigned char data__login_html[] = {
 0x2e,0x31,0x20,0x28,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x73,0x61,0x76,0x61,0x6e,
 0x6e,0x61,0x68,0x2e,0x6e,0x6f,0x6e,0x67,0x6e,0x75,0x2e,0x6f,0x72,0x67,0x2f,0x70,
 0x72,0x6f,0x6a,0x65,0x63,0x74,0x73,0x2f,0x6c,0x77,0x69,0x70,0x29,0x0d,0x0a,
-/* "Content-Length: 462
+/* "Content-Length: 450
 " (21 bytes) */
 0x43,0x6f,0x6e,0x74,0x65,0x6e,0x74,0x2d,0x4c,0x65,0x6e,0x67,0x74,0x68,0x3a,0x20,
-0x34,0x36,0x32,0x0d,0x0a,
+0x34,0x35,0x30,0x0d,0x0a,
 /* "Connection: Close
 " (19 bytes) */
 0x43,0x6f,0x6e,0x6e,0x65,0x63,0x74,0x69,0x6f,0x6e,0x3a,0x20,0x43,0x6c,0x6f,0x73,
@@ -237,41 +237,41 @@ Content-Encoding: gzip
 0x78,0x74,0x2f,0x68,0x74,0x6d,0x6c,0x0d,0x0a,0x43,0x6f,0x6e,0x74,0x65,0x6e,0x74,
 0x2d,0x45,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3a,0x20,0x67,0x7a,0x69,0x70,0x0d,
 0x0a,
-/* "ETag: "btPuMKNs4kkQgqn"
+/* "ETag: "CJBxVy4Oio48r5C"
 " (25 bytes) */
-0x45,0x54,0x61,0x67,0x3a,0x20,0x22,0x62,0x74,0x50,0x75,0x4d,0x4b,0x4e,0x73,0x34,
-0x6b,0x6b,0x51,0x67,0x71,0x6e,0x22,0x0d,0x0a,0x0d,0x0a,
-
-/* raw file data (462 bytes) */
-0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x04,0x0a,0x8d,0x52,0xbd,0x6e,0x14,0x31,
-0x10,0xee,0xf3,0x14,0xc6,0x35,0x9b,0xbd,0x5c,0x85,0x92,0xf5,0x49,0x28,0x04,0x89,
-0x0a,0x0a,0x90,0xa0,0xf4,0xd9,0x73,0x6b,0x2b,0x5e,0xdb,0xac,0x67,0xef,0x72,0x54,
-0x11,0x05,0x15,0x12,0x88,0x96,0x82,0x57,0x88,0xa0,0xe0,0x50,0x94,0x3c,0x83,0xef,
-0x8d,0x18,0xef,0x1d,0x51,0x44,0x03,0xdb,0xcc,0x7a,0xec,0xf9,0xfe,0xec,0xe6,0xc1,
-0x93,0xe7,0xa7,0x2f,0xdf,0xbc,0x38,0x63,0x06,0x3b,0x37,0x3b,0x68,0x4a,0x61,0x4e,
-0xfa,0x56,0x70,0x5e,0x96,0x20,0x35,0x95,0x0e,0x50,0x32,0x65,0x64,0x9f,0x00,0x05,
-0x1f,0x70,0x51,0x3d,0x2a,0xbb,0x63,0xdb,0x20,0xc6,0x0a,0xde,0x0e,0x76,0x29,0xf8,
-0xeb,0xea,0xd5,0xe3,0xea,0x34,0x74,0x51,0xa2,0x9d,0x3b,0xe0,0x4c,0x05,0x8f,0xe0,
-0x69,0xe6,0xd9,0x99,0x00,0xdd,0xc2,0xdd,0x94,0x97,0x1d,0x08,0xbe,0xb4,0xb0,0x8a,
-0xa1,0xc7,0x7b,0x07,0x57,0x56,0xa3,0x11,0x1a,0x96,0x56,0x41,0x35,0x2e,0x1e,0x32,
-0xeb,0x2d,0x5a,0xe9,0xaa,0xa4,0xa4,0x03,0x71,0x54,0x40,0x9c,0xf5,0xe7,0xac,0x07,
-0x27,0x78,0xc2,0xb5,0x83,0x64,0x00,0x08,0xc5,0xf4,0xb0,0x10,0x7c,0xb1,0x1a,0x7b,
-0x87,0x2a,0xa5,0x72,0x14,0x2d,0x3a,0x98,0x35,0xf5,0xae,0x1e,0x34,0xf5,0xde,0xd4,
-0x3c,0xe8,0x35,0x6d,0x9b,0x29,0x1b,0x8f,0x0b,0x8e,0x70,0x81,0x95,0x74,0xb6,0xf5,
-0xc7,0x4c,0x91,0x6a,0xe8,0x4f,0x58,0x94,0x5a,0x5b,0xdf,0x56,0x18,0xe2,0x31,0x3b,
-0x9a,0x4c,0xe2,0xc5,0x09,0x9f,0xe5,0xcf,0xf9,0xfb,0xf6,0x7d,0xbe,0xdd,0x5e,0xe6,
-0x4d,0xfe,0x99,0xaf,0xb6,0x1f,0xf2,0x66,0xfb,0x89,0x80,0xa7,0x84,0xb7,0x08,0x7d,
-0xc7,0x94,0x93,0x29,0x51,0x52,0xd1,0x05,0xa9,0xab,0xd2,0xe2,0x4c,0x2a,0xb4,0xc1,
-0x0b,0x5e,0x2b,0x03,0xea,0xdc,0x85,0xd6,0xfa,0x43,0xd5,0x5a,0xce,0x28,0x46,0x13,
-0xb4,0xe0,0x31,0x24,0x24,0xc1,0x8c,0xbe,0xc6,0xfa,0x38,0x20,0xb3,0xd4,0xdd,0x61,
-0x3c,0xb5,0x25,0x4e,0x5c,0x47,0x4a,0xad,0xe8,0xe4,0x2c,0x3a,0xa9,0xc0,0x04,0xa7,
-0xa1,0x17,0x3c,0x7f,0xcd,0xb7,0xf9,0x07,0xa9,0xb9,0xa1,0x28,0x77,0xdc,0x23,0x01,
-0x67,0xc9,0xbe,0xa3,0x91,0xe9,0x84,0xb3,0x5d,0xe4,0x43,0x82,0xbe,0xfc,0xf1,0xfa,
-0x3f,0x98,0x22,0xb9,0x58,0x85,0x5e,0xff,0xcd,0xf6,0x8d,0x3c,0x5f,0x12,0xe3,0xf5,
-0xf6,0xe3,0xbf,0xf8,0xee,0x20,0x46,0xbe,0x66,0xa0,0x47,0x76,0xcf,0xe0,0x5e,0xeb,
-0x1c,0xfd,0x1f,0x73,0x69,0x98,0x77,0x96,0xec,0x2d,0xa5,0x1b,0x48,0x78,0xfe,0x42,
-0x34,0xbf,0x28,0xec,0xcd,0x98,0x4c,0x53,0x17,0x80,0xa6,0x2e,0x89,0x96,0xba,0xbf,
-0xc3,0x7a,0x7c,0xbd,0xbf,0x01,0xeb,0x25,0x1e,0xef,0xcd,0x02,0x00,0x00,};
+0x45,0x54,0x61,0x67,0x3a,0x20,0x22,0x43,0x4a,0x42,0x78,0x56,0x79,0x34,0x4f,0x69,
+0x6f,0x34,0x38,0x72,0x35,0x43,0x22,0x0d,0x0a,0x0d,0x0a,
+
+/* raw file data (450 bytes) */
+0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x04,0x0a,0x85,0x52,0x3d,0x8f,0xd4,0x30,
+0x10,0xfd,0x2b,0xc6,0x35,0xb9,0xec,0x6d,0x85,0x8e,0x38,0x12,0x3a,0x0e,0x89,0x0a,
+0x0a,0x90,0xa0,0xf4,0xda,0xb3,0xc9,0xe8,0x1c,0xdb,0xc4,0x93,0xdd,0x5b,0xaa,0x13,
+0x05,0x15,0x12,0x88,0x96,0x82,0xbf,0x80,0xa0,0x60,0x11,0xe2,0x7e,0x83,0xf7,0x1f,
+0x31,0x49,0x58,0x84,0x28,0xa0,0xf1,0xc7,0x64,0xde,0x9b,0xf7,0x5e,0x5c,0xdd,0xba,
+0xff,0xe8,0xfc,0xc9,0xf3,0xc7,0x17,0xa2,0xa5,0xce,0xd5,0xd5,0xb8,0x0a,0xa7,0x7d,
+0xa3,0xa4,0xe4,0x1b,0x68,0x5b,0x57,0x1d,0x90,0x16,0xa6,0xd5,0x7d,0x02,0x52,0x72,
+0xa0,0x75,0x71,0x87,0xbf,0x4d,0xd5,0x96,0x28,0x16,0xf0,0x62,0xc0,0x8d,0x92,0xcf,
+0x8a,0xa7,0xf7,0x8a,0xf3,0xd0,0x45,0x4d,0xb8,0x72,0x20,0x85,0x09,0x9e,0xc0,0x33,
+0xe4,0xe1,0x85,0x02,0xdb,0xc0,0x11,0xe4,0x75,0x07,0x4a,0x6e,0x10,0xb6,0x31,0xf4,
+0xf4,0x47,0xdf,0x16,0x2d,0xb5,0xca,0xc2,0x06,0x0d,0x14,0xd3,0xe5,0x36,0x7a,0x24,
+0xd4,0xae,0x48,0x46,0x3b,0x50,0xa7,0x4c,0xe1,0xd0,0x5f,0x8a,0x1e,0x9c,0x92,0x89,
+0x76,0x0e,0x52,0x0b,0xc0,0x1c,0x6d,0x0f,0x6b,0x25,0xd7,0xdb,0xa9,0x76,0x62,0x52,
+0xe2,0x4e,0x42,0x72,0x50,0x57,0xe5,0x71,0x9f,0xdd,0xac,0x82,0xdd,0xb1,0xb3,0xa5,
+0x98,0x5a,0x95,0x24,0xb8,0xa2,0x42,0x3b,0x6c,0xfc,0x99,0x30,0x2c,0x17,0xfa,0xbb,
+0x22,0x6a,0x6b,0xd1,0x37,0x05,0x85,0x78,0x26,0x4e,0x17,0x8b,0x78,0x25,0xeb,0xfc,
+0x2e,0x7f,0x3e,0xbc,0xca,0x37,0x87,0xeb,0xbc,0xcf,0x5f,0xf3,0xa7,0xc3,0xeb,0xbc,
+0x3f,0xbc,0xad,0xca,0x76,0x59,0x57,0xeb,0xd0,0x77,0xc2,0x38,0x9d,0x12,0xe7,0x13,
+0x5d,0xd0,0xb6,0x18,0x4b,0x52,0x68,0x43,0x18,0xbc,0x92,0xa5,0x69,0xc1,0x5c,0xba,
+0xd0,0xa0,0x3f,0x31,0x0d,0x4a,0xc1,0xe9,0xb5,0xc1,0x2a,0x19,0x43,0x22,0x96,0x8a,
+0x3e,0x0e,0x24,0x90,0x0b,0x33,0xfc,0x01,0x8e,0x01,0xd2,0x2e,0x72,0x50,0xa3,0x40,
+0x29,0xa2,0xd3,0x06,0xda,0xe0,0x2c,0xf4,0x4a,0xe6,0x0f,0xf9,0x26,0x7f,0x61,0x1d,
+0x3f,0x38,0xbd,0x79,0xec,0xc4,0x2d,0x45,0xc2,0x97,0x0c,0x59,0x2e,0xa4,0x98,0x53,
+0x1e,0x12,0xf4,0xe3,0x49,0xd6,0xe2,0x9f,0x43,0x22,0x6b,0xdf,0x86,0xde,0xfe,0x3d,
+0xe8,0x23,0x1b,0xbd,0xe6,0x61,0xdf,0x0f,0x6f,0xfe,0x37,0xea,0x37,0x45,0x5d,0x0d,
+0xfc,0x92,0x66,0x4b,0xbf,0xd4,0xad,0xc8,0x1f,0xed,0xa4,0x61,0xd5,0x21,0x1b,0xda,
+0x68,0x37,0xb0,0xd4,0xfc,0x9e,0xd9,0xbf,0x71,0xb0,0x7b,0x8e,0xa1,0x1c,0x81,0xe5,
+0x18,0x1d,0x6f,0xf3,0x8f,0x2a,0xa7,0x77,0xf9,0x13,0x7e,0xda,0x07,0x75,0xa7,0x02,
+0x00,0x00,};
 
 static const unsigned int dummy_align__index_html = 3;
 static const unsigned char data__index_html[] = {
@@ -290,10 +290,10 @@ static const unsigned char data__index_html[] = {
 0x2e,0x31,0x20,0x28,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x73,0x61,0x76,0x61,0x6e,
 0x6e,0x61,0x68,0x2e,0x6e,0x6f,0x6e,0x67,0x6e,0x75,0x2e,0x6f,0x72,0x67,0x2f,0x70,
 0x72,0x6f,0x6a,0x65,0x63,0x74,0x73,0x2f,0x6c,0x77,0x69,0x70,0x29,0x0d,0x0a,
-/* "Content-Length: 979
+/* "Content-Length: 930
 " (21 bytes) */
 0x43,0x6f,0x6e,0x74,0x65,0x6e,0x74,0x2d,0x4c,0x65,0x6e,0x67,0x74,0x68,0x3a,0x20,
-0x39,0x37,0x39,0x0d,0x0a,
+0x39,0x33,0x30,0x0d,0x0a,
 /* "Connection: Close
 " (19 bytes) */
 0x43,0x6f,0x6e,0x6e,0x65,0x63,0x74,0x69,0x6f,0x6e,0x3a,0x20,0x43,0x6c,0x6f,0x73,
@@ -305,74 +305,71 @@ Content-Encoding: gzip
 0x78,0x74,0x2f,0x68,0x74,0x6d,0x6c,0x0d,0x0a,0x43,0x6f,0x6e,0x74,0x65,0x6e,0x74,
 0x2d,0x45,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3a,0x20,0x67,0x7a,0x69,0x70,0x0d,
 0x0a,
-/* "ETag: "bYAJLlS8w89TkR5"
+/* "ETag: "ZMjEXlNhzZHYzIL"
 " (25 bytes) */
-0x45,0x54,0x61,0x67,0x3a,0x20,0x22,0x62,0x59,0x41,0x4a,0x4c,0x6c,0x53,0x38,0x77,
-0x38,0x39,0x54,0x6b,0x52,0x35,0x22,0x0d,0x0a,0x0d,0x0a,
-
-/* raw file data (979 bytes) */
-0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x04,0x0a,0x8d,0x55,0x4d,0x8f,0xdc,0x44,
-0x10,0xbd,0xef,0xaf,0x68,0xfa,0x12,0x40,0xeb,0x75,0x72,0x40,0x8a,0xc0,0x1e,0x09,
-0x42,0x90,0x38,0xc1,0x81,0x20,0x38,0xf6,0xd8,0xbd,0x33,0x9d,0xd8,0x6d,0x63,0xb7,
-0x67,0xb3,0xb7,0xfd,0x00,0x11,0x89,0x15,0x48,0x08,0x09,0x09,0x89,0x48,0x08,0x7e,
-0xc0,0x64,0xd8,0xcd,0xce,0xee,0xce,0x4e,0xfe,0x42,0xf7,0x3f,0xe2,0x55,0xdb,0x9e,
-0x0c,0x0e,0x07,0x0e,0x33,0x6e,0x77,0x75,0x55,0xbd,0xae,0xf7,0xaa,0x1c,0xbd,0xf5,
-0xf1,0x67,0x0f,0xbe,0xf8,0xfa,0xf3,0x87,0x6c,0x6a,0xf2,0x6c,0xb4,0x13,0xd1,0x83,
-0x65,0x42,0x4f,0x62,0xce,0xe9,0x55,0x8a,0x14,0x8f,0x5c,0x1a,0xc1,0x92,0xa9,0xa8,
-0x6a,0x69,0x62,0xde,0x98,0xfd,0xe0,0x3e,0x59,0xfd,0xf6,0xd4,0x98,0x32,0x90,0xdf,
-0x34,0x6a,0x16,0xf3,0xaf,0x82,0x47,0x1f,0x06,0x0f,0x8a,0xbc,0x14,0x46,0x8d,0x33,
-0xc9,0x59,0x52,0x68,0x23,0x35,0x7c,0x3e,0x7d,0x18,0xcb,0x74,0x22,0x37,0x5e,0x5a,
-0xe4,0x32,0xe6,0x33,0x25,0x0f,0xca,0xa2,0x32,0x5b,0x07,0x0f,0x54,0x6a,0xa6,0x71,
-0x2a,0x67,0x2a,0x91,0x81,0x7f,0xd9,0x65,0x4a,0x2b,0xa3,0x44,0x16,0xd4,0x89,0xc8,
-0x64,0x7c,0x6f,0xef,0xee,0x2e,0xcb,0xc5,0x53,0x95,0x37,0xf9,0xf6,0x56,0x53,0xcb,
-0xca,0xbf,0x0b,0xa4,0x8e,0xef,0x52,0xaa,0x4c,0xe9,0x27,0xac,0x92,0x59,0xcc,0x6b,
-0x73,0x98,0xc9,0x7a,0x2a,0x25,0x72,0x4d,0x2b,0xb9,0x8f,0x5b,0x94,0x59,0x21,0xd2,
-0xbd,0xa4,0xae,0xe9,0xa4,0x51,0x26,0x93,0x23,0xfb,0xdc,0xbe,0xb0,0xb7,0x76,0x6d,
-0x17,0xf6,0xc6,0x5e,0x60,0xb5,0xb4,0x17,0xcc,0xbe,0x72,0x47,0x76,0xed,0x9e,0xe1,
-0x65,0x61,0xaf,0xed,0x32,0x0a,0xdb,0xc3,0x3b,0x51,0xd8,0x95,0x67,0x5c,0xa4,0x87,
-0x88,0xa1,0xc5,0x8c,0x25,0x99,0xa8,0xeb,0x98,0x63,0x39,0x16,0x15,0x1f,0x45,0x21,
-0x56,0x30,0xa5,0x6a,0xc6,0x54,0x1a,0xf3,0xa4,0x68,0xb4,0x09,0x0e,0x2a,0x51,0x22,
-0x29,0x63,0xfd,0xfe,0x1d,0xbf,0x9f,0x16,0x07,0xfa,0x0e,0x6d,0xc3,0x50,0x8e,0xec,
-0x6f,0xc0,0x71,0xeb,0x4e,0x28,0x39,0xd0,0x00,0x8f,0x3b,0x62,0xf6,0x85,0x3b,0xb5,
-0xe7,0x58,0x9e,0x00,0x16,0xed,0x00,0xe5,0xa5,0x9d,0xdb,0xbf,0xdd,0x11,0x0c,0x2f,
-0x09,0x33,0x73,0xdf,0xf7,0x06,0x16,0xd5,0xa5,0xd0,0x5b,0x89,0x75,0x93,0x8f,0x25,
-0x60,0xbd,0x17,0x85,0x64,0x19,0x31,0x77,0x0c,0x97,0x6b,0xb8,0xde,0xda,0xf3,0xbd,
-0x28,0x2c,0x3d,0xa8,0x10,0x68,0x81,0xb9,0x7b,0x10,0xf4,0xee,0x56,0x84,0xbb,0x24,
-0x7f,0x08,0xe3,0xde,0xff,0x2d,0x16,0x4e,0xee,0x44,0xfb,0x45,0x95,0x33,0x26,0x12,
-0xa3,0x0a,0x1d,0xf3,0xb0,0xaf,0xfd,0x44,0x71,0x06,0x11,0x4d,0x0b,0x94,0xa6,0x2c,
-0x6a,0x70,0x23,0x75,0x62,0x0e,0x4b,0x48,0x23,0x6f,0x32,0xa3,0x4a,0x51,0x99,0x90,
-0x7c,0x83,0x54,0x18,0xc1,0x59,0xa1,0xeb,0x66,0x9c,0x2b,0xe8,0xa9,0x92,0xa6,0xa9,
-0x34,0xfb,0x52,0x64,0x0a,0x26,0xf9,0xb6,0x99,0xaa,0xfa,0x9d,0x0f,0x08,0xd9,0x16,
-0xde,0x36,0x4d,0x40,0x01,0x06,0x96,0x49,0xa3,0x52,0x12,0x63,0x5b,0xe9,0x5f,0xec,
-0x8d,0xfb,0x89,0xa1,0xcc,0x03,0xf2,0x69,0x73,0x40,0x3e,0x43,0xa5,0x2e,0xe8,0xa4,
-0xfb,0x0e,0xff,0xe7,0xd0,0xc4,0xca,0xae,0xdf,0xef,0x2b,0x57,0xa0,0x85,0x3c,0x7d,
-0x99,0x1a,0xd9,0x3f,0x20,0x96,0x35,0x58,0x5a,0x7a,0x06,0x17,0x76,0x0e,0x2e,0xcf,
-0xc8,0x7f,0xce,0xbc,0x65,0x85,0xd8,0x67,0xee,0x47,0x77,0xd2,0x32,0xbb,0x04,0xc5,
-0x4b,0x06,0x89,0x21,0x01,0xc4,0x46,0xda,0xbb,0xa2,0xd3,0x6b,0x70,0xb4,0xa4,0x43,
-0x00,0x79,0xb6,0xcb,0xdc,0xb7,0xa0,0xfb,0xca,0xde,0xbc,0x89,0xcc,0x1d,0x33,0x64,
-0x9a,0xbb,0x63,0x92,0xaa,0x57,0x86,0xd7,0xaf,0x5d,0xb1,0x77,0xf7,0xc6,0x4a,0x47,
-0x21,0x40,0xbd,0x46,0xf7,0x27,0x30,0xcc,0x49,0x3b,0x2d,0xaa,0x57,0xee,0xb4,0x5d,
-0x5c,0x6f,0x32,0xb8,0xd3,0x37,0x72,0x0c,0x62,0xfc,0x8e,0x08,0x2f,0xfb,0x08,0xd7,
-0x84,0x15,0xd7,0x85,0x9a,0x18,0xb7,0xbf,0x6e,0x44,0x79,0x49,0xe8,0xdd,0x19,0xef,
-0x7d,0xa3,0xb0,0xad,0x12,0x49,0xbc,0x2b,0xfc,0x02,0x8e,0x97,0x76,0xe1,0xd1,0x9f,
-0x50,0x79,0x16,0x20,0x03,0xd7,0x6e,0x3b,0x91,0xfe,0x51,0x89,0x25,0x35,0x03,0x95,
-0x0a,0x15,0xb8,0xb0,0x57,0xb8,0xad,0xaf,0xe2,0xa0,0x43,0xc8,0x1b,0x15,0x06,0xac,
-0x55,0x5b,0x35,0x60,0x79,0x0e,0xbf,0x15,0x7c,0x50,0x8e,0x0e,0x09,0x74,0xde,0xc9,
-0xbb,0xeb,0xc1,0x4e,0xe0,0x9d,0x60,0x5e,0xeb,0xdc,0x93,0xa9,0x74,0xd9,0x18,0xdf,
-0x45,0xad,0xfd,0x13,0x45,0xa3,0xad,0xcc,0x44,0x22,0xa7,0x45,0x96,0xca,0x2a,0xe6,
-0xf6,0x2f,0xe4,0x04,0x2b,0x9c,0xa5,0xaa,0xa6,0xf9,0x03,0x41,0xf7,0x2b,0x0c,0xb7,
-0x76,0x28,0xec,0xc3,0x2f,0xa0,0xc1,0xc7,0x59,0xd8,0x31,0xb1,0x25,0x56,0xb2,0x3e,
-0xf2,0x33,0x89,0x8d,0x8d,0xa6,0x5f,0x50,0x56,0x2a,0x17,0xd5,0xa1,0xd7,0xa9,0x47,
-0xe2,0x9b,0xd6,0xfe,0xec,0x7e,0x80,0x52,0xd7,0xee,0xa8,0xeb,0x62,0x4f,0x2a,0x2e,
-0x32,0xc4,0xf9,0x91,0xd1,0x9c,0xb5,0xdd,0x44,0xc1,0x37,0x38,0xda,0x5b,0x70,0xd6,
-0xce,0x60,0xea,0x2c,0x6f,0xee,0x31,0xb5,0x7d,0x8f,0x78,0xff,0x9a,0x03,0x9b,0xf8,
-0xdd,0x65,0x86,0x18,0xbb,0x44,0x6d,0x7f,0x72,0x36,0x13,0x59,0x83,0x2e,0xfe,0x0f,
-0x1d,0xf8,0xa6,0x6b,0xa1,0x0e,0x42,0xa5,0xf8,0xec,0x60,0xba,0x74,0x91,0xc6,0x8d,
-0x31,0x05,0x2e,0xd0,0x47,0x1a,0xb2,0xe8,0x09,0x99,0x14,0x63,0x91,0x3c,0xe1,0x8c,
-0xf8,0xa4,0x36,0xc7,0xb3,0x4e,0x2a,0x55,0x9a,0x2e,0x88,0x91,0x4f,0x4d,0xf8,0x58,
-0xcc,0x44,0xbb,0xcb,0x59,0x5d,0x25,0x9b,0xd1,0xff,0x18,0x93,0x1f,0x25,0xf4,0xe7,
-0x37,0x82,0x88,0xc2,0x6e,0x9a,0x87,0xfe,0x8b,0xf8,0x0f,0x3e,0x33,0xab,0x25,0x21,
-0x07,0x00,0x00,};
+0x45,0x54,0x61,0x67,0x3a,0x20,0x22,0x5a,0x4d,0x6a,0x45,0x58,0x6c,0x4e,0x68,0x7a,
+0x5a,0x48,0x59,0x7a,0x49,0x4c,0x22,0x0d,0x0a,0x0d,0x0a,
+
+/* raw file data (930 bytes) */
+0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x04,0x0a,0x8d,0x55,0x4d,0x6f,0xdc,0x36,
+0x10,0xfd,0x2b,0x2c,0x4f,0x6d,0x61,0x59,0xcd,0x21,0x40,0xd1,0x4a,0x02,0xda,0x34,
+0x05,0x72,0x4a,0x0f,0x4d,0xd1,0x1c,0x29,0x89,0x5e,0x31,0x91,0x28,0x55,0xa2,0xd6,
+0xf1,0xcd,0x1f,0x2d,0x5a,0x20,0x46,0x03,0x04,0x05,0x0a,0x14,0x68,0x80,0xa2,0xfd,
+0x01,0x9b,0xad,0x1d,0xaf,0xed,0xf5,0xe6,0x2f,0x90,0xff,0xa8,0x8f,0xa4,0xb4,0xb6,
+0x37,0x39,0xf4,0xb0,0x02,0xc9,0xe1,0xcc,0x3c,0xbe,0x79,0x33,0x1b,0x7d,0xf0,0xd5,
+0xc3,0x7b,0xdf,0x3e,0xfe,0xe6,0x3e,0x29,0x54,0x55,0x26,0x91,0xfd,0x92,0x92,0xc9,
+0x49,0x4c,0x29,0x76,0x9c,0xe5,0x49,0x54,0x71,0xc5,0x48,0x56,0xb0,0xb6,0xe3,0x2a,
+0xa6,0xbd,0xda,0x09,0x3e,0x85,0xcd,0x9d,0x16,0x4a,0x35,0x01,0xff,0xa1,0x17,0xd3,
+0x98,0x7e,0x1f,0x3c,0xfa,0x22,0xb8,0x57,0x57,0x0d,0x53,0x22,0x2d,0x39,0x25,0x59,
+0x2d,0x15,0x97,0x70,0x79,0x70,0x3f,0xe6,0xf9,0x84,0x8f,0x4e,0x92,0x55,0x3c,0xa6,
+0x53,0xc1,0x77,0x9b,0xba,0x55,0x37,0xee,0xed,0x8a,0x5c,0x15,0x71,0xce,0xa7,0x22,
+0xe3,0x81,0xdb,0x6c,0x09,0x29,0x94,0x60,0x65,0xd0,0x65,0xac,0xe4,0xf1,0x9d,0xad,
+0x8a,0x3d,0x13,0x55,0x5f,0xad,0xf7,0x7d,0xc7,0x5b,0xb7,0x61,0x48,0x19,0x7f,0x82,
+0x14,0xa5,0x90,0x4f,0x49,0xcb,0xcb,0x98,0x76,0x6a,0xaf,0xe4,0x5d,0xc1,0x39,0x72,
+0x14,0x2d,0xdf,0x01,0xf6,0xa6,0xac,0x59,0xbe,0x9d,0x75,0x1d,0x2e,0x2a,0xa1,0x4a,
+0x9e,0xe8,0x57,0xfa,0xb5,0xbe,0xd2,0x2b,0x3d,0xd7,0x97,0xfa,0x14,0xab,0x85,0x3e,
+0x25,0xfa,0xad,0xd9,0xd7,0x2b,0xf3,0x0b,0x36,0x73,0x7d,0xa1,0x17,0x51,0xe8,0x2f,
+0x47,0xa1,0x67,0x24,0xad,0xf3,0xbd,0x24,0x92,0x6c,0x4a,0xb2,0x92,0x75,0x5d,0x4c,
+0xb1,0x4c,0x59,0x8b,0xa0,0x21,0x56,0x49,0x94,0x8b,0x29,0x11,0x79,0x4c,0xb3,0xba,
+0x97,0x2a,0xd8,0x6d,0x59,0x03,0xd3,0xad,0xc3,0xbc,0xde,0x95,0x38,0x6b,0x12,0xfd,
+0x07,0x72,0x5f,0x99,0x43,0x9b,0x10,0x08,0x80,0xc1,0xec,0x13,0xfd,0xda,0x1c,0xe9,
+0x13,0x2c,0x0f,0x01,0xc5,0x9e,0x00,0xd9,0x99,0x9e,0xe9,0x7f,0xcd,0x3e,0x0c,0x6f,
+0x2c,0x4e,0x62,0x7e,0x1e,0x0d,0x24,0xea,0x1a,0x26,0x6f,0x24,0x94,0x7d,0x95,0x72,
+0xa0,0xb9,0x1b,0x85,0xd6,0x92,0x10,0x73,0x00,0x97,0x0b,0xb8,0x5e,0xe9,0x93,0xed,
+0x28,0x6c,0x80,0x13,0x68,0xc6,0xaf,0x05,0x36,0xbc,0xc3,0x42,0x6d,0xac,0x6b,0x54,
+0xdc,0xf9,0xbf,0xd4,0xe0,0x66,0xb4,0x53,0xb7,0x15,0x61,0x99,0x12,0xb5,0x8c,0x69,
+0x38,0xd2,0x3c,0x11,0x94,0x40,0x26,0x45,0x0d,0x2a,0x9a,0xba,0x43,0x19,0xb8,0xcc,
+0xd4,0x5e,0x83,0xea,0x57,0x7d,0xa9,0x44,0xc3,0x5a,0x15,0x5a,0xd7,0x20,0x67,0x8a,
+0x51,0x52,0xcb,0xae,0x4f,0x2b,0x01,0xc5,0xb4,0x5c,0xf5,0xad,0x24,0xdf,0xb1,0x52,
+0xc0,0xc4,0x3f,0x54,0x85,0xe8,0x3e,0xfa,0x7c,0x20,0x71,0xc0,0xea,0xb3,0x04,0xd6,
+0xff,0xb6,0x61,0xd2,0x8b,0xdc,0x8a,0x0d,0xe4,0xfe,0xa6,0x2f,0xcd,0x0b,0x02,0x66,
+0x37,0x6a,0x6c,0x0f,0x37,0x6a,0x4c,0x40,0xce,0xa9,0xbd,0x69,0x7e,0xc2,0xf7,0x04,
+0xa5,0x5f,0xea,0xd5,0x67,0x8e,0xac,0x1a,0x8d,0x51,0x8a,0x44,0xff,0x05,0x2d,0xac,
+0x50,0x90,0x85,0x2b,0xd6,0x5c,0xcf,0x50,0xb6,0x63,0xeb,0x37,0x23,0xce,0xb2,0x44,
+0xcc,0x63,0xf3,0xab,0x39,0xf4,0x45,0x5c,0xa0,0x9a,0x0b,0x02,0x05,0x21,0x30,0xb4,
+0x64,0xa5,0x75,0x6e,0x6f,0xaf,0x50,0x8e,0x85,0xbd,0x04,0x70,0xc7,0x5b,0xc4,0xfc,
+0x88,0xca,0x9e,0xeb,0xcb,0x77,0x11,0x99,0x03,0x82,0x4c,0x33,0x73,0x60,0x95,0xe8,
+0x44,0xe0,0xe4,0xa9,0x97,0xe4,0xe3,0xed,0x54,0xc8,0x28,0x04,0x28,0x07,0xec,0x6f,
+0xa4,0x9f,0x59,0x85,0x78,0x40,0x6f,0xcd,0x91,0x5f,0x5c,0xac,0x83,0x9b,0xa3,0x77,
+0xc2,0x5f,0xbb,0xff,0x09,0xe7,0x37,0xa3,0xf3,0x85,0x45,0x88,0x47,0x42,0x2e,0x84,
+0xea,0xdf,0xd7,0xaa,0x3b,0xb3,0x98,0xcd,0x31,0xf5,0x6e,0xa1,0xe5,0xe4,0x9a,0xe0,
+0x39,0x5c,0xce,0xf4,0xdc,0xa1,0x3d,0xb4,0x74,0xcc,0x41,0x3a,0x9e,0xe9,0x1b,0xcb,
+0x7e,0xf1,0xf2,0x85,0xd5,0xb9,0xa5,0x06,0x2f,0x3e,0xd5,0xe7,0x78,0x9d,0x63,0x6d,
+0x43,0xfc,0xd6,0x1b,0x8c,0x02,0xd0,0xd2,0xb3,0x04,0x14,0xaf,0xe0,0xb7,0x84,0x0f,
+0x9e,0x3f,0x60,0x58,0x4b,0xf8,0x86,0x78,0x07,0x41,0x5c,0x6b,0x58,0xc8,0xa6,0x57,
+0xae,0x2f,0xbc,0xe9,0x6b,0x61,0xc7,0x52,0x53,0xb2,0x8c,0x17,0x75,0x99,0xf3,0x36,
+0xa6,0xfa,0x1f,0xa4,0x02,0xf9,0x94,0xe4,0xa2,0xb3,0x33,0x04,0x52,0x1d,0x57,0x98,
+0x4c,0xbe,0xbb,0x77,0xe0,0x17,0xd8,0xa9,0x75,0x5b,0x67,0xf6,0xf8,0x91,0x9b,0x28,
+0x24,0x55,0xd2,0xfe,0x82,0xa6,0x15,0x15,0x6b,0xf7,0x70,0xcf,0x35,0x9e,0x7e,0x69,
+0x9e,0x43,0x7a,0x2b,0xb3,0x3f,0x76,0x62,0xb4,0x89,0xe9,0x4b,0x25,0x29,0xf1,0x3d,
+0x61,0xe3,0xad,0x73,0x7a,0xc4,0x94,0xf8,0x61,0x69,0xfb,0xc3,0x99,0xc7,0x9e,0xbd,
+0xd9,0xbf,0x3e,0xe4,0x80,0x75,0x13,0xc9,0x10,0xdb,0x37,0x16,0x25,0x53,0x56,0xf6,
+0x68,0xbf,0xf7,0xd4,0x35,0x21,0x03,0xb6,0x8d,0x40,0x39,0xfe,0x0c,0x30,0x11,0x86,
+0x38,0x69,0xaf,0x54,0x0d,0xc4,0x63,0x9c,0xcd,0xca,0x38,0xb6,0x27,0x75,0xca,0xb2,
+0xa7,0x20,0xc1,0x35,0x37,0xb8,0xc8,0x5a,0xd1,0xa8,0x21,0x82,0xe2,0xcf,0x54,0xf8,
+0x84,0x4d,0x99,0x3f,0xa5,0xa4,0x6b,0xb3,0xf5,0x64,0x7e,0x62,0x07,0x73,0xe8,0x2d,
+0xeb,0xa7,0xfa,0x69,0x1b,0xba,0x3f,0xa8,0xff,0x00,0x77,0x6d,0xe4,0xa2,0xb0,0x06,
+0x00,0x00,};
 
 static const unsigned int dummy_align__upload_css = 4;
 static const unsigned char data__upload_css[] = {
@@ -405,10 +402,10 @@ Content-Encoding: gzip
 0x43,0x6f,0x6e,0x74,0x65,0x6e,0x74,0x2d,0x74,0x79,0x70,0x65,0x3a,0x20,0x74,0x65,
 0x78,0x74,0x2f,0x63,0x73,0x73,0x0d,0x0a,0x43,0x6f,0x6e,0x74,0x65,0x6e,0x74,0x2d,
 0x45,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3a,0x20,0x67,0x7a,0x69,0x70,0x0d,0x0a,
-/* "ETag: "RFIQT91UCLeEY1i"
+/* "ETag: "MxJNcIyxmU5LHsa"
 " (25 bytes) */
-0x45,0x54,0x61,0x67,0x3a,0x20,0x22,0x52,0x46,0x49,0x51,0x54,0x39,0x31,0x55,0x43,
-0x4c,0x65,0x45,0x59,0x31,0x69,0x22,0x0d,0x0a,0x0d,0x0a,
+0x45,0x54,0x61,0x67,0x3a,0x20,0x22,0x4d,0x78,0x4a,0x4e,0x63,0x49,0x79,0x78,0x6d,
+0x55,0x35,0x4c,0x48,0x73,0x61,0x22,0x0d,0x0a,0x0d,0x0a,
 
 /* raw file data (2130 bytes) */
 0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x04,0x0a,0xc5,0x58,0x5b,0x6f,0xe3,0xba,
@@ -563,10 +560,10 @@ static const unsigned char data__error_html[] = {
 0x2e,0x31,0x20,0x28,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x73,0x61,0x76,0x61,0x6e,
 0x6e,0x61,0x68,0x2e,0x6e,0x6f,0x6e,0x67,0x6e,0x75,0x2e,0x6f,0x72,0x67,0x2f,0x70,
 0x72,0x6f,0x6a,0x65,0x63,0x74,0x73,0x2f,0x6c,0x77,0x69,0x70,0x29,0x0d,0x0a,
-/* "Content-Length: 573
+/* "Content-Length: 551
 " (21 bytes) */
 0x43,0x6f,0x6e,0x74,0x65,0x6e,0x74,0x2d,0x4c,0x65,0x6e,0x67,0x74,0x68,0x3a,0x20,
-0x35,0x37,0x33,0x0d,0x0a,
+0x35,0x35,0x31,0x0d,0x0a,
 /* "Connection: Close
 " (19 bytes) */
 0x43,0x6f,0x6e,0x6e,0x65,0x63,0x74,0x69,0x6f,0x6e,0x3a,0x20,0x43,0x6c,0x6f,0x73,
@@ -578,48 +575,47 @@ Content-Encoding: gzip
 0x78,0x74,0x2f,0x68,0x74,0x6d,0x6c,0x0d,0x0a,0x43,0x6f,0x6e,0x74,0x65,0x6e,0x74,
 0x2d,0x45,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3a,0x20,0x67,0x7a,0x69,0x70,0x0d,
 0x0a,
-/* "ETag: "unoiESqTheFzjcq"
+/* "ETag: "zI3ab226mizUU4Z"
 " (25 bytes) */
-0x45,0x54,0x61,0x67,0x3a,0x20,0x22,0x75,0x6e,0x6f,0x69,0x45,0x53,0x71,0x54,0x68,
-0x65,0x46,0x7a,0x6a,0x63,0x71,0x22,0x0d,0x0a,0x0d,0x0a,
-
-/* raw file data (573 bytes) */
-0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x04,0x0a,0x6d,0x53,0xc1,0x6e,0xd3,0x40,
-0x10,0xbd,0xf7,0x2b,0x16,0x73,0x01,0x29,0x8e,0x1b,0x41,0x25,0x68,0xbd,0x96,0x50,
-0xe9,0x81,0x13,0x1c,0x40,0x82,0xe3,0xda,0xde,0xc4,0x5b,0xd6,0xeb,0x65,0xbd,0x4e,
-0x9a,0x1b,0x2d,0x87,0xc2,0x09,0xf1,0x03,0xf4,0x17,0xd2,0x16,0x93,0xd0,0xd0,0xf4,
-0x17,0xc6,0x7f,0xc4,0xac,0xd3,0xa4,0x01,0x21,0x4b,0xde,0xd9,0x99,0x37,0xf3,0x66,
-0x9e,0xc7,0xe1,0xbd,0xe7,0x2f,0xf7,0x5f,0xbf,0x7b,0x75,0x40,0x32,0x9b,0xcb,0x68,
-0x2b,0x74,0x07,0x91,0x4c,0x0d,0xa8,0xe7,0xb9,0x2b,0x67,0x29,0x1e,0x39,0xb7,0x8c,
-0x24,0x19,0x33,0x25,0xb7,0xd4,0xab,0x6c,0xdf,0x7f,0xe2,0xa2,0xad,0x3b,0xb3,0x56,
-0xfb,0xfc,0x43,0x25,0x86,0xd4,0x7b,0xeb,0xbf,0x79,0xe6,0xef,0x17,0xb9,0x66,0x56,
-0xc4,0x92,0x7b,0x24,0x29,0x94,0xe5,0x0a,0x73,0x5e,0x1c,0x50,0x9e,0x0e,0xf8,0x3a,
-0x4b,0xb1,0x9c,0x53,0x6f,0x28,0xf8,0x48,0x17,0xc6,0x6e,0x00,0x47,0x22,0xb5,0x19,
-0x4d,0xf9,0x50,0x24,0xdc,0x6f,0x2f,0x1d,0x22,0x94,0xb0,0x82,0x49,0xbf,0x4c,0x98,
-0xe4,0xb4,0xd7,0xdd,0xee,0x90,0x9c,0x1d,0x89,0xbc,0xca,0x37,0x5d,0x55,0xc9,0x4d,
-0x7b,0x67,0x48,0x4d,0xb7,0x1d,0x95,0x14,0xea,0x3d,0x31,0x5c,0x52,0xaf,0xb4,0x63,
-0xc9,0xcb,0x8c,0x73,0xe4,0xca,0x0c,0xef,0xe3,0x14,0x5a,0x16,0x2c,0xed,0x26,0x65,
-0xe9,0x90,0x56,0x58,0xc9,0x23,0xf8,0xde,0x7c,0x86,0x19,0x9c,0xc3,0x15,0x4c,0x08,
-0x2c,0xd0,0xb8,0xc6,0xf7,0x05,0xcc,0xa1,0x46,0x6b,0xd6,0x7c,0x0d,0x83,0x25,0x70,
-0x2b,0x0c,0x6e,0xa5,0x89,0x8b,0x74,0x8c,0xf9,0x8a,0x0d,0x49,0x22,0x59,0x59,0x52,
-0x0f,0xcd,0x98,0x19,0x2f,0x0a,0x03,0xb4,0x30,0x94,0x8a,0x75,0x68,0x64,0x98,0xd6,
-0x1c,0x63,0xa8,0x6c,0x0f,0xd9,0xfe,0x25,0x80,0x9a,0xc0,0x4d,0xf3,0x11,0x16,0x6d,
-0x1b,0x17,0xd8,0xc6,0x0c,0x89,0x7a,0x7f,0x17,0x59,0x36,0xee,0xf7,0x0b,0x93,0xbb,
-0x42,0x1b,0xe5,0x07,0x95,0x48,0x51,0xf4,0x76,0x56,0xea,0x59,0x7e,0x64,0x7d,0x26,
-0xc5,0x40,0xed,0x26,0xf8,0x0d,0xb8,0xd9,0x43,0x38,0x21,0xa1,0x5e,0x01,0x92,0x42,
-0x16,0x66,0xf7,0x7e,0xfa,0x74,0xe7,0xd1,0xe3,0x3e,0x06,0xc3,0x38,0x82,0x33,0x64,
-0x9f,0xfd,0x67,0x74,0xe7,0x6c,0x3b,0x83,0x4b,0x44,0x4c,0xe0,0x37,0x3e,0x4e,0x9b,
-0x4b,0x58,0x2c,0xd1,0x75,0x73,0x0c,0x37,0x50,0x37,0xa7,0x2b,0xa9,0x08,0xea,0xb6,
-0x80,0xa9,0xd3,0x0d,0xe7,0x98,0xb7,0x82,0xde,0xa9,0xdb,0x0d,0x83,0x18,0x09,0x4d,
-0x44,0xe0,0x0c,0x61,0x3f,0xb1,0xe4,0xbc,0xf9,0x04,0xbf,0x9a,0xe3,0xe6,0x04,0x26,
-0x1d,0x24,0x43,0xef,0x92,0xf0,0xbc,0xf5,0x9f,0x38,0x6d,0xea,0xe6,0x4b,0xf3,0x8d,
-0xb4,0x0d,0x4c,0x89,0xa3,0x42,0xb3,0x86,0x29,0x09,0x4b,0xcd,0x14,0x11,0x29,0xf5,
-0x92,0xa2,0x52,0xd6,0x57,0x55,0x1e,0x3b,0x99,0x77,0xc2,0xc0,0x45,0x22,0x82,0xcd,
-0xd5,0x70,0x85,0x85,0xae,0xe1,0x47,0x18,0x68,0x94,0x2d,0x40,0xdd,0xee,0x8e,0x32,
-0x31,0x42,0x5b,0x62,0xc7,0x1a,0xb7,0xd2,0x09,0x17,0x1c,0xb2,0x21,0x5b,0x7a,0x51,
-0x50,0x93,0xac,0xf7,0xe5,0x10,0xd7,0x05,0xab,0xb6,0x78,0xcc,0x5f,0x19,0x04,0x57,
-0x1d,0x99,0xd3,0x62,0xa4,0x1e,0x3c,0xdc,0xc3,0xf2,0xab,0xc0,0x9a,0xe8,0x76,0x51,
-0x82,0xf6,0x47,0xfb,0x03,0x0b,0x14,0x86,0x39,0x78,0x03,0x00,0x00,};
+0x45,0x54,0x61,0x67,0x3a,0x20,0x22,0x7a,0x49,0x33,0x61,0x62,0x32,0x32,0x36,0x6d,
+0x69,0x7a,0x55,0x55,0x34,0x5a,0x22,0x0d,0x0a,0x0d,0x0a,
+
+/* raw file data (551 bytes) */
+0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x04,0x0a,0x6d,0x53,0xcd,0x6e,0xd4,0x30,
+0x10,0x7e,0x15,0x13,0x2e,0x20,0x6d,0x1a,0x2a,0xa8,0x04,0xc5,0x8e,0x84,0x4a,0x0f,
+0x9c,0xe0,0x00,0x12,0x1c,0x9d,0xc4,0xbb,0x71,0x71,0x9c,0x60,0x3b,0xbb,0xdd,0x1b,
+0x2d,0x07,0xe0,0x84,0x78,0x01,0x78,0x85,0x6d,0x4b,0xd8,0xa5,0x4b,0xb7,0xaf,0x30,
+0x79,0x23,0x26,0x4e,0x77,0x5b,0x10,0x8a,0xe4,0xcc,0x9f,0xbf,0x6f,0xe6,0xcb,0x84,
+0xde,0x7a,0xfa,0x7c,0xef,0xe5,0x9b,0x17,0xfb,0x24,0x77,0x85,0x8a,0x69,0x77,0x12,
+0xc5,0xf5,0x88,0x05,0x01,0x7a,0x82,0x67,0x31,0x2d,0x84,0xe3,0x24,0xcd,0xb9,0xb1,
+0xc2,0xb1,0xa0,0x76,0xc3,0xf0,0x21,0xe6,0x7c,0x34,0x77,0xae,0x0a,0xc5,0xbb,0x5a,
+0x8e,0x59,0xf0,0x3a,0x7c,0xf5,0x24,0xdc,0x2b,0x8b,0x8a,0x3b,0x99,0x28,0x11,0x90,
+0xb4,0xd4,0x4e,0x68,0xbc,0xf2,0x6c,0x9f,0x89,0x6c,0x24,0xd6,0x97,0x34,0x2f,0x04,
+0x0b,0xc6,0x52,0x4c,0xaa,0xd2,0xb8,0x1b,0x75,0x13,0x99,0xb9,0x9c,0x65,0x62,0x2c,
+0x53,0x11,0x7a,0x67,0x20,0xb5,0x74,0x92,0xab,0xd0,0xa6,0x5c,0x09,0xb6,0x3d,0x28,
+0xf8,0xa1,0x2c,0xea,0x62,0xe3,0xd7,0x56,0x18,0xef,0x70,0xa4,0x64,0xf7,0x90,0x42,
+0x49,0xfd,0x96,0x18,0xa1,0x58,0x60,0xdd,0x54,0x09,0x9b,0x0b,0x81,0x1c,0xb9,0x11,
+0x43,0xec,0xbd,0x52,0x25,0xcf,0xb6,0x52,0x6b,0xb1,0xd0,0x49,0xa7,0x44,0x0c,0xdf,
+0xda,0x4f,0xb0,0x80,0x13,0x38,0x87,0x19,0x81,0x15,0x1a,0x17,0x78,0x9e,0xc2,0x12,
+0x1a,0xb4,0x16,0xed,0x17,0x1a,0xf5,0x85,0x34,0xea,0xd5,0x48,0xca,0x6c,0x1a,0x53,
+0xcd,0xc7,0x24,0x55,0xdc,0x5a,0x16,0xa0,0x99,0x70,0x83,0x80,0x11,0x5a,0x31,0xcd,
+0xe4,0x26,0x33,0x31,0xbc,0xaa,0x44,0x97,0xca,0xb7,0x91,0xe8,0x5f,0x6c,0x68,0x08,
+0x5c,0xb6,0xef,0x61,0xe5,0x3b,0x38,0xc5,0x0e,0x16,0x48,0xb2,0xfd,0x17,0x44,0xdf,
+0x71,0x38,0x2c,0x4d,0x81,0x30,0x37,0xb0,0x47,0xb5,0xcc,0x50,0x63,0x3f,0x23,0x0b,
+0x9c,0x38,0x74,0x21,0x57,0x72,0xa4,0x77,0x53,0x94,0xdc,0x73,0x56,0xeb,0x64,0x5a,
+0xaa,0xd2,0xec,0xde,0xce,0x1e,0xed,0xdc,0x7f,0x30,0x44,0x94,0x24,0x86,0xef,0x48,
+0xbb,0xf8,0xcf,0xb8,0x5d,0xd0,0xb7,0x04,0x67,0x58,0x31,0x83,0xdf,0xf8,0x74,0x7a,
+0x9c,0xc1,0xaa,0xaf,0x6e,0xda,0x23,0xb8,0x84,0xa6,0xfd,0xb8,0x96,0x87,0xa0,0x56,
+0x2b,0x98,0x77,0x5a,0xe1,0x00,0x4b,0x2f,0xe2,0xb5,0xa2,0x5b,0x34,0x4a,0x90,0xd0,
+0x20,0x23,0x56,0xfd,0x44,0xc4,0x65,0xfb,0x01,0x7e,0xb5,0x47,0xed,0x31,0xcc,0x06,
+0xc8,0x85,0xd1,0x9e,0xef,0xc4,0xc7,0x8f,0x3b,0x4d,0x9a,0xf6,0x73,0xfb,0x95,0x78,
+0xfe,0x39,0xe9,0x98,0xd0,0x6c,0x60,0x4e,0xa8,0xad,0xb8,0x26,0x32,0x63,0x41,0x5a,
+0xd6,0xda,0x85,0xba,0x2e,0x92,0x6e,0xd2,0x1d,0x1a,0x75,0x99,0x98,0x60,0x6f,0x0d,
+0x9c,0x23,0xd0,0x05,0xfc,0xa0,0x51,0x85,0x5f,0x04,0x05,0x5b,0x9f,0x36,0x35,0xb2,
+0x72,0xc4,0x4d,0x2b,0x5c,0xbe,0x4e,0xaf,0xe8,0x80,0x8f,0x79,0x1f,0x45,0x1d,0x4d,
+0xba,0x59,0x8f,0x83,0x6e,0x3b,0xa2,0x3e,0x13,0xd3,0xab,0xb7,0xa7,0xcc,0xca,0x89,
+0xbe,0x73,0xf7,0xf1,0x75,0xf2,0x8a,0xa0,0xdf,0x89,0xc8,0xff,0x42,0x7f,0x00,0x66,
+0xee,0x60,0x08,0x52,0x03,0x00,0x00,};
 
 static const unsigned int dummy_align__success_html = 6;
 static const unsigned char data__success_html[] = {
@@ -638,10 +634,10 @@ static const unsigned char data__success_html[] = {
 0x2e,0x31,0x20,0x28,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x73,0x61,0x76,0x61,0x6e,
 0x6e,0x61,0x68,0x2e,0x6e,0x6f,0x6e,0x67,0x6e,0x75,0x2e,0x6f,0x72,0x67,0x2f,0x70,
 0x72,0x6f,0x6a,0x65,0x63,0x74,0x73,0x2f,0x6c,0x77,0x69,0x70,0x29,0x0d,0x0a,
-/* "Content-Length: 567
+/* "Content-Length: 546
 " (21 bytes) */
 0x43,0x6f,0x6e,0x74,0x65,0x6e,0x74,0x2d,0x4c,0x65,0x6e,0x67,0x74,0x68,0x3a,0x20,
-0x35,0x36,0x37,0x0d,0x0a,
+0x35,0x34,0x36,0x0d,0x0a,
 /* "Connection: Close
 " (19 bytes) */
 0x43,0x6f,0x6e,0x6e,0x65,0x63,0x74,0x69,0x6f,0x6e,0x3a,0x20,0x43,0x6c,0x6f,0x73,
@@ -653,48 +649,47 @@ Content-Encoding: gzip
 0x78,0x74,0x2f,0x68,0x74,0x6d,0x6c,0x0d,0x0a,0x43,0x6f,0x6e,0x74,0x65,0x6e,0x74,
 0x2d,0x45,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3a,0x20,0x67,0x7a,0x69,0x70,0x0d,
 0x0a,
-/* "ETag: "bxarfS4hHmnhQru"
+/* "ETag: "35trJ7rdiFVH5Vs"
 " (25 bytes) */
-0x45,0x54,0x61,0x67,0x3a,0x20,0x22,0x62,0x78,0x61,0x72,0x66,0x53,0x34,0x68,0x48,
-0x6d,0x6e,0x68,0x51,0x72,0x75,0x22,0x0d,0x0a,0x0d,0x0a,
-
-/* raw file data (567 bytes) */
-0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x04,0x0a,0x7d,0x53,0xc1,0x8e,0xd3,0x30,
-0x10,0xbd,0xef,0x57,0x98,0x70,0x01,0x69,0xd3,0xb4,0x5a,0x21,0xa1,0xdd,0x38,0x12,
-0x2a,0x7b,0xe0,0x04,0x07,0x90,0xe0,0xe8,0x38,0x6e,0xe3,0xc5,0x71,0x82,0xe3,0xb4,
-0xdb,0x5b,0xd9,0x3d,0xc0,0x8d,0x3b,0x07,0x2e,0xfc,0x00,0xdb,0xdd,0x40,0xb5,0xd0,
-0xee,0x2f,0x4c,0xfe,0x88,0x71,0xd2,0x96,0x22,0x24,0x14,0x29,0x1e,0xfb,0xcd,0xbc,
-0x37,0x7e,0x99,0x84,0xf7,0x9e,0x3e,0x1f,0xbe,0x7c,0xf3,0xe2,0x94,0xa4,0x36,0x53,
-0xd1,0x41,0xe8,0x16,0xa2,0x98,0x1e,0x53,0xcf,0x73,0x5b,0xc1,0x12,0x5c,0x32,0x61,
-0x19,0xe1,0x29,0x33,0xa5,0xb0,0xd4,0xab,0xec,0xc8,0x7f,0xec,0xd0,0xf6,0x38,0xb5,
-0xb6,0xf0,0xc5,0xbb,0x4a,0x4e,0xa8,0xf7,0xda,0x7f,0xf5,0xc4,0x1f,0xe6,0x59,0xc1,
-0xac,0x8c,0x95,0xf0,0x08,0xcf,0xb5,0x15,0x1a,0x6b,0x9e,0x9d,0x52,0x91,0x8c,0xc5,
-0xae,0x4a,0xb3,0x4c,0x50,0x6f,0x22,0xc5,0xb4,0xc8,0x8d,0xdd,0x4b,0x9c,0xca,0xc4,
-0xa6,0x34,0x11,0x13,0xc9,0x85,0xdf,0x6e,0x0e,0x89,0xd4,0xd2,0x4a,0xa6,0xfc,0x92,
-0x33,0x25,0xe8,0xa0,0xd7,0x3f,0x24,0x19,0x3b,0x97,0x59,0x95,0xed,0x1f,0x55,0xa5,
-0x30,0xed,0x9e,0xa1,0x34,0xed,0x3b,0x29,0x25,0xf5,0x5b,0x62,0x84,0xa2,0x5e,0x69,
-0x67,0x4a,0x94,0xa9,0x10,0xa8,0x95,0x1a,0x31,0xc2,0x5b,0x14,0x2a,0x67,0x49,0x8f,
-0x97,0xa5,0xcb,0xb4,0xd2,0x2a,0x11,0xc1,0xd7,0xe6,0x3d,0xdc,0x41,0xdd,0x7c,0x84,
-0x15,0xac,0xa1,0x26,0xf8,0xba,0x6a,0xc3,0x05,0xfc,0x84,0x1a,0xa3,0x25,0xd4,0x61,
-0xd0,0x25,0x1f,0x84,0xc1,0xc6,0x9e,0x38,0x4f,0x66,0xc8,0xa1,0xd9,0x84,0x70,0xc5,
-0xca,0x92,0x7a,0x18,0xc6,0xcc,0x78,0x51,0x18,0x60,0x84,0x50,0x22,0x77,0xd0,0xd4,
-0xb0,0xa2,0x10,0x88,0xa1,0xbb,0x83,0x08,0xbe,0xfc,0x2b,0x40,0xe0,0xae,0x99,0xc3,
-0x1a,0x9b,0x58,0xc2,0x02,0x6e,0x61,0x89,0x42,0x83,0xbf,0x49,0xba,0xe6,0xfd,0x51,
-0x6e,0x32,0x47,0xb4,0x47,0x3f,0xae,0x64,0x82,0xc6,0xb7,0xf7,0xa5,0x9e,0x15,0xe7,
-0xd6,0x67,0x4a,0x8e,0xf5,0x31,0xc7,0xef,0x20,0xcc,0x09,0xa6,0x13,0x12,0x16,0xdb,
-0x04,0x9e,0xab,0xdc,0x1c,0xdf,0x3f,0x3a,0x1a,0x0e,0xfb,0x7d,0x04,0xc3,0xf8,0x7f,
-0x2d,0xc1,0x35,0x36,0xf6,0x0d,0x7e,0xe1,0xe3,0xfc,0xb9,0x86,0x75,0xe7,0x50,0xbd,
-0xb1,0xed,0x43,0xe7,0x51,0xf3,0x89,0x34,0x97,0xfb,0x4e,0x12,0xf8,0x81,0x65,0x0b,
-0x34,0x76,0x8e,0xb7,0x72,0x3e,0xae,0x7b,0x61,0x10,0xa3,0x9a,0x89,0x08,0x7c,0x46,
-0xaa,0x55,0x73,0xe1,0xee,0x8c,0x2e,0xa3,0xcf,0xcd,0x9c,0xc0,0x55,0x73,0x09,0x37,
-0x18,0x5e,0xa0,0x1b,0xee,0x04,0xab,0x1c,0x07,0x36,0x80,0xc0,0x77,0xc7,0x41,0x1a,
-0x94,0xeb,0x00,0x12,0x96,0x05,0xd3,0x44,0x26,0xd4,0xe3,0x79,0xa5,0xad,0xaf,0xab,
-0x2c,0x76,0x1e,0x3f,0x0a,0x03,0x87,0x44,0x04,0xbb,0xa9,0xe1,0x16,0x4b,0x57,0x70,
-0x13,0x06,0x05,0x7a,0x16,0xa0,0x69,0x7f,0x96,0x92,0x1b,0x59,0x58,0x62,0x67,0x05,
-0x8e,0xa5,0x73,0x2d,0x38,0x63,0x13,0xd6,0x9d,0xa2,0x9b,0x86,0xef,0x06,0xe6,0x0c,
-0xe7,0x05,0x59,0xdb,0x7c,0xac,0xdf,0x06,0x04,0x67,0x1d,0x95,0x93,0x7c,0xaa,0x1f,
-0x3c,0x3c,0x41,0xfa,0x2d,0xb0,0x13,0xda,0x4c,0x49,0xd0,0xfe,0x69,0xbf,0x01,0x5c,
-0x64,0x7a,0x0a,0x79,0x03,0x00,0x00,};
+0x45,0x54,0x61,0x67,0x3a,0x20,0x22,0x33,0x35,0x74,0x72,0x4a,0x37,0x72,0x64,0x69,
+0x46,0x56,0x48,0x35,0x56,0x73,0x22,0x0d,0x0a,0x0d,0x0a,
+
+/* raw file data (546 bytes) */
+0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x04,0x0a,0x7d,0x93,0x41,0x6f,0xd3,0x30,
+0x14,0xc7,0xbf,0x8a,0x09,0x17,0x90,0x96,0x65,0xd5,0x84,0x84,0x86,0x1d,0x09,0x95,
+0x1d,0x38,0xc1,0x01,0x24,0x38,0x3a,0x89,0xdb,0x78,0x38,0x8e,0x71,0x9c,0x76,0xbd,
+0x95,0xed,0x00,0x37,0xee,0x3b,0x70,0xe1,0x0b,0xb0,0x6e,0x81,0x6a,0xd0,0xee,0x2b,
+0xbc,0x7c,0x23,0x9e,0x93,0xb6,0x0c,0x21,0xa1,0x48,0xce,0xb3,0xff,0x7e,0xef,0xff,
+0xfc,0x8b,0x43,0xef,0x3d,0x7b,0x31,0x7c,0xf5,0xf6,0xe5,0x31,0xc9,0x5d,0xa1,0x62,
+0xea,0x47,0xa2,0xb8,0x1e,0xb3,0x20,0xc0,0x99,0xe0,0x59,0x4c,0x0b,0xe1,0x38,0x49,
+0x73,0x6e,0x2b,0xe1,0x58,0x50,0xbb,0x51,0xf8,0x18,0xb5,0x6e,0x35,0x77,0xce,0x84,
+0xe2,0x7d,0x2d,0x27,0x2c,0x78,0x13,0xbe,0x7e,0x1a,0x0e,0xcb,0xc2,0x70,0x27,0x13,
+0x25,0x02,0x92,0x96,0xda,0x09,0x8d,0x29,0xcf,0x8f,0x99,0xc8,0xc6,0x62,0x9b,0xa4,
+0x79,0x21,0x58,0x30,0x91,0x62,0x6a,0x4a,0xeb,0xee,0xec,0x9b,0xca,0xcc,0xe5,0x2c,
+0x13,0x13,0x99,0x8a,0xb0,0x9b,0xec,0x49,0x2d,0x9d,0xe4,0x2a,0xac,0x52,0xae,0x04,
+0x1b,0xec,0x15,0xfc,0x54,0x16,0x75,0xb1,0x9b,0xd7,0x95,0xb0,0xdd,0x84,0xa3,0x25,
+0x3b,0x40,0x0b,0x25,0xf5,0x3b,0x62,0x85,0x62,0x41,0xe5,0x66,0x4a,0x54,0xb9,0x10,
+0xe8,0x91,0x5b,0x31,0xc2,0xde,0x8d,0x2a,0x79,0xb6,0x9f,0x56,0x15,0x6e,0x74,0xd2,
+0x29,0x11,0xc3,0xd7,0xf6,0x03,0xdc,0x42,0xd3,0x7e,0x82,0x15,0xac,0xa1,0x21,0x38,
+0x5c,0x76,0xe1,0x02,0x7e,0x42,0x83,0xd1,0x12,0x1a,0x1a,0xf5,0x9b,0x69,0xd4,0x13,
+0x49,0xca,0x6c,0x16,0x53,0xcd,0x27,0x24,0x55,0xbc,0xaa,0x58,0x80,0x61,0xc2,0x2d,
+0x16,0x8d,0x30,0x8a,0x69,0x26,0x77,0xca,0xd4,0x72,0x63,0x84,0x97,0xf2,0x41,0x0c,
+0x5f,0xfe,0xad,0x4d,0xe0,0xb6,0x9d,0xc3,0x1a,0xfd,0x97,0xb0,0x80,0x1b,0x58,0xa2,
+0xc9,0xe0,0xaf,0x12,0x7d,0xd7,0xe1,0xa8,0xb4,0x05,0x96,0xb9,0x53,0x7b,0x5c,0xcb,
+0x0c,0x39,0x77,0xe7,0x64,0x81,0x13,0xa7,0x2e,0xe4,0x4a,0x8e,0xf5,0x51,0x8a,0xd8,
+0x3b,0x4f,0xb3,0x15,0xd3,0x52,0x95,0xf6,0xe8,0xfe,0xe1,0xe1,0x70,0x78,0xe0,0x29,
+0x25,0xff,0xeb,0x05,0xae,0xb0,0xa3,0x6f,0xf0,0x0b,0x1f,0xcf,0xe4,0x0a,0xd6,0x3d,
+0x95,0x66,0x83,0xea,0x63,0xcf,0xa5,0xfd,0x4c,0xda,0xf3,0xbb,0xf4,0x08,0xfc,0xc0,
+0xb4,0x05,0xc2,0x9c,0xe3,0x71,0x3c,0xbb,0xf5,0x3e,0x8d,0x12,0x74,0xb3,0x31,0x5c,
+0x60,0xa5,0x55,0x7b,0xe6,0xcf,0x8a,0x60,0x11,0x6d,0x3b,0x27,0x70,0xd9,0x9e,0xc3,
+0x35,0x86,0x67,0x48,0xc1,0xaf,0x60,0x92,0x2f,0x81,0xfe,0x28,0x7c,0xf7,0x25,0x48,
+0x8b,0x6e,0xbd,0x40,0x68,0x65,0xb8,0x26,0x32,0x63,0x41,0x5a,0xd6,0xda,0x85,0xba,
+0x2e,0x12,0x7f,0xcc,0x47,0x34,0xf2,0x4a,0x4c,0xb0,0x99,0x06,0x6e,0x30,0x75,0x05,
+0xd7,0x34,0x32,0xf8,0x39,0x90,0xd6,0x76,0xac,0x52,0x2b,0x8d,0x23,0x6e,0x66,0xf0,
+0xf6,0x79,0x58,0xd1,0x09,0x9f,0xf0,0x7e,0x15,0x21,0xda,0x74,0x77,0x3f,0x4e,0xfc,
+0xf5,0x88,0x7a,0x25,0xa6,0x9b,0x77,0x67,0x99,0x95,0x53,0xfd,0xe0,0xe1,0x93,0x3f,
+0xe2,0xc6,0xa0,0xbf,0x10,0x51,0xf7,0x0f,0xfd,0x06,0x2f,0xd4,0x46,0x58,0x53,0x03,
+0x00,0x00,};
 
 const struct fsdata_file file__upload_js[] = {{
 	file_NULL,

modules/Ethernet/private_mib_bt6706.c

@@ -6,7 +6,7 @@
  */
 
 
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 
 #include "stm32f4xx.h"
 #include "private_mib.h"

modules/Ethernet/trap_api.c

@@ -80,7 +80,7 @@ void SNMP_InitTrapsBase(void)
    traps[DI0_NORM].trapId = DI0_NORM;
 #ifdef HARDWARE_BT6702
   traps[DI0_NORM].varbindId = 9;
-#elif HARDWARE_BT6706
+#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
   traps[DI0_NORM].varbindId = 10;
 #endif
    traps[DI0_NORM].trapEnable = true;
@@ -90,7 +90,7 @@ void SNMP_InitTrapsBase(void)
    traps[DI0_ALARM].trapId = DI0_ALARM;
 #ifdef HARDWARE_BT6702
   traps[DI0_ALARM].varbindId = 9;
-#elif HARDWARE_BT6706
+#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
   traps[DI0_ALARM].varbindId = 10;
 #endif
    traps[DI0_ALARM].trapEnable = true;
@@ -108,7 +108,7 @@ void SNMP_InitTrapsBase(void)
     traps[DO1_TOGGLED].trapEnable = true;
     traps[DO1_TOGGLED].handle = GetDOUT1StatusStr; /* State DO1 */
 
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
     /* 8. DO1Toggle */ // +
     traps[DO2_TOGGLED].trapId = DO2_TOGGLED;
     traps[DO2_TOGGLED].varbindId = 7;
@@ -120,7 +120,7 @@ void SNMP_InitTrapsBase(void)
   traps[BATTERY_TEMPERATURE_NORM].trapId = BATTERY_TEMPERATURE_NORM;
 #ifdef HARDWARE_BT6702
   traps[BATTERY_TEMPERATURE_NORM].varbindId = 10;
-#elif HARDWARE_BT6706
+#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
   traps[BATTERY_TEMPERATURE_NORM].varbindId = 11;
 #endif
   traps[BATTERY_TEMPERATURE_NORM].trapEnable = true;
@@ -130,7 +130,7 @@ void SNMP_InitTrapsBase(void)
   traps[BATTERY_TEMPERATURE_ALARM].trapId = BATTERY_TEMPERATURE_ALARM;
 #ifdef HARDWARE_BT6702
   traps[BATTERY_TEMPERATURE_ALARM].varbindId = 10;
-#elif HARDWARE_BT6706
+#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
   traps[BATTERY_TEMPERATURE_ALARM].varbindId = 11;
 #endif
   traps[BATTERY_TEMPERATURE_ALARM].trapEnable = true;
@@ -140,7 +140,7 @@ void SNMP_InitTrapsBase(void)
   traps[LINE_ALARM].trapId = LINE_ALARM;
 #ifdef HARDWARE_BT6702
   traps[LINE_ALARM].varbindId = 12;
-#elif HARDWARE_BT6706
+#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
   traps[LINE_ALARM].varbindId = 13;
 #endif
   traps[LINE_ALARM].trapEnable = true;
@@ -150,7 +150,7 @@ void SNMP_InitTrapsBase(void)
   traps[LINE_NORM].trapId = LINE_NORM;
 #ifdef HARDWARE_BT6702
   traps[LINE_NORM].varbindId = 12;
-#elif HARDWARE_BT6706
+#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
   traps[LINE_NORM].varbindId = 13;
 #endif
   traps[LINE_NORM].trapEnable = true;
@@ -160,7 +160,7 @@ void SNMP_InitTrapsBase(void)
   traps[LOW_BAT_ALARM].trapId = LOW_BAT_ALARM;
 #ifdef HARDWARE_BT6702
   traps[LOW_BAT_ALARM].varbindId = 15;
-#elif HARDWARE_BT6706
+#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
   traps[LOW_BAT_ALARM].varbindId = 16;
 #endif
   traps[LOW_BAT_ALARM].trapEnable = true;
@@ -170,7 +170,7 @@ void SNMP_InitTrapsBase(void)
   traps[LOW_BAT_NORM].trapId = LOW_BAT_NORM;
 #ifdef HARDWARE_BT6702
   traps[LOW_BAT_NORM].varbindId = 15;
-#elif HARDWARE_BT6706
+#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
   traps[LOW_BAT_NORM].varbindId = 16;
 #endif
   traps[LOW_BAT_NORM].trapEnable = true;
@@ -180,7 +180,7 @@ void SNMP_InitTrapsBase(void)
   traps[POWER_ALARM].trapId = POWER_ALARM;
 #ifdef HARDWARE_BT6702
   traps[POWER_ALARM].varbindId = 14;
-#elif HARDWARE_BT6706
+#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
   traps[POWER_ALARM].varbindId = 15;
 #endif
   traps[POWER_ALARM].trapEnable = true;
@@ -190,7 +190,7 @@ void SNMP_InitTrapsBase(void)
   traps[POWER_NORM].trapId = POWER_NORM;
 #ifdef HARDWARE_BT6702
   traps[POWER_NORM].varbindId = 14;
-#elif HARDWARE_BT6706
+#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
   traps[POWER_NORM].varbindId = 15;
 #endif
   traps[POWER_NORM].trapEnable = true;
@@ -200,7 +200,7 @@ void SNMP_InitTrapsBase(void)
   traps[CONNECT_MONITOR_ALARM].trapId = CONNECT_MONITOR_ALARM;
 #ifdef HARDWARE_BT6702
   traps[CONNECT_MONITOR_ALARM].varbindId = 17;
-#elif HARDWARE_BT6706
+#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
   traps[CONNECT_MONITOR_ALARM].varbindId = 18;
 #endif
   traps[CONNECT_MONITOR_ALARM].trapEnable = true;
@@ -210,7 +210,7 @@ void SNMP_InitTrapsBase(void)
   traps[CONNECT_MONITOR_NORM].trapId = CONNECT_MONITOR_NORM;
 #ifdef HARDWARE_BT6702
   traps[CONNECT_MONITOR_NORM].varbindId = 17;
-#elif HARDWARE_BT6706
+#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
   traps[CONNECT_MONITOR_NORM].varbindId = 18;
 #endif
   traps[CONNECT_MONITOR_NORM].trapEnable = true;
@@ -220,7 +220,7 @@ void SNMP_InitTrapsBase(void)
   traps[BATTERY_CONNECT_ALARM].trapId = BATTERY_CONNECT_ALARM;
 #ifdef HARDWARE_BT6702
   traps[BATTERY_CONNECT_ALARM].varbindId = 15;
-#elif HARDWARE_BT6706
+#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
   traps[BATTERY_CONNECT_ALARM].varbindId = 16;
 #endif
   traps[BATTERY_CONNECT_ALARM].trapEnable = true;
@@ -230,7 +230,7 @@ void SNMP_InitTrapsBase(void)
   traps[BATTERY_CONNECT_NORM].trapId = BATTERY_CONNECT_NORM;
 #ifdef HARDWARE_BT6702
   traps[BATTERY_CONNECT_NORM].varbindId = 15;
-#elif HARDWARE_BT6706
+#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
   traps[BATTERY_CONNECT_NORM].varbindId = 16;
 #endif
   traps[BATTERY_CONNECT_NORM].trapEnable = true;
@@ -288,7 +288,7 @@ struct snmp_obj_id  trap_oid = {11, {1, 3, 6, 1, 6, 3, 1, 1, 4, 1, 0}};
 #ifdef HARDWARE_BT6702
 struct snmp_obj_id trapObjId = {11, {1, 3, 6, 1, 4, 1, 41752, 911, 3, 2, 1}};
 struct snmp_obj_id varObjId  = {11, {1, 3, 6, 1, 4, 1, 41752, 911, 3, 1, 1}};
-#elif HARDWARE_BT6706
+#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
 struct snmp_obj_id trapObjId = {11, {1, 3, 6, 1, 4, 1, 41752, 911, 4, 2, 1}};
 struct snmp_obj_id varObjId  = {11, {1, 3, 6, 1, 4, 1, 41752, 911, 4, 1, 1}};
 #endif

modules/Ethernet/trap_api.h

@@ -33,7 +33,7 @@ typedef enum
   DI0_ALARM,
   DO0_TOGGLED,
   DO1_TOGGLED,
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
   DO2_TOGGLED,
 #endif
   BATTERY_TEMPERATURE_NORM,

modules/HTTP_Server/http_server.c

@@ -1,4 +1,4 @@
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 
 #include "lwip/opt.h"
 #include "lwip/arch.h"
@@ -800,7 +800,7 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
   }
   memset(value, 0, len);
 
-#ifdef HARDWARE_BT6706
+
   /* Сетевые параметры */
   GetParamValue(buf, "tn_enabled=", value, &valueLen);
   SetTelnetEnableStateStr(value);
@@ -813,40 +813,6 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
 		memset(value, 0, len);
 	}
 	memset(value, 0, len);
-#endif
-
-#ifdef HARDWARE_BT6702
-  GetParamValue(buf, "swauth=", value, &valueLen);
-  SetAuthEnableStateStr(value);
-
-  if (strncmp(value, "on", 2) == 0){
-		/* параметры RADIUS*/
-	  memset(value, 0, len);
-		GetParamValue(buf, "rs_enabled=", value, &valueLen);
-		SetRDSEnableStateStr(value);
-
-		if (strncmp(value, "on", 2) == 0)  // Если raddius off устанавливаем параметры
-		{
-			memset(value, 0, len);
-			GetParamValue(buf, "rs_server=", value, &valueLen);
-			SetRDSIpStr(value);
-			memset(value, 0, len);
-
-			GetParamValue(buf, "rs_port=", value, &valueLen);
-			SetRDSPortStr(value);
-			memset(value, 0, len);
-
-			GetParamValue(buf, "rs_pwd=", value, &valueLen);
-			SetRDSPasswordkStr(value);
-			memset(value, 0, len);
-
-			GetParamValue(buf, "rs_key=", value, &valueLen);
-			SetRDSKeyAccesstStr(value);
-			memset(value, 0, len);
-		}
-  }
-  memset(value, 0, len);
-#endif
 
   // Параметры реле и сухих контактов
   GetParamValue(buf, "di1=", value, &valueLen);
@@ -909,9 +875,8 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
   /* Если параметры WEB изменились выставляем флаг, сохраняем настройки и перезагружаемся */
   if (GetStateWebReinit() == true)
   {	
-#ifdef HARDWARE_BT6706
   telnet_act = false;
-#endif
+
 	SetWebReinitFlag(true);
 	HTTP_SaveSettings();
     /* Блокируем управление ключем на тау секунд*/
@@ -919,9 +884,9 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
     vTaskDelay(1010);
     Reboot();
   }	
-#ifdef HARDWARE_BT6706
+
   telnet_act = false;
-#endif
+
   HTTP_SaveSettings();
 }
 
@@ -958,9 +923,8 @@ void HTTP_SetInfo(char *buf, uint16_t lenBuf)
   SetComment(str);
   memset(value, 0, len);
 
-#ifdef HARDWARE_BT6706
   telnet_act = false;
-#endif
+
   HTTP_SaveSettings();
 }
 
@@ -1079,9 +1043,9 @@ void HTTP_ConfirmBootPwd(char *bufIn, char *bufOut, uint16_t lenBufIn, uint16_t
   uint8_t valueLen;
   
   memset(value, 0, 20);
-#ifdef HARDWARE_BT6706
+
   telnet_act = false;
-#endif
+
   /* Запускаем задачу отложенной перезагрузки. Контроллер должен успеть
      отправить ответ серверу о статусе пароля */
   HTTP_StartResetTask(true); 
@@ -1458,9 +1422,9 @@ int HTTP_ChangeUserPwd(char *bufIn, char *bufOut, uint16_t lenBufIn, uint16_t *l
 				 {
 
 					 memcpy(sSettings.sAuth[user_id].password, password, 11);
-#ifdef HARDWARE_BT6706
+
   telnet_act = false;
-#endif
+
 					 HTTP_SaveSettings();
 					 log_event_data(LOG_PSW_CHANGE, name_login);
 					 strcat(bufOut, "Пароль успешно изменён");
@@ -1851,9 +1815,9 @@ char* AuthenticatedTrueRoutine(uint16_t* sendLen)
     /* Сброс настроек и сохранине */
     else if (strncmp(receiveBuf, "GET /reset.cgi", 14) == 0)
     {
-#ifdef HARDWARE_BT6706
+
   telnet_act = false;
-#endif
+
         HTTP_ResetSettings();
         HTTP_SaveSettings();
     
@@ -1864,17 +1828,17 @@ char* AuthenticatedTrueRoutine(uint16_t* sendLen)
     /* Перезагрузка контроллера */
     else if (strncmp(receiveBuf, "GET /reboot.cgi", 15) == 0)
     {
-#ifdef HARDWARE_BT6706
+
     	telnet_act = false;
-#endif
+
         HTTP_Reboot();
     }
     /* Подтверждение новых сетевых настроек */
     else if (strncmp(receiveBuf, "GET /confirm.cgi", 16) == 0)
     {
-#ifdef HARDWARE_BT6706
+
     	  telnet_act = false;
-#endif
+
         SetWebReinitFlag(false);
         SetConfirmWebParamsFlag();
     

modules/HTTP_Server/http_server.h

@@ -1,4 +1,4 @@
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 
 #include "lwip/opt.h"
 #include "lwip/arch.h"

modules/HTTP_Server/web_params_api.c

@@ -96,7 +96,7 @@ void HTTP_GetParamsPage1(char *buf)
   strcat(buf, "\",\"ro2\":\"");
   strncat(buf, str, len);
 
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
   GetDOUTStatusStr(str, &len, 2);
   strcat(buf, "\",\"ro3\":\"");
   strncat(buf, str, len);
@@ -181,7 +181,7 @@ void HTTP_GetSettings(char *buf)
   strcat(buf, "\",\"ro2\":\"");
   strncat(buf, str, len);
 
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
   GetROTypeActStr(str, &len, 2);
   strcat(buf, "\",\"ro3\":\"");
   strncat(buf, str, len);
@@ -204,7 +204,7 @@ void HTTP_GetSettings(char *buf)
   strcat(buf, "\",\"dhcp\":");
   strncat(buf, str, len);
 
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
   GetTelnetPortStr(str, &len);
   strcat(buf, ",\"tn_port\":\"");
   strncat(buf, str, len);
@@ -470,7 +470,7 @@ void HTTP_SaveSettings(void)
   
   SETTINGS_Save();
 
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
 	  if(telnet_act)
 		  log_event_data(LOG_SETTING_SAVE, name_login_telnet);
 	  else
@@ -521,7 +521,7 @@ void vTaskReboot(void * pvParameters)
 	if (mode)
 	{
 	  SNMP_SendUserTrap(FW_VERSION_UPDATE);
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
 	  if(telnet_act)
 		  log_event_data(LOG_UPDATE_SOFT, name_login_telnet);
 	  else

modules/Makefile

@@ -97,7 +97,8 @@ CSRC += $(wildcard ../thirdparty/FreeRTOS/portable/MemMang/heap_4.c)
 ifeq ($(HARDWARE), bt6702) 	
    CSRC += $(wildcard HTTP_Server/my_ssl_server.c)
 endif
-ifeq ($(HARDWARE), bt6706)  
+#ifeq ($(HARDWARE), bt6706)  
+ifneq (,$(filter $(HARDWARE),bt6706 bt6708))
       INCLUDES += -ITelnet_Server 
       CSRC += $(wildcard HTTP_Server/http_server.c)
       CSRC += $(wildcard Telnet_Server/*.c)
@@ -149,6 +150,10 @@ ifeq ($(HARDWARE), bt6706)
 BUILDDIR = ../build/bt6706/$(TARGET)
 endif
 
+ifeq ($(HARDWARE), bt6708)
+BUILDDIR = ../build/bt6708/$(TARGET)
+endif
+
 FW_FLASH_START = $(shell awk '/USER_FLASH_FIRST_PAGE_ADDRESS/{print $$3}' ../config/common_config.h )
 FW_FLASH_CRC = $(shell awk '/USER_FLASH_CRC_ADDRESS/{print $$3}' ../config/common_config.h )
 
@@ -160,6 +165,10 @@ ifeq ($(HARDWARE), bt6706)
 FW_NAME = BT_6706xx
 endif
 
+ifeq ($(HARDWARE), bt6708)
+FW_NAME = BT_6708xx
+endif
+
 -include ../Makefile.inc.stm32
 
 #Building Web UI FS
@@ -168,6 +177,11 @@ ifeq ($(HARDWARE), bt6706)
 	FSDATA_DIR = ./HTTP_Server/bt6706_fs
 endif
 
+ifeq ($(HARDWARE), bt6708)
+	WUI_DIR = ../web_interface/dist/wui-6
+	FSDATA_DIR = ./HTTP_Server/bt6708_fs
+endif
+
 ifeq ($(HARDWARE), bt6702)
 	WUI_DIR = ../web_interface/dist/wui
 	FSDATA_DIR = ./HTTP_Server/bt6702_fs

modules/Telnet_Server/CLI_Commands.c

@@ -1454,9 +1454,7 @@ static portBASE_TYPE prvTaskNetConfigCommand( int8_t *pcWriteBuffer, size_t xWri
 		  if (GetStateWebReinit() == true)
 		  {
 			  start = 1;
-#ifdef HARDWARE_BT6706
 		  telnet_act = true;
-#endif
 			SetWebReinitFlag(true);
 			HTTP_SaveSettings();
 			strcpy( ( char * ) pcWriteBuffer, "\t\tНастройки сохранены! Контроллер будет перезагружен\r\n\tПосле перезагрузки подтвердите изменения сетевых настроек\r\n");
@@ -1465,9 +1463,7 @@ static portBASE_TYPE prvTaskNetConfigCommand( int8_t *pcWriteBuffer, size_t xWri
 		  }
 		}
 		else{
-#ifdef HARDWARE_BT6706
 		  telnet_act = true;
-#endif
 			start = 0;
 			vTaskDelay(1010);
 			Reboot();

modules/common/hal.c

@@ -19,7 +19,7 @@
 void Reboot(void) {
 #ifndef BT6702_SERVICE
 	SNMP_SendUserTrap(DEVICE_REBOOTED);
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 	  if(telnet_act)
 		  log_event_data(LOG_SYSTEM_BOOT, name_login_telnet);
 	  else

modules/log/log.c

@@ -24,7 +24,7 @@ const char* logsStrShortRu[] =
     "Включение",
     "Смена пароля",
     "Сохранение настроек",
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
     "Авторизация (Telnet)",
 #endif
     "Авторизация",
@@ -33,7 +33,7 @@ const char* logsStrShortRu[] =
     "Авария дискр. входа 1",
     "Состояние выхода 1",
     "Состояние выхода 2",
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
     "Состояние выхода 3",
     "Авария вых. напряжения",
 #endif

modules/log/log.h

@@ -22,7 +22,7 @@ typedef __packed enum {
 	LOG_TURN_ON,		//
 	LOG_PSW_CHANGE,		//
 	LOG_SETTING_SAVE,		//
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
 	LOG_LOGIN_TELNET,		//
 #endif
 	LOG_LOGIN,		//
@@ -31,7 +31,7 @@ typedef __packed enum {
 	LOG_ALARM_DIO,
 	LOG_DO0_STATE,
 	LOG_DO1_STATE,
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
 	LOG_DO2_STATE,
 	LOG_ALARM_VAC_OUTPUT,
 #endif

modules/monitor/ups_monitor.c

@@ -61,7 +61,7 @@ void UPS_Monitor(void *params)
    if (UPS.Present)
     {
       UPS_LineFailMonitor();
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
       UPS_VACoutputMonitor();
 #endif
       UPS_LowBatMonitor();  
@@ -142,7 +142,7 @@ void relay_setup_log(uint8_t *curr_source, ro_type_source_t src_act_ro, uint8_t
 			  SNMP_SendUserTrap((DO0_TOGGLED+i));
 			  if(state_relay){
 				  flUpdateLog = true;
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
 				  log_event_data((LOG_DO0_STATE + i), "Разомкнуто");
 #elif HARDWARE_BT6702
 				  log_event_data((LOG_DO0_STATE + i), "Замкнуто");
@@ -151,7 +151,7 @@ void relay_setup_log(uint8_t *curr_source, ro_type_source_t src_act_ro, uint8_t
 			  }
 			  else{
 				  flUpdateLog = true;
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
 				  log_event_data((LOG_DO0_STATE + i), "Замкнуто");
 #elif HARDWARE_BT6702
 				  log_event_data((LOG_DO0_STATE + i), "Разомкнуто");
@@ -167,7 +167,7 @@ void relay_setup_log_change(uint8_t *curr_source, uint8_t *prev_source, ro_type_
 
 	for(i = 0; i < OUTPUTS_TOTAL_COUNT; i ++){
 		if(curr_source[i] != prev_source[i] && (prev_source[i] == src_act_ro || curr_source[i] == src_act_ro)){
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
 			if(curr_source[i] != src_act_ro){
 				flUpdateLog = true;
 				 SetROInt(0, i);
@@ -327,7 +327,7 @@ void UPS_LineFailMonitor(void)
   static uint8_t lineFailOldState = 0;
   uint8_t lineFailCurrent;
 
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
   uint8_t i = 0;
   static uint8_t OldROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
   uint8_t CurrROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
@@ -346,12 +346,12 @@ void UPS_LineFailMonitor(void)
     	log_event_data(LOG_ALARM_LINE, "Авария");
           SNMP_SendUserTrap(LINE_ALARM);
           flUpdateLog = true;
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
     	relay_setup_log(CurrROtype_Sourse, AC_PRESENT, 1);
 #endif
     }
     else{
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
       relay_setup_log(CurrROtype_Sourse, AC_PRESENT, 0);
 #endif
       log_event_data(LOG_ALARM_LINE, "Норма");
@@ -370,7 +370,7 @@ void UPS_LineFailMonitor(void)
   if (lineFailCurrent != lineFailOldState)
   {
     if (lineFailCurrent){
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
     	relay_setup_log(CurrROtype_Sourse, AC_PRESENT, 1);
 #endif
 
@@ -379,7 +379,7 @@ void UPS_LineFailMonitor(void)
     	flUpdateLog = true;
     }
     else{
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
       relay_setup_log(CurrROtype_Sourse, AC_PRESENT, 0);
 #endif
       log_event_data(LOG_ALARM_LINE, "Норма");
@@ -388,7 +388,7 @@ void UPS_LineFailMonitor(void)
     }
   }
 
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
   else{
 	  if (lineFailCurrent)
 		  relay_setup_log_change(CurrROtype_Sourse, OldROtype_Sourse, AC_PRESENT);
@@ -402,7 +402,7 @@ void UPS_LineFailMonitor(void)
   lineFailOldState = lineFailCurrent;
 }
 
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 /**
   * @brief  Мониторинг аварии выходного напряжения
   */
@@ -480,7 +480,7 @@ void UPS_LowBatMonitor(void)
   static uint8_t lowBatOldState = 0;
   uint8_t lowBatCurrent;
 
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
   uint8_t i = 0;
   static uint8_t OldROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
   uint8_t CurrROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
@@ -501,7 +501,7 @@ void UPS_LowBatMonitor(void)
     	log_event_data(LOG_ALARM_LOW_BAT, "Авария");
           SNMP_SendUserTrap(LOW_BAT_ALARM);
           flUpdateLog = true;
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
       relay_setup_log(CurrROtype_Sourse, CHARGE_AKB, 1);
 #endif
     }
@@ -509,7 +509,7 @@ void UPS_LowBatMonitor(void)
 	  SNMP_SendUserTrap(LOW_BAT_NORM);
 	  log_event_data(LOG_ALARM_LOW_BAT, "Норма");
 	  flUpdateLog = true;
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 	  relay_setup_log(CurrROtype_Sourse, CHARGE_AKB, 0);
 #endif
 	}
@@ -532,12 +532,12 @@ void UPS_LowBatMonitor(void)
       SNMP_SendUserTrap(LOW_BAT_NORM);
       log_event_data(LOG_ALARM_LOW_BAT, "Норма");
       flUpdateLog = true;
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
       relay_setup_log(CurrROtype_Sourse, CHARGE_AKB, 0);
 #endif
     }
   }
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
   else{
 	  if (lowBatCurrent)
 		  relay_setup_log_change(CurrROtype_Sourse, OldROtype_Sourse, CHARGE_AKB);
@@ -695,7 +695,7 @@ void UPS_BatteryConnectMonitor(void)
   static uint8_t AKBconnectOldState = 0;
   uint8_t AKBconnectCurrent;
 
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
   uint8_t i = 0;
   static uint8_t OldROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
   uint8_t CurrROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
@@ -719,7 +719,7 @@ void UPS_BatteryConnectMonitor(void)
       log_event_data(LOG_ALARM_AKB, "Авария");
 	  SNMP_SendUserTrap(BATTERY_CONNECT_ALARM);
 	  flUpdateLog = true;
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
       relay_setup_log(CurrROtype_Sourse, OFF_AKB, 1);
 #endif
     }
@@ -727,7 +727,7 @@ void UPS_BatteryConnectMonitor(void)
     	log_event_data(LOG_ALARM_AKB, "Норма");
 		  SNMP_SendUserTrap(BATTERY_CONNECT_NORM);
 		  flUpdateLog = true;
-#ifdef HARDWARE_BT6706
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
 		  relay_setup_log(CurrROtype_Sourse, OFF_AKB, 0);
 #endif
     }
@@ -742,7 +742,7 @@ void UPS_BatteryConnectMonitor(void)
       log_event_data(LOG_ALARM_AKB, "Норма");
       SNMP_SendUserTrap(BATTERY_CONNECT_NORM);
       flUpdateLog = true;
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
       relay_setup_log(CurrROtype_Sourse, OFF_AKB, 0);
 #endif
     }
@@ -750,12 +750,12 @@ void UPS_BatteryConnectMonitor(void)
       log_event_data(LOG_ALARM_AKB, "Авария");
       SNMP_SendUserTrap(BATTERY_CONNECT_ALARM);
       flUpdateLog = true;
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
       relay_setup_log(CurrROtype_Sourse, OFF_AKB, 1);
 #endif
     }
   }
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
   else{
 	  if (AKBconnectCurrent)
 		  relay_setup_log_change(CurrROtype_Sourse, OldROtype_Sourse, OFF_AKB);

modules/monitor/ups_monitor.h

@@ -42,7 +42,7 @@ void UPS_NonCriticalAlarmMonitor(void);
   */
 void UPS_LineFailMonitor(void);
 
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 /**
   * @brief  Мониторинг аварии выходного напряжения
   */

modules/parameters.c

@@ -19,7 +19,7 @@
 #include "snmp_api.h"
 #include "snmp.h"
 #include "megatec.h"
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 #include "telnet_server.h"
 #endif
 #endif
@@ -394,7 +394,7 @@ void GetROTypeActStr(char *str, uint8_t *len, uint8_t num)
   */
 void GetDOUTStatusStr(char *str, uint8_t *len, uint8_t num)
 {
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 	sprintf(str, "%d", (get_state_din_outs(DOUT1+num)^1));
 #elif HARDWARE_BT6702
 	sprintf(str, "%d", get_state_din_outs(DOUT1+num));
@@ -408,7 +408,7 @@ void GetDOUTStatusStr(char *str, uint8_t *len, uint8_t num)
   */
 void GetDOUTStatusStrRU(char *str, uint8_t *len, uint8_t num)
 {
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 	if (get_state_din_outs(DOUT1+num)^1)
 		sprintf(str, "Замкнут");
 	else
@@ -428,7 +428,7 @@ void GetDOUTStatusStrRU(char *str, uint8_t *len, uint8_t num)
   */
 void GetDOUT0StatusStr(char *str, uint8_t *len)
 {
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 	sprintf(str, "%d", (get_state_din_outs(DOUT1)^1));
 #elif HARDWARE_BT6702
 	sprintf(str, "%d", get_state_din_outs(DOUT1));
@@ -441,7 +441,7 @@ void GetDOUT0StatusStr(char *str, uint8_t *len)
   */
 void GetDOUT1StatusStr(char *str, uint8_t *len)
 {
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 	sprintf(str, "%d", (get_state_din_outs(DOUT2)^1));
 #elif HARDWARE_BT6702
 	sprintf(str, "%d", get_state_din_outs(DOUT2));
@@ -449,7 +449,7 @@ void GetDOUT1StatusStr(char *str, uint8_t *len)
 	*len = strlen(str);
 }
 
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 /**
   * @brief  Состояние релейного выхода
   */
@@ -860,7 +860,7 @@ void GetAuthEnableStateStr(char *str, uint8_t *len)
 
 #endif
 
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 // ************************************************************************** //
 //                             Параметры Telnet
 
@@ -1133,7 +1133,7 @@ void SetAuthEnableStateStr(char *str)
 }
 #endif
 
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 // ************************************************************************** //
 //                             Параметры Telnet
 #ifndef BT6702_SERVICE

modules/parameters.h

@@ -336,7 +336,7 @@ void GetDOUT0StatusStr(char *str, uint8_t *len);
   */
 void GetDOUT1StatusStr(char *str, uint8_t *len);
 
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 /**
   * @brief  Состояние релейного выхода
   */
@@ -344,7 +344,7 @@ void GetDOUT2StatusStr(char *str, uint8_t *len);
 #endif
 
 
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 // ************************************************************************** //
 //                             Параметры Telnet
 
@@ -495,7 +495,7 @@ void SetAuthEnableStateStr(char *str);
 
 #endif
 
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 // ************************************************************************** //
 //                             Параметры Telnet
 

modules/settings_api.c

@@ -152,7 +152,7 @@ void SETTINGS_SetServiceDef(void)
         case 0:
             sSettings.sAuth[user_id].level = ADMIN;
             strcpy(sSettings.sAuth[user_id].login, "admin");
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
             strcpy(sSettings.sAuth[user_id].password, "12345");
 #elif HARDWARE_BT6702
             strcpy(sSettings.sAuth[user_id].password, "R04ekR4MP2");
@@ -162,7 +162,7 @@ void SETTINGS_SetServiceDef(void)
         default:
         	sSettings.sAuth[user_id].level = USER;
             strcpy(sSettings.sAuth[user_id].login, "user");
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
             strcpy(sSettings.sAuth[user_id].password, "1234");
 #elif HARDWARE_BT6702
             strcpy(sSettings.sAuth[user_id].password, "R03ekR4MP2");
@@ -188,7 +188,7 @@ void SETTINGS_SetSntpDef(void)
   */
 void SETTINGS_SetINOUTSDef(void)
 {
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 	sSettings.sInOuts.ro_type_source[0] = AC_PRESENT;
 	sSettings.sInOuts.ro_type_source[1] = DC_PRESENT;
 	sSettings.sInOuts.ro_type_source[2] = CHARGE_AKB;
@@ -229,7 +229,7 @@ void SETTINGS_SetSSLcrtDef(void){
 }
 #endif
 
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 /**
   * @brief  Установить параметры Telnet
   */
@@ -255,7 +255,7 @@ void SETTINGS_SetDefault(void)
   SETTINGS_SetRADIUSDef();
   SETTINGS_SetSSLcrtDef();
 #endif
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
   SETTINGS_SetTelnetDef();
 #endif
 
@@ -298,7 +298,7 @@ void SETTINGS_SetAllDefault(void)
   SETTINGS_SetRADIUSDef();
   SETTINGS_SetSSLcrtDef();
 #endif
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
   SETTINGS_SetTelnetDef();
 #endif
   
@@ -325,7 +325,7 @@ void SETTINGS_SetDefaultDebug(void)
   SETTINGS_SetRADIUSDef();
   SETTINGS_SetSSLcrtDef();
 #endif
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
   SETTINGS_SetTelnetDef();
 #endif
   

modules/settings_api.h

@@ -131,7 +131,7 @@ typedef struct
   */
 typedef enum
 {
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 	AC_PRESENT = 1,
 	DC_PRESENT,
 	CHARGE_AKB,
@@ -213,7 +213,7 @@ typedef struct
   //char			our_srv_crt[1205];
   char			our_srv_crt[1705];
 #endif
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
   TELNET_t		sTelnet;
 #endif
   uint32_t      controlWorld;  // Слово для контроля целостности структуры настроек
@@ -277,7 +277,7 @@ void SETTINGS_SetRADIUSDef(void);
 void SETTINGS_SetSSLcrtDef(void);
 #endif
 
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 /**
   * @brief  Установить параметры Telnet
   */

service_hw/Commands/bt_6701_commands.c

@@ -17,7 +17,7 @@
 #include "gpio.h"
 #if defined HARDWARE_BT6702
 #include "board_bt6702.h"
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
 #include "board_bt6706.h"
 #endif
 #include "buttons.h"
@@ -105,7 +105,7 @@ void Test_U232(void)
 void Test_DRY(void)
 {
     uint8_t inputState;
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
     uint8_t start_state = 0;
     uint8_t end_state = 1;
     set_state_douts(DOUT1, 1);
@@ -163,7 +163,7 @@ void Test_DRY(void)
 	}
 
 	vTaskDelay(10);
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
     inputState = get_state_din_outs(DIN1);
 
 	set_state_douts(DOUT3, start_state);

service_hw/Settings/bt_6701_settings.c

@@ -93,7 +93,7 @@ void SETTINGS_SetMac(char *mac)
   */
 void Service_SETTINGS_SetWebParamsDef(void)
 {
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 	  strcpy(sSettings.sWebParams.ip, "192.168.0.6");
 #elif HARDWARE_BT6702
 	  strcpy(sSettings.sWebParams.ip, "192.168.0.2");
@@ -108,7 +108,7 @@ void Service_SETTINGS_SetWebParamsDef(void)
   */
 void Service_SETTINGS_SetTempWebParamsDef(void)
 {
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 	  strcpy(sSettings.sWebTempParams.ip, "192.168.0.6");
 #elif HARDWARE_BT6702
 	  strcpy(sSettings.sWebTempParams.ip, "192.168.0.2");

user/init_task.c

@@ -24,10 +24,10 @@
 #include "netconf.h"
 #include "udp_netsetting.h"
 #include "snmp_api.h"
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 #include "http_server.h"
 #include "telnet_server.h"
-#elif HARDWARE_BT6702
+#elif defined HARDWARE_BT6702
 #include "my_ssl_server.h"
 #endif
 #include "sntp_api.h"
@@ -157,7 +157,7 @@ void InitTask(void *params)
 	   else{
 		   UDP_netsetting_init();
 	   }
-#ifdef HARDWARE_BT6706
+#if defined HARDWARE_BT6706 || HARDWARE_BT6708
 	   telnet_server_init();
 #endif
  /* HTTPS_Init();