A suite of WiFi/Bluetooth offensive and defensive tools for the ESP32 diff --git a/esp32_marauder/Assets.h b/esp32_marauder/Assets.h index 055026e..3b36a42 100644 --- a/esp32_marauder/Assets.h +++ b/esp32_marauder/Assets.h @@ -3,7 +3,7 @@ #define jquery_min_js_v3_2_1_gz_len 30178 -PROGMEM const unsigned char menu_icons[][66] = { +PROGMEM static const unsigned char menu_icons[][66] = { {0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0x37, 0xFF, 0xFF, 0x3A, // Attack: 0 0xFF, 0xFF, 0x39, 0xFF, 0xBF, 0x3C, 0xFF, 0x7F, 0x3E, 0xFF, 0x2F, 0x3F, 0xFF, 0x9F, 0x3F, 0xFF, 0xCB, 0x3F, 0xFF, 0xE7, 0x3F, 0xCF, 0xF2, 0x3F, @@ -121,7 +121,7 @@ PROGMEM const unsigned char menu_icons[][66] = { }; -PROGMEM const char jquery_min_js_v3_2_1_gz[] = { +PROGMEM static const char jquery_min_js_v3_2_1_gz[] = { 0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x0a,0xcc,0xbd,0x69,0x77,0x1b,0x47,0x92,0x36,0xfa,0xfd,0xfd,0x15,0x44,0xb5,0x86,0x5d,0x25,0x24,0x41,0x50,0xb6,0xfb,0x9d,0x2e,0xa8,0x84,0x63,0x5b,0x56,0x5b,0x3d,0xde,0xda,0x92,0x97,0x1e,0x10,0xf6,0xa9,0x0d,0x40,0x81,0xd8,0x08,0x80,0xa2,0x64,0x02,0xf3,0xdb,0x6f,0x3c,0x11,0x99,0x59,0x59,0x0b,0x68,0xf7,0xcc,0x9d,0x73,0xaf,0x17,0xa2,0x96,0xac,0x5c,0x23,0x23,0x63,0x8f,0xcb,0xa7,0x9d,0xb3,0xf9,0x3f,0xee,0xf2,0xed,0x87,0xb3,0x77,0x1f,0xf5,0x9e,0xf5,0xae,0xce,0x0e,0x67,0x7e,0x1a,0x9c,0xfd,0xfd,0xcd,0xd9,0xab,0xf5,0xdd,0x2a,0x8b,0xf7,0xc5,0x7a,0x75,0x16,0xaf,0xb2,0xb3,0xf5,0x7e,0x96,0x6f,0xcf,0xd2,0xf5,0x6a,0xbf,0x2d,0x92,0xbb,0xfd,0x7a,0xbb,0xa3,0xa2,0xf3,0x5b,0x7c,0xda,0x5b,0x6f,0xa7,0x97,0x8b,0x22,0xcd,0x57,0xbb,0xfc,0xec,0xe9,0xe5,0xff,0xe9,0x4c,0xee,0x56,0x29,0x3e,0xf4,0x63,0x95,0x04,0x0f,0xde,0x1d,0x3d,0xde,0xd1,0x67,0xe9,0xde,0x1b,0x78,0xeb,0x64,0x9e,0xd3,0x45,0x14,0xed,0x3f,0x6c,0xf2,0xf5,0xe4,0x6c,0xb9,0xce,0xee,0x16,0xf9,0xf9,0xf9,0x89,0x17,0xbd,0xfc,0xfd,0x66,0xbd,0xdd,0xef,0x86,0xd5,0xdb,0x28,0xee,0x65,0xeb,0xf4,0x6e,0x99,0xaf,0xf6,0xc3,0x84,0x9a,0xe9,0xf4,0x83,0xb0,0x6c,0x35,0x78,0x28,0x26,0x7e,0xa7,0x2c,0x12,0xec,0x67,0xdb,0xf5,0xfd,0xd9,0x2a,0xbf,0x3f,0xfb,0x62,0xbb,0x5d,0x6f,0x7d,0x4f,0x8f,0x79,0x9b,0xdf,0xde,0x15,0xdb,0x7c,0x77,0x16,0x9f,0xdd,0x17,0xab,0x8c,0xca,0xdc,0x17,0xfb,0x19,0xdd,0x99,0x2f,0xbd,0x60,0xb0,0xcd,0xf7,0x77,0xdb,0xd5,0x19,0xb5,0x12,0x1c,0x43,0xfe,0xeb,0x7b,0x34,0x33,0xf9,0xa4,0x58,0xe5,0x99,0xd7,0x31,0xdd,0x95,0xef,0x87,0xf2,0x13,0xee,0x67,0xc5,0x4e,0x3d,0x32,0x0d,0xef,0x62,0x9a,0xcb,0x68,0x34,0x56,0x99,0x33,0x12,0x95,0x47,0xdf,0xf2,0x24,0xf4,0xa6,0xf9,0xfe,0xbb,0xed,0x7a,0xbf,0x46,0xdd,0xdf,0x4e,0xd4,0x24,0x4a,0x7b,0x3b,0x4c,0xb0,0x9a,0xd2,0x15,0xad,0x41,0x1a,0xef,0xd5,0x8c,0x2e,0x37,0x77,0xbb,0x99,0x2a,0xe8,0x82,0x5a,0xcd,0xdf,0x53,0xc9,0x79,0xf4,0x70,0x54,0x37,0xd1,0xbc,0xb7,0x5f,0xbf,0xa1,0xa6,0x56,0x53,0xb5,0xa0,0x9b,0x59,0xbc,0xfb,0xf6,0x7e,0x45,0x35,0x6e,0xf2,0xed,0xfe,0x83,0x5a,0x46,0x8b,0xf2,0xfd,0x2a,0x5a,0xf6,0xd2,0x78,0xb1,0xf0,0xa5,0xe9,0x40,0xad,0xa9,0x8a,0x81,0xe9,0xfa,0xd9,0x46,0x3a,0x9f,0x44,0xc9,0xe1,0x90,0xe9,0x6e,0x27,0xbd,0x74,0x9b,0xc7,0xfb,0xfc,0x8b,0x45,0x8e,0x6e,0xfb,0xde,0x2e,0xdd,0x16,0x1b,0xcc,0x55,0xda,0xdb,0xe7,0xef,0xf7,0x11,0x7d,0xd2,0x9b,0xe5,0x71,0xd6,0x8b,0x37,0x9b,0x7c,0x95,0x7d,0x3e,0x2b,0x16,0x19,0x41,0x55,0x6f,0x13,0x6f,0xa9,0xfc,0x37,0xeb,0x2c,0xef,0x6d,0xf3,0xe5,0xfa,0x5d,0x6e,0xde,0x1c,0x51,0xf1,0x6d,0xe4,0x31,0x08,0x7a,0x6a,0x1b,0x55,0xa7,0x4e,0x2f,0x01,0xd6,0x6f,0xdb,0x9b,0xac,0x68,0xb4,0xc5,0x9e,0xdf,0x1c,0xd5,0x2e,0xba,0xfc,0x65,0x74,0xbd,0xbb,0xbe,0x7b,0xf5,0xc5,0xab,0x57,0xd7,0xef,0x3f,0xed,0x8f,0xbb,0x87,0xda,0xfd,0x93,0xcb,0xa9,0xda,0x53,0xb1,0x8b,0xe5,0xee,0xe2,0x52,0xdd,0x45,0x97,0x17,0xfe,0x28,0xbe,0xf8,0x6d,0x1c,0xd0,0xf3,0x77,0xed,0x2d,0x25,0x34,0x3f,0x3f,0x50,0xdf,0xb7,0x9f,0xc7,0xbb,0xdc,0x0f,0x8e,0x03,0x34,0x1b,0x6d,0x7b,0x1b,0xb3,0x28,0xd1,0x83,0x80,0x7e,0x78,0xab,0x68,0x39,0x68,0x55,0xef,0x52,0xda,0x12,0xe1,0x56,0x2d,0xf2,0xd5,0x74,0x3f,0x0b,0xfb,0x6a,0xbf,0xfe,0x74,0xbb,0x8d,0x3f,0x94,0x50,0x69,0x2b,0x9f,0xc8,0x7c,0x03,0x44,0x68,0x00,0xb4,0xd4,0x15,0xc8,0x35,0x63,0xbd,0x5b,0x2c,0xa2,0x28,0x1e,0xba,0x85,0xc3,0xf8,0x79,0x7f,0x88,0xab,0x51,0xdc,0xc5,0x4f,0x4f,0x1a,0x1b,0x87,0xf2,0x6c,0x7c,0x54,0x80,0x87,0x37,0xfb,0x38,0xbd,0xa9,0x54,0x89,0xc9,0x4d,0xa8,0xf7,0xcb,0x7c,0x3b,0xcd,0xb9,0xaa,0x9e,0xd3,0x69,0x3f,0x50,0x71,0x09,0xe5,0x34,0xc4,0xfc,0x9d,0x80,0x42,0xc4,0x40,0x9c,0x1c,0x55,0x1e,0xa7,0xb3,0xb6,0x3e,0x6e,0x7b,0x78,0xc3,0x15,0x52,0x15,0x47,0xb5,0x8c,0x37,0x6d,0xc5,0xb8,0x41,0xdb,0x33,0x9f,0xfa,0x11,0x6f,0xfc,0xea,0x06,0x49,0x54,0x6a,0x8b,0xc7,0x32,0x62,0x7a,0x84,0x05,0x0e,0xb0,0xc6,0x00,0xfd,0x96,0x89,0xac,0x55,0x3c,0x01,0xb8,0x2d,0x3e,0xe8,0xfe,0x6c,0xa7,0xbc,0xa7,0x76,0xa8,0x60,0x52,0x6c,0x77,0xfb,0x53,0x15,0xe4,0xb7,0x7e,0x9f,0xca,0x2c,0xe2,0x47,0x8b,0x5c,0x5c,0x51,0x99,0xfc,0xb6,0x65,0x5e,0x9d,0x95,0x50,0x69,0xd4,0x8d,0xbb,0x3e,0x96,0x29,0x09,0xfb,0x76,0x52,0x6b,0xfd,0x4c,0x5f,0x44,0xfd,0xf3,0xf3,0xf4,0x79,0x32,0x1c,0xf1,0xc2,0xa5,0xe3,0x71,0x38,0x1a,0xa3,0xfa,0x55,0x76,0x72,0x94,0x76,0x55,0x0e,0x87,0xe6,0x02,0xca,0xc2,0x87,0x33,0xb5,0x23,0xdc,0x18,0x12,0xae,0xa0,0x1f,0xb5,0xdb,0xf0,0xb4,0xd1,0x1d,0x5f,0x1c,0x15,0x2d,0xd7,0xfb,0x3d,0xb5,0x11,0xf1,0x1e,0xd2,0xd7,0x4e,0x7b,0x18,0x0e,0x6d,0x02,0x9a,0xf7,0x4c,0xe5,0x6a,0x42,0xb8,0xc6,0x4e,0xe2,0xa8,0x3f,0x3e,0x1c,0x08,0xb3,0xcc,0xa2,0x2b,0x42,0x37,0xf6,0xb1,0x19,0xf6,0x3c,0xea,0x5c,0x0d,0x26,0xc0,0xab,0xc9,0x7a,0xbd,0xc8,0xe3,0x55,0x89,0xc5,0xa7,0xe7,0xe7,0xfe,0x3c,0x9a,0x56,0x2a,0x9b,0xe9,0xca,0xba,0xdd,0x40,0x35,0xd0,0xfe,0xf4,0x70,0xd8,0xf6,0x8a,0xdd,0x2b,0xd3,0xaf,0x69,0x70,0x38,0xf8,0x53,0xc2,0x49,0x01,0xb5,0x1e,0x45,0x05,0xd5,0x37,0x15,0xc8,0x9c,0x5d,0x5c,0x04,0x83,0xd9,0xf3,0x62,0x80,0x8a,0x08,0xe1,0x63,0xcb,0x74,0x22,0x3f,0xae,0xb4,0x14,0x04,0xe8,0x57,0x72,0x56,0x10,0x60,0x05,0x69,0x34,0x1d,0x25,0x8c,0x73,0xf1,0x33,0xed,0x44,0x51,0x86,0xee,0x9d,0x9f,0xe3,0x07,0xad,0x7e,0xb7,0x88,0x8b,0x95,0xcc,0xb3,0x9f,0xa1,0xe1,0x3c, 0xe2,0x5d,0x4c,0xaf,0xf8,0x97,0x1e,0x06,0xc1,0xd0,0xcf,0xe9,0x3f,0x1a,0x32,0xf0,0xf2,0xf9,0x79,0xb5,0x40,0x1a,0x0c,0x53,0xac,0x66,0xc8,0xef,0xea,0x75,0xf2,0x5b,0x1a,0x3a,0xba,0x11,0x99,0xf5,0xf0,0xe7,0x34,0xd9,0x54,0x71,0xf8,0x6e,0x5d,0x64,0x67,0x7d,0xdd,0x2b,0x2e,0x42,0x4f,0x0d,0x10,0x4d,0xcb,0x05,0xf4,0x1f,0xe8,0x14,0xa4,0x33,0x79,0x1d,0xea,0x73,0xcc,0xeb,0xfa,0xb7,0xdd,0xaf,0xe3,0xfd,0xac,0xb7,0xc5,0xe3,0xa5,0x1f,0x04,0x84,0x60,0x37,0x8b,0x38,0xcd,0xfd,0xcb,0xeb,0x97,0x84,0xe7,0x3c,0x2f,0x50,0xc5,0xee,0x7b,0xc2,0xc9,0x1f,0xc2,0x4e,0x5f,0xe5,0x38,0x05,0x2b,0xb0,0x5c,0x3f,0x21,0xb1,0x9f,0x57,0xeb,0xf5,0xc6,0x05,0xc8,0xa3,0x2a,0xd7,0xa5,0x65,0xa3,0x7b,0xe6,0x11,0x2d,0x26,0x0d,0x0e,0xeb,0xc9,0xd5,0x14,0xbb,0x9f,0xe4,0x50,0x3c,0x81,0xe6,0x3a,0x51,0x7c,0x7e,0x1e,0xd3,0x37,0x71,0x4f,0x4e,0x4f,0x7c,0xf2,0x0d,0xad,0x20,0x1d,0x95,0xad,0x78,0x4c,0xd7,0xac,0x67,0xc6,0xf7,0x56,0x77,0xcb,0x24,0xdf,0xa2,0x55,0x3a,0xa4,0xbc,0x1d,0x9f,0x6b,0x7c,0x17,0x9c,0x9f,0x77,0xa8,0xaa,0xf8,0x1b,0x3f,0xbe,0xa0,0xb3,0x67,0x97,0xbf,0x5a,0xac,0x63,0x3a,0x39,0x02,0xee,0x95,0xb3,0x30,0xcd,0x66,0x54,0xaa,0xab,0xef,0x10,0x21,0x41,0xb5,0x8e,0x04,0x4e,0xcf,0xa4,0xfc,0x98,0xce,0xfd,0xe8,0x46,0x10,0x15,0xd5,0x46,0xcb,0xd5,0xf1,0x93,0x08,0x9d,0x02,0xd0,0xa4,0x74,0xbe,0x6a,0x1c,0xe6,0x39,0xfb,0xd4,0xa3,0x72,0x89,0xbb,0x71,0x95,0x3b,0x63,0x1a,0xfc,0x09,0x68,0xf4,0x79,0x9c,0x06,0x34,0x84,0x95,0x74,0xf5,0x8b,0xe5,0x66,0xff,0xe1,0x54,0x57,0x07,0x0e,0x84,0xeb,0x3e,0x5f,0x99,0xce,0xf7,0x8f,0x0a,0x15,0x3f,0x76,0xc2,0xc4,0x5d,0xcf,0x0b,0x1b,0xdb,0x10,0x63,0x6e,0xf6,0x2e,0x1e,0xce,0x47,0x76,0xd8,0xb4,0x8b,0xcd,0x67,0xa1,0x79,0x4f,0xa0,0xbd,0x58,0x27,0xf1,0xe2,0x8b,0x77,0xf1,0xa2,0xd2,0xe8,0x86,0x41,0x21,0x8d,0x97,0xf9,0x02,0x67,0x6a,0x5b,0x87,0x62,0x0b,0xb3,0x7b,0xe5,0xd1,0x59,0xed,0x95,0x40,0x7c,0xa7,0xde,0x05,0x8d,0x73,0x08,0xe7,0x35,0x13,0x24,0xb4,0xa1,0xfb,0x03,0x42,0x00,0xf7,0x98,0xff,0x07,0xcc,0x46,0x4a,0xb0,0x24,0xb8,0x69,0x90,0x3d,0x4f,0x07,0x99,0x20,0x88,0x44,0xf7,0x7c,0x94,0x11,0x0e,0x50,0xf8,0xc1,0x14,0x77,0xae,0x82,0x84,0xc8,0x99,0x9b,0x63,0xbe,0x20,0x02,0x0d,0x5f,0x67,0x32,0x97,0xbf,0xfb,0x85,0xd9,0x9a,0x34,0x6a,0x82,0xb9,0xe5,0x63,0x93,0x4c,0x53,0xec,0x63,0xa2,0xcb,0x21,0xed,0xb0,0x27,0x71,0x66,0xde,0xe4,0x35,0x42,0xa1,0x1c,0x18,0xe0,0x79,0x34,0x1e,0xd4,0xf7,0x0a,0x0d,0x54,0xe3,0x13,0x1a,0xef,0xd0,0x9c,0xeb,0xa9,0x2a,0x41,0xdf,0x2e,0x17,0x51,0x05,0x61,0x1c,0x84,0x33,0x0d,0x52,0x74,0x4c,0x07,0x2a,0x25,0x88,0x5a,0x35,0xdb,0x74,0x8e,0x60,0xe9,0x75,0x32,0xbc,0xb8,0x0a,0x0b,0x03,0xc9,0x31,0xbd,0xa7,0xee,0xa2,0xa9,0x5a,0x57,0x31,0x65,0xd2,0xdd,0x6e,0x62,0x4e,0x04,0x5a,0x11,0xa2,0x66,0x1b,0x8b,0x10,0x8f,0xf2,0x6e,0x77,0x1c,0x25,0x34,0x91,0x76,0xf2,0x74,0x99,0x28,0x57,0x80,0x1e,0x9a,0x9e,0x46,0xaf,0x4c,0x03,0x74,0x2c,0x81,0x64,0x9e,0x50,0xdd,0x53,0x5b,0x37,0x9d,0x0a,0x9d,0x74,0x30,0x79,0x3e,0x1d,0x4c,0xa8,0x81,0x2c,0xea,0x10,0x89,0x3e,0x9a,0x50,0xa9,0x40,0x65,0xb4,0x49,0x67,0xe7,0xe7,0x39,0x9f,0xbd,0xfc,0xd4,0x62,0xd3,0xbc,0x4e,0xad,0x48,0x4b,0xba,0x15,0x6e,0x62,0x46,0x6d,0x59,0xa8,0x62,0xb0,0x28,0xc7,0x33,0x79,0x9e,0x71,0x73,0x79,0x64,0x5a,0xa3,0xaf,0x95,0x2c,0x10,0xf1,0x32,0x33,0x69,0x31,0x0f,0x06,0x16,0xa6,0x26,0x02,0x53,0xbf,0xfb,0x81,0xc1,0xf6,0x9a,0x96,0xa1,0xe1,0xce,0x40,0x24,0xde,0x15,0x59,0x78,0xa5,0x88,0xfc,0x7c,0xdf,0x0a,0x28,0x38,0xb1,0xd1,0xd7,0x06,0x04,0x24,0x04,0x2d,0xa9,0x1c,0x77,0x09,0x91,0xe5,0x71,0x44,0xad,0x56,0x8e,0x57,0x1a,0x9b,0x6e,0x92,0x68,0x01,0x0d,0xed,0xe6,0xf8,0x54,0xcf,0x02,0x9a,0xf1,0x26,0x45,0x12,0xeb,0xce,0x25,0x42,0x8b,0xa8,0x4c,0xb3,0x24,0x7e,0xbd,0x82,0x00,0xd8,0x2b,0xef,0xa1,0xf7,0x34,0x77,0xce,0x0f,0xce,0x78,0xfc,0x76,0xbb,0x2a,0xc7,0x39,0x73,0x1f,0xbe,0x24,0x7e,0xa2,0x47,0x17,0x6a,0x77,0xb7,0x01,0x87,0x17,0xae,0xe9,0xc0,0x6f,0xc1,0x40,0x6f,0x3e,0x2c,0x93,0xf5,0x82,0x8f,0xeb,0xc9,0x6a,0x24,0x77,0xbd,0x62,0x9f,0x6f,0x63,0x42,0xa8,0xe3,0x28,0x6d,0x3c,0xc2,0x78,0x99,0x4c,0xf5,0x3e,0x13,0xda,0xe4,0xec,0x1b,0x3e,0x2e,0xce,0x84,0xff,0x39,0x33,0x33,0x71,0xc6,0x3b,0xe2,0x0c,0xfd,0x38,0xfb,0x3e,0x9f,0x7e,0xf1,0x7e,0xa3,0x71,0xbd,0x1c,0x88,0xba,0x61,0x8f,0xa9,0x29,0x62,0x79,0xce,0xe8,0x40,0xad,0x2e,0xc4,0x7c,0x64,0x0f,0x09,0xaf,0x9b,0x74,0xbd,0xb1,0x47,0x80,0x4e,0x7c,0xc4,0x57,0xeb,0x7b,0xcb,0x47,0x04,0x25,0x63,0x75,0x5f,0x9e,0x68,0x9d,0x0e,0x6d,0x6a,0x4f,0x40,0xcb,0x03,0x98,0xd0,0x71,0x58,0x52,0x94,0xf5,0xf3,0xae,0x9c,0x14,0x02,0x6f,0x3a,0x2e,0x3a,0x58,0x4f,0x39,0x61,0xa9,0x10,0xcd,0x8c,0x17,0x63,0x24,0x38,0x00,0xd3,0xc3,0xa1,0xaf,0x4f,0x45,0x7b,0x46,0x96,0x80,0x91,0xbc,0x20,0x32,0x34,0xb9,0xb8,0x12,0xc8,0x64,0x16,0xec,0x7d,0xd4,0x72,0x10,0x1a,0x72,0x50,0x11,0xab,0xa9,0xe6,0xea,0x46,0x2d,0xd4,0x52,0xad,0xd4,0x5a,0x6d,0xd4,0xad,0xda,0xaa,0x9d,0xda,0x13,0x53,0xe5,0xed,0x8a,0xdf,0x7e,0x5b,0xe4,0x5e,0xf7,0xea,0x29,0x88,0x08,0x4c,0x23,0x31,0x57,0x0e,0x6f,0x7b,0x4f,0x5b,0xea,0x3d,0xfd,0xff,0x21,0x9a,0xc5,0xc4,0x72,0xfc,0x26,0x3f,0x9f,0xca,0xcf,0x67,0xed,0x6c,0x18,0x88,0x02,0x40,0xf0,0x22,0x22,0xfe,0x5e,0xd1,0x59,0xf6,0x39,0xd1,0x81,0x75,0x6e,0xf6,0x25,0x70,0xc2,0x17,0xd1,0xcb,0xde,0x66,0xbd,0x51,0xaf,0xf0,0x0b,0xa6,0xf8,0x6f, 0xe6,0xe2,0x4b,0xba,0x10,0xde,0xf9,0x75,0x74,0x0a,0x6f,0xf5,0x95,0xb3,0xb7,0x53,0xda,0xdb,0xa9,0x1c,0x18,0x31,0xd1,0xe6,0x4c,0x47,0xe8,0xfe,0x18,0x9a,0xe0,0xe2,0xea,0xa8,0xfe,0x1e,0x79,0xe9,0x2c,0x4f,0x6f,0xf2,0xec,0xb0,0xcb,0x17,0xb4,0xea,0x74,0x11,0xef,0x3e,0xac,0xd2,0x43,0x7c,0xb7,0x5f,0x4f,0x68,0xd8,0x3b,0xbe,0x22,0x6c,0xff,0xe1,0xc0,0x62,0x93,0xf5,0x62,0x77,0xc8,0xf2,0x49,0xbe,0x3d,0x64,0xc5,0x2e,0x4e,0x16,0xf4,0xc1,0xac,0xc8,0xb2,0x7c,0x75,0x28,0x76,0x84,0x8c,0x0e,0x0b,0x22,0xb7,0x0e,0xcb,0xbb,0xc5,0xbe,0xd8,0x2c,0xf2,0x03,0x8d,0x6e,0x75,0xa0,0x53,0x26,0x5b,0xaf,0x16,0x1f,0x0e,0x5a,0x50,0x41,0x6d,0xa5,0xf4,0x22,0xf3,0xd4,0x7f,0x44,0xde,0xe8,0xfa,0xfa,0xfd,0xb3,0xfe,0xf5,0xf5,0xfe,0xfa,0x7a,0x7b,0x7d,0xbd,0xba,0xbe,0x9e,0x8c,0x3d,0xf5,0x55,0xe4,0xf9,0xc3,0xf0,0x9a,0xfe,0xe9,0x11,0x1f,0x7c,0x7d,0x7f,0x31,0x3e,0x8c,0x7e,0xb9,0xee,0x5f,0x50,0xd9,0xb8,0x3f,0x0e,0xba,0x9e,0xfa,0x3a,0xf2,0xae,0xaf,0x47,0x5e,0xf7,0x3f,0xba,0xde,0x53,0xdf,0xeb,0x7e,0xd5,0xf5,0x02,0xfa,0x42,0xdf,0x8f,0x9e,0xfe,0xf2,0xe4,0xd0,0xf9,0xaf,0xf1,0x30,0x0a,0xf4,0x93,0x61,0xf8,0x67,0xbf,0xac,0xf1,0x17,0xfc,0xfe,0x79,0x1c,0x3c,0x0d,0xfe,0x7c,0xb8,0xf6,0xea,0x2f,0xae,0x3d,0xbc,0xb9,0xf6,0x0e,0xba,0xde,0xe0,0xa0,0x6b,0xb9,0xbe,0xa6,0xae,0x7d,0x13,0xd1,0x21,0x68,0x1b,0xbc,0xbe,0xf6,0x7d,0xff,0x5f,0xaf,0x3a,0x38,0xd4,0xdf,0xf8,0x01,0x8d,0x73,0x3c,0x3e,0x78,0xdd,0xaf,0xa9,0xe6,0xa7,0xc1,0xa1,0x47,0xe5,0xae,0xd1,0xb4,0xfa,0x36,0x02,0x2c,0xca,0x6e,0xf6,0xa9,0x1f,0x34,0x7a,0x6f,0x4a,0x1b,0xf7,0x3b,0xf7,0xb9,0xf7,0x0b,0xf7,0xb1,0xcb,0x15,0xff,0xa2,0x2b,0x1d,0x07,0xa6,0x15,0xaa,0x51,0xde,0x3f,0xd1,0x1f,0xff,0xa3,0xe5,0xe3,0xa7,0x4a,0x7e,0xe8,0xf5,0xf7,0x6d,0xaf,0xfd,0xd1,0x8b,0xee,0x7f,0xa1,0x8b,0x74,0x13,0xd8,0xa2,0x6f,0x2a,0x45,0x23,0x53,0x94,0x3a,0x30,0xfe,0x33,0x8d,0xf7,0xe9,0xd0,0x9d,0x3d,0x6e,0xfb,0xad,0xfb,0xc5,0x37,0x81,0xfa,0xa1,0xde,0x18,0x4d,0xee,0x13,0x2a,0xf7,0x63,0xf4,0xf0,0xfa,0x65,0x58,0x79,0xf7,0x27,0x3d,0xf5,0xf4,0xf6,0xf3,0xaf,0x3e,0x7d,0xf3,0xa6,0xfa,0x96,0x06,0x5a,0xbe,0x7f,0xfb,0xe9,0xdf,0xaa,0x6f,0xe5,0xd5,0x61,0xf4,0x74,0x8c,0xd7,0x9f,0xbe,0x7d,0xfb,0x7d,0x58,0x6b,0xf7,0x6b,0x9a,0xd4,0x37,0x5f,0xfc,0xf0,0xf2,0xdb,0xfa,0x0b,0xea,0xe4,0xe7,0x5f,0xbe,0xfe,0xaa,0xd6,0x99,0xd0,0x67,0xa8,0x66,0xbe,0xfc,0x00,0xce,0xfb,0xb0,0xda,0xcf,0xf0,0xff,0x05,0x6e,0x82,0x0b,0x3f,0x85,0x60,0xe8,0xb0,0x9e,0x5c,0x00,0x5d,0x69,0x70,0xd1,0xf3,0x93,0xbf,0xa3,0x8d,0xb1,0xce,0x32,0x5a,0xaf,0x51,0x97,0xc0,0x3b,0xf0,0xaf,0xaf,0xb3,0xa7,0xc1,0xea,0x50,0x42,0xac,0x7e,0xa1,0xef,0xe9,0x75,0x97,0xc0,0xc1,0x4e,0x26,0x83,0x86,0x57,0xd0,0x48,0xc0,0xad,0xd6,0x46,0x8a,0x9d,0xf0,0x77,0x9a,0x86,0x27,0xba,0xc8,0x2a,0xcf,0xb3,0xdd,0xe7,0xb4,0x7d,0x89,0xf5,0xaa,0x8f,0x0d,0xd5,0xc9,0xc2,0x86,0x65,0xaf,0xf2,0xdb,0xc3,0x94,0xc6,0x24,0x23,0x2a,0x07,0x58,0x1d,0x03,0xdd,0xd0,0x8e,0xcc,0x82,0x21,0x77,0xdd,0xe9,0x98,0x3f,0x8c,0x46,0xbf,0x50,0xdf,0x9f,0xe8,0x2e,0x1e,0xd5,0x4f,0xd1,0x25,0x7a,0x55,0xac,0x36,0x77,0x7b,0x8d,0x69,0x0e,0xe8,0x4c,0x4c,0xb8,0xe1,0x90,0xdc,0xed,0xf7,0xeb,0x55,0xf0,0xe4,0xb2,0x50,0x3f,0x53,0xb9,0xd9,0x75,0x86,0xcb,0x7f,0x42,0x26,0xf6,0xcb,0xc3,0xb8,0x7b,0xfd,0x70,0xbd,0x7b,0x7a,0x3d,0x5a,0xc5,0xfb,0xe2,0x5d,0x7e,0x76,0x7d,0x7f,0xa9,0xfe,0x53,0x6a,0xfb,0x93,0x3f,0x02,0x6a,0xa0,0x69,0xf1,0xaf,0xef,0xe9,0x2f,0xad,0xbe,0x7e,0x40,0x75,0xa9,0x27,0xd1,0xe5,0x88,0x46,0x75,0xa9,0x7e,0xad,0x80,0x17,0x6f,0x36,0xda,0x6b,0x59,0x7c,0x31,0x19,0x3f,0x5c,0xa9,0xbf,0x1c,0xb9,0xe3,0xc3,0x83,0x8c,0x8a,0x36,0x1e,0x77,0x1a,0x70,0x1a,0xc7,0x51,0x2b,0x69,0x15,0x79,0xfd,0xf7,0x74,0x38,0x5e,0xfc,0xe5,0x93,0x4f,0x3e,0xfa,0x8b,0xa1,0x75,0x40,0xa6,0x11,0x45,0x90,0x0e,0x93,0x30,0x7b,0xde,0x1f,0xca,0xb9,0xdc,0x9b,0x6c,0xd7,0xcb,0xcf,0x67,0xf1,0xf6,0xf3,0x75,0x96,0xfb,0x59,0x97,0xbf,0x08,0xc2,0xd6,0x97,0x2f,0x5e,0x5c,0xf5,0x0f,0x9f,0x7c,0xf2,0xec,0xaf,0x7f,0x51,0x57,0xfd,0x67,0x1f,0x9d,0x67,0x87,0x4f,0xfe,0xf2,0xd1,0x33,0x08,0x75,0x92,0x38,0xba,0xa4,0x2e,0x13,0xfa,0x7b,0x7f,0x35,0xb9,0x7e,0xff,0x7f,0x27,0xe3,0xc3,0x2f,0x17,0x43,0x9a,0x78,0xfa,0x79,0xa2,0x11,0xa3,0x7e,0x73,0x71,0x7d,0xf7,0x8a,0xfe,0xc1,0x2c,0x10,0xbf,0x9c,0xc6,0x27,0x04,0x83,0x43,0xef,0xba,0x8f,0xa3,0x95,0x48,0xfa,0xeb,0xbb,0xc9,0x64,0x92,0x79,0x61,0x2c,0xe7,0x8b,0xdf,0x57,0x17,0x57,0x84,0x60,0x09,0x55,0x75,0xe3,0x5e,0xaa,0x7b,0xf7,0x29,0x11,0xe9,0xfa,0x64,0xa1,0xb7,0x56,0xec,0xea,0x5f,0xfd,0x85,0x8a,0x9e,0x11,0xe3,0xc5,0xc5,0x8f,0x2a,0x8b,0x5d,0x42,0x6b,0xe9,0x33,0xbb,0x13,0xed,0x63,0xbf,0x95,0x51,0x32,0x07,0x08,0x98,0x91,0x3e,0x8e,0x7c,0x3a,0xcb,0x96,0x4c,0x3a,0xd0,0x51,0xbf,0x88,0x93,0x7c,0xe1,0xc9,0xa1,0xae,0x1e,0xb2,0x62,0x1b,0x7a,0xa5,0xe0,0xd5,0x23,0x88,0x26,0x48,0x26,0x6a,0x63,0x9a,0xaf,0x32,0x8f,0x28,0x92,0xfd,0xf6,0xc3,0xc3,0xdf,0x34,0x45,0xf7,0x32,0xfa,0x52,0x48,0xb8,0x77,0x3d,0xde,0x81,0xf8,0x62,0x17,0xa8,0xea,0xdd,0xcb,0x91,0x7b,0x6f,0x84,0x90,0x44,0xbc,0x65,0xf9,0x5b,0xda,0xad,0x47,0xa2,0x04,0x89,0xdc,0x9a,0x50,0x7f,0xff,0x16,0x3d,0x70,0xbd,0xe1,0x4b,0x5d,0x6a,0x58,0x9d,0xd4,0x57,0xba,0xd9,0x58,0xe9,0x66,0x13,0x22,0x18,0x5b,0x19,0xa1,0xd8,0x61,0x2c,0x06,0xf7,0xd4,0x78,0x8e,0xc3,0x59,0xf3,0x12,0xf4,0x13, diff --git a/esp32_marauder/Buffer.h b/esp32_marauder/Buffer.h index cabcce3..f60c74c 100644 --- a/esp32_marauder/Buffer.h +++ b/esp32_marauder/Buffer.h @@ -5,7 +5,7 @@ #include "FS.h" //#include "SD_MMC.h" -#define BUF_SIZE 24 * 1024 +#define BUF_SIZE 3 * 1024 // Had to reduce buffer size to save RAM. GG @spacehuhn #define SNAP_LEN 2324 // max len of each recieved packet //extern bool useSD; diff --git a/esp32_marauder/Display.h b/esp32_marauder/Display.h index 4a849b6..dff64c5 100644 --- a/esp32_marauder/Display.h +++ b/esp32_marauder/Display.h @@ -56,7 +56,7 @@ class Display TFT_eSPI tft = TFT_eSPI(); TFT_eSprite img = TFT_eSprite(&tft); TFT_eSPI_Button key[BUTTON_ARRAY_LEN]; - String version_number = "v0.5.1"; + String version_number = "v0.5.2"; bool printing = false; bool loading = false; diff --git a/esp32_marauder/SDInterface.cpp b/esp32_marauder/SDInterface.cpp index 283f5cc..d69c3c5 100644 --- a/esp32_marauder/SDInterface.cpp +++ b/esp32_marauder/SDInterface.cpp @@ -20,15 +20,15 @@ bool SDInterface::initSD() { else Serial.println("SD: UNKNOWN Card Mounted"); - this->cardSizeBT = SD.cardSize(); - this->cardSizeKB = SD.cardSize() / 1024; + //this->cardSizeBT = SD.cardSize(); + //this->cardSizeKB = SD.cardSize() / 1024; this->cardSizeMB = SD.cardSize() / (1024 * 1024); - this->cardSizeGB = SD.cardSize() / (1024 * 1024 * 1024); + //this->cardSizeGB = SD.cardSize() / (1024 * 1024 * 1024); - Serial.printf("SD Card Size: %llu Bytes\n", this->cardSizeBT); - Serial.printf("SD Card Size: %lluKB\n", this->cardSizeKB); + //Serial.printf("SD Card Size: %llu Bytes\n", this->cardSizeBT); + //Serial.printf("SD Card Size: %lluKB\n", this->cardSizeKB); Serial.printf("SD Card Size: %lluMB\n", this->cardSizeMB); - Serial.printf("SD Card Size: %lluGB\n", this->cardSizeGB); + //Serial.printf("SD Card Size: %lluGB\n", this->cardSizeGB); if (this->supported) { //display_obj.tft.println((byte)(sd_obj.cardSizeMB % 10)); @@ -49,8 +49,8 @@ bool SDInterface::initSD() { buffer_obj = Buffer(); - if (this->supported) - buffer_obj.open(&SD); + //if (this->supported) + // buffer_obj.open(&SD); return true; } @@ -63,6 +63,11 @@ void SDInterface::addPacket(uint8_t* buf, uint32_t len) { } } +void SDInterface::openCapture() { + if (this->supported) + buffer_obj.open(&SD); +} + void SDInterface::main() { if ((this->supported) && (this->do_save)) { //Serial.println("Saving packet..."); diff --git a/esp32_marauder/SDInterface.h b/esp32_marauder/SDInterface.h index 0d0cf53..4652448 100644 --- a/esp32_marauder/SDInterface.h +++ b/esp32_marauder/SDInterface.h @@ -14,10 +14,10 @@ class SDInterface { public: uint8_t cardType; - uint64_t cardSizeBT; - uint64_t cardSizeKB; + //uint64_t cardSizeBT; + //uint64_t cardSizeKB; uint64_t cardSizeMB; - uint64_t cardSizeGB; + //uint64_t cardSizeGB; bool supported = false; bool do_save = true; @@ -26,6 +26,7 @@ class SDInterface { bool initSD(); void addPacket(uint8_t* buf, uint32_t len); + void openCapture(); void main(); //void savePacket(uint8_t* buf, uint32_t len); }; diff --git a/esp32_marauder/Web.h b/esp32_marauder/Web.h index 4b7990c..7f90fca 100644 --- a/esp32_marauder/Web.h +++ b/esp32_marauder/Web.h @@ -20,14 +20,14 @@ class Web { private: - const char* host = "esp32marauder"; - const char* ssid = "MarauderOTA"; - const char* password = "justcallmekoko"; + PROGMEM const char* host = "esp32marauder"; + PROGMEM const char* ssid = "MarauderOTA"; + PROGMEM const char* password = "justcallmekoko"; bool serving = false; int num_sta = 0; - const char* loginIndex = + PROGMEM const char* loginIndex = "