diff --git a/TC1/http_server/web/index.html b/TC1/http_server/web/index.html index 50f688f..56c8c2f 100644 --- a/TC1/http_server/web/index.html +++ b/TC1/http_server/web/index.html @@ -1519,7 +1519,7 @@ document.getElementById("submit-ota-link").disabled = true; //return; var fileInput = document.getElementById("ota_file"); if (fileInput.files.length === 0) { - Toast("请选择要上传的 OTA 文件"); + ShowToast("请选择要上传的 OTA 文件"); return; } clearTimeout(powerTimerId); diff --git a/TC1/http_server/web_data.c b/TC1/http_server/web_data.c index 9e38127..8fcc73b 100644 --- a/TC1/http_server/web_data.c +++ b/TC1/http_server/web_data.c @@ -1,5 +1,5 @@ const unsigned char js_pack[0xd2be] = { -0x1f,0x8b,0x08,0x00,0xcb,0x44,0x06,0x68,0x02,0xff,0xd4,0xbd,0xfb,0x72,0xdb,0x46, +0x1f,0x8b,0x08,0x00,0x1c,0x48,0x06,0x68,0x02,0xff,0xd4,0xbd,0xfb,0x72,0xdb,0x46, 0xd2,0x38,0xfa,0xff,0x56,0xed,0x3b,0x88,0x48,0x96,0x01,0xc4,0x21,0x45,0xca,0xb1, 0x13,0x83,0x1e,0xb1,0x1c,0xdb,0x49,0xbc,0x5f,0x9c,0x64,0xe3,0x5c,0x97,0x62,0x52, 0xb8,0x92,0xa0,0x48,0x82,0xe2,0xc5,0x12,0x23,0x72,0xdf,0xe7,0xf7,0x1a,0xe7,0xc9, @@ -3372,7 +3372,7 @@ const unsigned char js_pack[0xd2be] = { 0x02,0x0f,0xb7,0x98,0x0c,0x59,0x7f,0x97,0xf2,0x25,0x55,0x7c,0x45,0xad,0x25,0x8e, 0x0f,0x58,0x4f,0xcc,0x9f,0x00,0x32,0xd2,0xf4,0xa5,0xf0,0xee,0x02,0x00}; const unsigned char css_pack[0x6217] = { -0x1f,0x8b,0x08,0x00,0xcb,0x44,0x06,0x68,0x02,0xff,0xed,0xbd,0x79,0x73,0xdb,0xc8, +0x1f,0x8b,0x08,0x00,0x1d,0x48,0x06,0x68,0x02,0xff,0xed,0xbd,0x79,0x73,0xdb,0xc8, 0xf5,0x28,0xfa,0x7f,0xaa,0xf2,0x1d,0x70,0x9d,0x9a,0x1a,0x6b,0x42,0xc8,0xd8,0x49, 0x4a,0x95,0x54,0xbc,0x8f,0x26,0x96,0x9c,0x78,0x19,0x8f,0x9d,0x5f,0x9e,0x0b,0x04, 0x9a,0x24,0x24,0x90,0x60,0x00,0x50,0x1b,0x4b,0xb7,0xee,0x07,0xb9,0xef,0xcb,0xbd, @@ -4943,7 +4943,7 @@ const unsigned char css_pack[0x6217] = { 0xe6,0x54,0x09,0x49,0xbc,0xd0,0xc2,0x1c,0x55,0x23,0x76,0x55,0x21,0xff,0x3f,0x3f, 0xef,0x85,0xce,0x3d,0xbc,0x02,0x00}; const unsigned char web_index_html[0x36ba] = { -0x1f,0x8b,0x08,0x00,0xcb,0x44,0x06,0x68,0x02,0xff,0xed,0x7d,0xfb,0x97,0x1b,0xc5, +0x1f,0x8b,0x08,0x00,0x1d,0x48,0x06,0x68,0x02,0xff,0xed,0x7d,0xfb,0x97,0x1b,0xc5, 0x95,0xf0,0xef,0x39,0x67,0xff,0x87,0xa2,0xf1,0xb7,0x92,0x76,0xd4,0x92,0xba,0xf5, 0x18,0x69,0x5e,0x39,0xce,0x40,0x76,0xf8,0x76,0x8c,0x09,0xe3,0x38,0xbb,0xeb,0x70, 0x44,0x8f,0xba,0x67,0xd4,0xb8,0xa5,0x16,0xdd,0xad,0x19,0x8f,0x61,0xce,0xb1,0x93, @@ -5775,47 +5775,47 @@ const unsigned char web_index_html[0x36ba] = { 0x7d,0x66,0xe7,0x8d,0x5f,0xb0,0xdf,0xfe,0x6f,0x2f,0xb3,0x0b,0x5c,0x09,0xf8,0xea, 0xfa,0xce,0xeb,0xef,0x73,0xde,0x6e,0xc8,0x66,0x47,0x0e,0xe1,0x17,0xda,0x1f,0x43, 0x85,0x32,0x4a,0xbe,0xe8,0xa7,0xdc,0xf9,0xad,0x63,0x7e,0xc9,0x1c,0x5e,0x71,0xc1, -0xc5,0x68,0x74,0x31,0x98,0xf3,0x61,0xb6,0xef,0xff,0xea,0x8f,0xbb,0x7f,0x38,0xcd, -0xbe,0xfb,0x8e,0x3b,0x5b,0x83,0x4f,0xbf,0x27,0x1f,0xb7,0x0e,0x1d,0x1a,0x3a,0x3f, -0x8f,0x5f,0x01,0xc8,0xd0,0x5d,0xd8,0x41,0x7c,0x34,0x42,0x15,0xcd,0x77,0xd0,0x4f, -0x82,0xe7,0xc2,0xf6,0xd1,0x5d,0x79,0xad,0xff,0xdb,0x2f,0x77,0xde,0xbb,0x42,0x2a, -0xa5,0x69,0xa9,0x52,0x25,0xbd,0xcf,0xfe,0xd0,0xbb,0xf0,0xb7,0xf1,0xc4,0x98,0x71, -0x20,0x46,0x8c,0xb1,0x7e,0x87,0x9c,0x68,0x5a,0x6e,0x12,0xd3,0xbf,0x1f,0x5a,0x46, -0x99,0x7e,0x52,0x03,0x29,0xb3,0x59,0xa6,0x05,0xbc,0xc4,0xa0,0x5f,0x3b,0xed,0x1d, -0xe5,0x4c,0x65,0x3d,0xbf,0xe6,0x77,0xaa,0xbb,0xa3,0x15,0xe1,0x98,0xd4,0x81,0xc3, -0xe1,0x7f,0xa0,0x7e,0x9e,0x1b,0x12,0xde,0x88,0xc0,0x2e,0xd0,0x5c,0xa6,0x63,0x4e, -0x58,0xd7,0x41,0xaa,0x7c,0xc6,0xa3,0xfd,0x0f,0xf3,0x42,0x83,0x99,0x88,0x08,0x69, -0xa2,0x70,0x82,0xb3,0xaa,0xb1,0xf5,0x57,0x9a,0x90,0x51,0xc8,0xf8,0x4b,0xe2,0x52, -0xbc,0xd0,0x0f,0x95,0x58,0xb7,0x02,0xff,0xe8,0x53,0xae,0x1f,0x9e,0x66,0x5d,0xbc, -0xfb,0xd5,0x9b,0xbd,0x2b,0x7f,0xf8,0xe6,0xda,0x1b,0x07,0x9e,0x73,0x81,0xb7,0xff, -0xcf,0xd3,0xbe,0x89,0xbf,0xed,0xb7,0xd9,0xa4,0x9f,0x32,0x0c,0x35,0xd4,0x6d,0x8a, -0x2b,0xe1,0x0c,0x1d,0x33,0x1a,0x01,0x1d,0xfa,0xba,0x58,0x0e,0xc8,0x80,0xd1,0x67, -0xd3,0xe3,0x0d,0x32,0x43,0xe7,0xbe,0xe1,0x3d,0xe9,0x2d,0x59,0xf0,0x14,0xd1,0xa3, -0xc3,0x47,0x93,0xf4,0xde,0x5f,0x77,0xff,0xee,0x0d,0xb1,0x49,0x55,0x4e,0xf3,0x6e, -0xa9,0xf4,0x2c,0x81,0x4b,0x8c,0x3b,0xe7,0xdc,0x35,0x3f,0xf1,0x08,0x1a,0xf3,0x20, -0x3e,0xe0,0x99,0xc1,0xac,0x4c,0x55,0x71,0xde,0x6c,0x38,0xf4,0x10,0x48,0x70,0x9f, -0xd9,0x86,0x6f,0x86,0x02,0x1c,0xb7,0xc1,0xd1,0x40,0xe9,0x0c,0x05,0xdd,0x70,0x70, -0x8f,0x56,0x90,0x01,0x94,0xaf,0x1d,0x83,0x47,0xdf,0xb2,0x6a,0xf4,0xe6,0x84,0xf0, -0xbc,0xb9,0xcf,0x13,0xdf,0xe0,0x6a,0xd5,0x88,0xc9,0x8b,0xd2,0xe4,0x8f,0xc8,0xc0, -0x50,0x0d,0x45,0x55,0xf2,0xf9,0xf0,0x62,0x8f,0x1f,0xd8,0xe1,0xe1,0xf9,0x02,0x5c, -0x27,0xec,0x65,0xa8,0xfa,0x09,0x19,0x2e,0x41,0x73,0x03,0x2b,0x42,0x7e,0x7b,0x2d, -0x8d,0x4d,0x3a,0xe3,0x6e,0x31,0xf0,0x3b,0x64,0xd8,0xf6,0x82,0xc0,0x14,0x0a,0xd9, -0x46,0xec,0xcb,0x28,0x03,0xe7,0x99,0x6e,0xd9,0x75,0x60,0xc7,0xd0,0xd3,0x4c,0x19, -0x48,0x28,0x24,0x0c,0xf7,0x75,0x55,0xdf,0x88,0x2f,0x16,0x3e,0x78,0x14,0x8a,0x8b, -0xb4,0x78,0xb0,0x27,0x32,0xb4,0xc3,0x6b,0xcb,0x5e,0x86,0xee,0x88,0x5d,0xa3,0x34, -0xcc,0xa1,0x29,0xb6,0x2e,0x61,0xa1,0xf5,0x09,0x8b,0xcf,0xa0,0x70,0xa9,0x0c,0x92, -0xd5,0x0a,0xd9,0xc8,0xb3,0x25,0x4d,0x5f,0x6f,0x3a,0xc9,0x7c,0xe4,0x08,0x9c,0x8d, -0x30,0x32,0xc4,0x5c,0xd0,0x57,0xbd,0x77,0xfe,0x7a,0xf3,0x9d,0xab,0x3b,0x2f,0x9f, -0x19,0x6c,0x23,0x97,0xe7,0x1f,0xdb,0x4e,0xba,0x8d,0x81,0x1d,0xcf,0x97,0xa7,0x7b, -0x05,0x86,0x1e,0xc2,0xca,0x1f,0xed,0x97,0xd8,0x69,0xdc,0xbe,0x83,0x80,0x21,0xfe, -0xc3,0x24,0x96,0xc5,0x34,0x9f,0xa7,0x7d,0x36,0xe6,0x08,0x2c,0xfc,0xf4,0xb2,0xbf, -0x6e,0x4f,0xb7,0x9e,0xcd,0xd3,0xe4,0x68,0xab,0x95,0x16,0x76,0xde,0xfd,0x04,0x6c, -0x75,0xb0,0x49,0xd8,0x39,0x71,0xbd,0x8b,0x97,0xbe,0xb9,0xf6,0x76,0xc8,0xd0,0xb1, -0xe6,0xe7,0x71,0xa2,0x77,0xe3,0x53,0x7c,0xdf,0x62,0xcd,0x88,0x9b,0x7d,0xe8,0x27, -0x9d,0x49,0x58,0xda,0xe0,0x3c,0xdb,0x48,0x81,0xd8,0x14,0x5c,0xf7,0x53,0xd1,0x63, -0xbb,0x5a,0x8c,0xf0,0xb0,0x7b,0x25,0xc0,0xc8,0x13,0x92,0x77,0x2d,0xc6,0xef,0xeb, -0xe0,0xf6,0xfa,0x3f,0xe4,0x3e,0x7b,0xfe,0x79,0xf7,0x62,0x7e,0xbe,0x10,0x24,0x3e, -0x78,0xcf,0xa4,0xe8,0xb6,0xfa,0xe8,0xb6,0x97,0xb1,0xe4,0x25,0xde,0x75,0x04,0x69, -0xed,0x9f,0x7b,0xff,0xe6,0xef,0x5f,0x01,0x69,0x0d,0x1d,0xdb,0x87,0x27,0xbb,0xb8, -0x04,0x07,0xd5,0xf3,0x5f,0xb2,0xca,0xbb,0xc7,0x89,0xcd,0xe5,0x71,0x15,0x10,0x2e, -0xfe,0x3f,0xb3,0xfb,0x5c,0x67,0x4b,0x1a,0x01,0x00}; +0xc5,0x68,0x74,0x31,0x3c,0xef,0xc3,0x8c,0xdf,0xff,0xd5,0x1f,0x77,0xff,0x70,0x9a, +0x7d,0xfb,0x1d,0x77,0xb7,0x06,0x9f,0x7f,0x4f,0x3e,0x72,0x1d,0x3a,0x35,0x74,0x86, +0x1e,0xbf,0x0a,0x90,0xa1,0x3b,0xb1,0x83,0x18,0x69,0x84,0x32,0x9a,0xf3,0xa0,0x9f, +0x04,0xef,0x85,0xed,0xa5,0xbb,0xf2,0x5a,0xff,0xb7,0x5f,0xee,0xbc,0x77,0x85,0x54, +0x4a,0xd3,0x52,0xa5,0x4a,0x7a,0x9f,0xfd,0xa1,0x77,0xe1,0x6f,0xe3,0x89,0x32,0xe3, +0x42,0x8c,0x28,0x63,0xfd,0x0e,0x39,0xd1,0xb4,0xdc,0x44,0xa6,0x7f,0x3f,0xb4,0x8c, +0x72,0xfd,0xa4,0x06,0x92,0x66,0xb3,0x6c,0x0b,0x78,0x89,0x81,0xbf,0x76,0xda,0x3b, +0xce,0x99,0xca,0x7b,0x7e,0xcd,0xef,0x58,0x77,0x57,0x2b,0xc2,0x31,0xc9,0x03,0xa7, +0xc3,0xff,0x48,0xfd,0x3c,0x37,0x2c,0xbc,0x51,0x81,0xdd,0xa0,0xb9,0x8c,0xc7,0xbc, +0xb0,0xae,0x83,0x54,0xf9,0xcc,0x47,0x1f,0x00,0xe6,0x86,0x06,0x33,0x13,0x11,0xd2, +0x44,0x01,0x05,0x87,0x55,0x63,0x6b,0xb0,0x34,0x29,0xa3,0x90,0xf1,0x97,0xc5,0xa5, +0x78,0xc1,0x1f,0x2a,0xb5,0x6e,0x05,0xfe,0xf1,0xa7,0x5c,0x3f,0x3c,0xcd,0xba,0x78, +0xf7,0xab,0x37,0x7b,0x57,0xfe,0xf0,0xcd,0xb5,0x37,0x0e,0x3c,0xe7,0x02,0x6f,0xff, +0x9f,0xa7,0x7d,0x33,0x7f,0xdb,0x6f,0xb3,0x49,0x3f,0x67,0x18,0x6a,0xa8,0xdb,0x14, +0x57,0xca,0x19,0x3a,0x66,0x38,0x02,0x3a,0xf4,0x77,0xb1,0x1c,0x90,0x01,0x23,0xd0, +0xa6,0x47,0x1c,0x64,0x86,0xce,0x7f,0xc3,0x7b,0xd2,0x5b,0xb6,0xe0,0x29,0xa2,0xc7, +0x87,0x8f,0x26,0xe9,0xbd,0xbf,0xee,0xfe,0xdd,0x1b,0x66,0x93,0xaa,0x9c,0xe6,0xde, +0x52,0xe9,0x59,0x02,0xb7,0x18,0x77,0xcf,0xb9,0xeb,0x7e,0xe2,0x11,0x34,0xe8,0x41, +0x7c,0xc0,0x3b,0x83,0x99,0x99,0xaa,0xe3,0xbc,0xd9,0x70,0xe8,0x41,0x90,0xe0,0x42, +0xb3,0x4d,0xdf,0x0c,0x05,0x38,0x6f,0x83,0xa3,0x81,0xd2,0x19,0x0a,0xbc,0xe1,0x00, +0x1f,0xad,0x24,0x03,0x28,0x5f,0x43,0x06,0x8f,0xbe,0x65,0xf5,0xe8,0xcd,0x0b,0xe1, +0xb9,0x73,0x9f,0x27,0xbf,0xc1,0x15,0xab,0x11,0x13,0x18,0xa5,0xc9,0x1f,0x91,0x81, +0xb1,0x1a,0x8a,0xac,0xe4,0xf3,0xe1,0x05,0x1f,0x3f,0xb8,0xc3,0xc3,0xf3,0x05,0xb8, +0x4e,0xd8,0xcb,0x50,0xf5,0x93,0x32,0x5c,0x82,0xe6,0x06,0x56,0x85,0xfc,0xf6,0x5a, +0x1a,0x9b,0x78,0xc6,0xdd,0x66,0xe0,0x77,0xc8,0xb0,0x2d,0x06,0x81,0x39,0x14,0xb2, +0x8f,0xd8,0xd7,0x51,0x06,0xce,0x34,0xdd,0xb2,0xeb,0xc0,0x8e,0xa1,0x27,0x9a,0x32, +0x90,0x50,0x58,0x18,0xee,0xeb,0xaa,0xbe,0x11,0x5f,0x2c,0x7c,0xf8,0x28,0x14,0x17, +0x69,0xf1,0x60,0x5f,0x64,0x68,0x97,0xd7,0x96,0xbd,0x0c,0xdd,0x11,0xbb,0x4e,0x69, +0x98,0x43,0xd3,0x6c,0x5d,0xc2,0x42,0x6b,0x14,0x16,0x9f,0x45,0xe1,0x52,0x19,0x24, +0xac,0x15,0xb2,0x91,0x67,0x4b,0x9a,0xbe,0xde,0x74,0x92,0xf9,0xc8,0x11,0x38,0x1b, +0x61,0x64,0x88,0xb9,0xa0,0xaf,0x7a,0xef,0xfc,0xf5,0xe6,0x3b,0x57,0x77,0x5e,0x3e, +0x33,0xd8,0x46,0x2e,0xd7,0x3f,0xb6,0x9d,0x74,0x2b,0x03,0x3b,0xa2,0x2f,0x4f,0xf7, +0x0b,0x0c,0x3d,0x88,0x95,0x3f,0xde,0x2f,0xb1,0xd3,0xb8,0xbd,0x07,0x01,0x43,0xfc, +0x87,0x49,0x2c,0x8b,0x69,0x3e,0x4f,0xfb,0x6c,0xcc,0x31,0x58,0xf8,0xf9,0x65,0x7f, +0xed,0x9e,0x6e,0x3f,0x9b,0xa7,0x09,0xd2,0x56,0x2b,0x2d,0xec,0xbc,0xfb,0x09,0xd8, +0xeb,0x60,0x93,0xb0,0xb3,0xe2,0x7a,0x17,0x2f,0x7d,0x73,0xed,0xed,0x90,0xb1,0x63, +0xcd,0xcf,0xe3,0x44,0xef,0xc6,0xa8,0xf8,0xbe,0xc5,0x9a,0x11,0x37,0xfb,0xd8,0x4f, +0x3a,0x93,0xb0,0xbc,0xc1,0x79,0xb7,0x91,0x02,0xb1,0x69,0xb8,0xee,0xe7,0xa2,0xc7, +0x76,0xb7,0x18,0xe1,0x61,0x17,0x4b,0x80,0x91,0x27,0x24,0xef,0x5c,0x8c,0xdf,0xdb, +0xc1,0xed,0xf7,0x7f,0xc8,0x7d,0xf6,0xfc,0xf3,0xee,0xc5,0xfc,0x7c,0x21,0x48,0x7e, +0xf0,0x9e,0x49,0xd1,0xad,0xf5,0xd1,0xad,0x2f,0x63,0xc9,0x4b,0xbc,0xfb,0x08,0xd2, +0xda,0x3f,0xf7,0xfe,0xcd,0xdf,0xbf,0x02,0xd2,0x1a,0x3a,0xba,0x0f,0x4f,0x77,0x71, +0x09,0x0e,0xaa,0xe7,0xbf,0x66,0x95,0x77,0x8f,0x14,0x9b,0xcb,0xe3,0x4a,0x20,0x5c, +0xfc,0x7f,0xbd,0x44,0x19,0x8e,0x4f,0x1a,0x01,0x00}; diff --git a/TC1/http_server/web_log.c b/TC1/http_server/web_log.c index 27c9131..fc5a4c1 100644 --- a/TC1/http_server/web_log.c +++ b/TC1/http_server/web_log.c @@ -39,7 +39,7 @@ char* GetLogRecord() if (!log_record.logs[i%LOG_NUM]) continue; sprintf(tmp, "%s\n", log_record.logs[i%LOG_NUM]); if(i == log_record.idx){ - sprintf(tmp, "FreeMem %d bytes\n", MicoGetMemoryInfo()->free_memory); + sprintf(tmp, "%s\nFreeMem %d bytes\n",log_record.logs[i%LOG_NUM],MicoGetMemoryInfo()->free_memory); } } return log_record_str;