From 22e639a52ffe174179a3b9315f2eb65e7b83dcfc Mon Sep 17 00:00:00 2001 From: Sasa Karanovic Date: Fri, 21 Feb 2025 21:22:43 -0500 Subject: [PATCH] Updating WInFiDEL API path to include API version. Adding diameter serial printout. --- Firmware/data_pre/js/winfidel_calibration.js | 10 +- Firmware/data_pre/js/winfidel_index.js | 4 +- Firmware/src/binary_data.ino | 214 ++++++++++--------- Firmware/src/config_winfidel.h | 2 + Firmware/src/main.ino | 2 + Firmware/src/measurements.ino | 9 + Firmware/src/webserver.ino | 16 +- 7 files changed, 136 insertions(+), 121 deletions(-) diff --git a/Firmware/data_pre/js/winfidel_calibration.js b/Firmware/data_pre/js/winfidel_calibration.js index cf195c6..9d30ba3 100644 --- a/Firmware/data_pre/js/winfidel_calibration.js +++ b/Firmware/data_pre/js/winfidel_calibration.js @@ -48,7 +48,7 @@ $(document).ready(function(){ function get_calibration() { - $.getJSON( '/api/calibration/read', function( data ) { + $.getJSON( '/api/v0/calibration/read', function( data ) { const total_points = data['data'].length; $('#calibration-points-count').text(total_points); @@ -70,7 +70,7 @@ function get_calibration() function create_calibration_point(adc, mm) { - $.get( '/api/calibration/create?adc='+ adc +'&mm='+ mm, function( data ) { + $.get( '/api/v0/calibration/create?adc='+ adc +'&mm='+ mm, function( data ) { if (data['status'] == 'ok') { location.reload(); @@ -80,7 +80,7 @@ function create_calibration_point(adc, mm) function remove_calibration_point(diameter) { - $.get( '/api/calibration/remove?mm='+ diameter, function( data ) { + $.get( '/api/v0/calibration/remove?mm='+ diameter, function( data ) { console.log(data); if (data['status'] == 'ok') @@ -92,14 +92,14 @@ function remove_calibration_point(diameter) function refresh_reading() { - $.getJSON( '/api/diameter/read', function( data ) { + $.getJSON( '/api/v0/diameter/read', function( data ) { $('#input-adc-last').val(data['data']['adc']); }); } function reset_stats() { - $.get( '/api/diameter/reset'); + $.get( '/api/v0/diameter/reset'); } diff --git a/Firmware/data_pre/js/winfidel_index.js b/Firmware/data_pre/js/winfidel_index.js index fcd1516..8640d56 100644 --- a/Firmware/data_pre/js/winfidel_index.js +++ b/Firmware/data_pre/js/winfidel_index.js @@ -57,7 +57,7 @@ function chart_add_point(newData) { function refresh_reading() { - $.getJSON( '/api/diameter/read', function( data ) { + $.getJSON( '/api/v0/diameter/read', function( data ) { $('#reading-last').text(data['data']['diameter']); $('#reading-min').text(data['data']['min']); @@ -71,7 +71,7 @@ function refresh_reading() function reset_stats() { - $.get( '/api/diameter/reset'); + $.get( '/api/v0/diameter/reset'); } function get_timestamp() diff --git a/Firmware/src/binary_data.ino b/Firmware/src/binary_data.ino index 67a9db4..dc1d731 100644 --- a/Firmware/src/binary_data.ino +++ b/Firmware/src/binary_data.ino @@ -1,7 +1,7 @@ // This file was auto generated using ESP32 Data Embed script // Please do not manually modify this file // since any changes to this file will be overwritten on next build. -// Generated on 2025-01-19 19:49:00 +// Generated on 2025-02-21 21:14:04 @@ -9,7 +9,7 @@ // Content of `/favicon.ico` const uint8_t web_data_favicon_ico[2002] PROGMEM = { -0x1F, 0x8B, 0x08, 0x00, 0x7C, 0x9D, 0x8D, 0x67, 0x02, 0xFF, 0xED, 0x9B, 0x79, 0x50, 0x13, 0x67, +0x1F, 0x8B, 0x08, 0x00, 0xEC, 0x32, 0xB9, 0x67, 0x02, 0xFF, 0xED, 0x9B, 0x79, 0x50, 0x13, 0x67, 0x14, 0xC0, 0x17, 0xF1, 0xAE, 0x15, 0x8F, 0x4E, 0xEB, 0x35, 0x15, 0xA5, 0x55, 0xAB, 0xCE, 0x94, 0x71, 0xDA, 0x19, 0x67, 0x74, 0x0A, 0x56, 0xDB, 0x8E, 0xA5, 0x58, 0x8B, 0xC5, 0x96, 0x02, 0x82, 0x1C, 0x11, 0x4F, 0x4E, 0xC9, 0xEE, 0x26, 0xE0, 0x42, 0x38, 0x84, 0x5C, 0x20, 0xE4, 0x44, 0x0E, @@ -138,7 +138,7 @@ const uint8_t web_data_favicon_ico[2002] PROGMEM = { }; // Content of `/favicon.png` const uint8_t web_data_favicon_png[2634] PROGMEM = { -0x1F, 0x8B, 0x08, 0x00, 0x7C, 0x9D, 0x8D, 0x67, 0x02, 0xFF, 0x01, 0x33, 0x0A, 0xCC, 0xF5, 0x89, +0x1F, 0x8B, 0x08, 0x00, 0xEC, 0x32, 0xB9, 0x67, 0x02, 0xFF, 0x01, 0x33, 0x0A, 0xCC, 0xF5, 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x08, 0x06, 0x00, 0x00, 0x00, 0xAA, 0x69, 0x71, 0xDE, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7C, 0x08, 0x64, 0x88, @@ -995,7 +995,7 @@ const uint8_t web_data_settings_html[7812] PROGMEM = { }; // Content of `/css/bootstrap-grid.min.css` const uint8_t web_data_css_bootstrap_grid_min_css[3477] PROGMEM = { -0x1F, 0x8B, 0x08, 0x00, 0x7C, 0x9D, 0x8D, 0x67, 0x02, 0xFF, 0xD5, 0x5C, 0x5B, 0x8F, 0xE3, 0xB6, +0x1F, 0x8B, 0x08, 0x00, 0xEC, 0x32, 0xB9, 0x67, 0x02, 0xFF, 0xD5, 0x5C, 0x5B, 0x8F, 0xE3, 0xB6, 0x19, 0x7D, 0xCF, 0xAF, 0x70, 0x50, 0x04, 0x48, 0x06, 0x2B, 0x8F, 0xE4, 0xBB, 0x3D, 0x48, 0x91, 0x36, 0x08, 0x82, 0x05, 0x36, 0x7D, 0x68, 0xD3, 0xA7, 0xA2, 0x0F, 0xB2, 0x4D, 0x7B, 0xD4, 0xE8, 0x62, 0x48, 0xF2, 0x8C, 0x36, 0x83, 0xF9, 0xEF, 0xE5, 0x47, 0x8A, 0x14, 0x25, 0x52, 0xA2, 0xE4, @@ -1216,7 +1216,7 @@ const uint8_t web_data_css_bootstrap_grid_min_css[3477] PROGMEM = { }; // Content of `/css/bootstrap-reboot.min.css` const uint8_t web_data_css_bootstrap_reboot_min_css[1583] PROGMEM = { -0x1F, 0x8B, 0x08, 0x00, 0x7C, 0x9D, 0x8D, 0x67, 0x02, 0xFF, 0xA5, 0x57, 0x4B, 0x6F, 0xDB, 0x38, +0x1F, 0x8B, 0x08, 0x00, 0xEC, 0x32, 0xB9, 0x67, 0x02, 0xFF, 0xA5, 0x57, 0x4B, 0x6F, 0xDB, 0x38, 0x10, 0xBE, 0xF7, 0x57, 0xA8, 0x2E, 0x0A, 0x34, 0x01, 0x69, 0xCB, 0x69, 0xDD, 0x74, 0x25, 0x14, 0xD8, 0xB6, 0x68, 0xB1, 0x01, 0xDA, 0x1E, 0x9A, 0xF6, 0x14, 0xF8, 0x40, 0x49, 0x23, 0x8B, 0x35, 0x45, 0x6A, 0x49, 0xCA, 0x8E, 0x23, 0xE8, 0xBF, 0xEF, 0x50, 0x0F, 0x5B, 0x8A, 0xED, 0xF4, 0xB0, @@ -1318,7 +1318,7 @@ const uint8_t web_data_css_bootstrap_reboot_min_css[1583] PROGMEM = { }; // Content of `/css/bootstrap.min.css` const uint8_t web_data_css_bootstrap_min_css[24481] PROGMEM = { -0x1F, 0x8B, 0x08, 0x00, 0x7C, 0x9D, 0x8D, 0x67, 0x02, 0xFF, 0xED, 0xBD, 0xFB, 0x8F, 0xE3, 0x38, +0x1F, 0x8B, 0x08, 0x00, 0xEC, 0x32, 0xB9, 0x67, 0x02, 0xFF, 0xED, 0xBD, 0xFB, 0x8F, 0xE3, 0x38, 0x92, 0x20, 0xFC, 0xFB, 0xFD, 0x15, 0xDE, 0x6A, 0xD4, 0x57, 0x9D, 0xD3, 0xB6, 0xCB, 0x92, 0xDF, 0x4E, 0x74, 0x7D, 0xF3, 0xC0, 0x2E, 0x76, 0x80, 0x9E, 0xC5, 0x61, 0xE7, 0x0E, 0x38, 0xA0, 0xAF, 0x0E, 0x90, 0x2D, 0x39, 0xED, 0x29, 0xF9, 0x71, 0xB6, 0xB3, 0x4A, 0x39, 0x46, 0xEE, 0xDF, 0x7E, @@ -2852,7 +2852,7 @@ const uint8_t web_data_css_bootstrap_min_css[24481] PROGMEM = { }; // Content of `/css/brands.min.css` const uint8_t web_data_css_brands_min_css[307] PROGMEM = { -0x1F, 0x8B, 0x08, 0x00, 0x7C, 0x9D, 0x8D, 0x67, 0x02, 0xFF, 0x8D, 0x51, 0x3D, 0x6F, 0x83, 0x30, +0x1F, 0x8B, 0x08, 0x00, 0xEC, 0x32, 0xB9, 0x67, 0x02, 0xFF, 0x8D, 0x51, 0x3D, 0x6F, 0x83, 0x30, 0x10, 0xDD, 0xF3, 0x2B, 0xAE, 0x64, 0x81, 0x08, 0x6C, 0xA8, 0xC2, 0xE2, 0x0C, 0x6D, 0x83, 0x84, 0x14, 0x89, 0xAA, 0x43, 0xBB, 0x74, 0x34, 0x70, 0x4E, 0x50, 0x0D, 0x46, 0xD8, 0x29, 0x45, 0x55, 0xFE, 0x7B, 0x81, 0x24, 0x4A, 0xB2, 0xA4, 0x6C, 0xBE, 0x77, 0xEF, 0xCB, 0x3A, 0xBA, 0x78, 0x98, @@ -2875,7 +2875,7 @@ const uint8_t web_data_css_brands_min_css[307] PROGMEM = { }; // Content of `/css/custom.min.css` const uint8_t web_data_css_custom_min_css[1262] PROGMEM = { -0x1F, 0x8B, 0x08, 0x00, 0x7C, 0x9D, 0x8D, 0x67, 0x02, 0xFF, 0xAD, 0x57, 0xED, 0x6E, 0xB3, 0x36, +0x1F, 0x8B, 0x08, 0x00, 0xEC, 0x32, 0xB9, 0x67, 0x02, 0xFF, 0xAD, 0x57, 0xED, 0x6E, 0xB3, 0x36, 0x14, 0xFE, 0xBF, 0xAB, 0xF0, 0x1A, 0x55, 0x6A, 0xB4, 0x82, 0x20, 0x1F, 0x4D, 0x0A, 0x5A, 0xB5, 0xFB, 0x98, 0xF6, 0xC3, 0x60, 0x13, 0xBC, 0x82, 0x6D, 0xD9, 0x4E, 0x93, 0xBE, 0x51, 0xEE, 0x7D, 0xC7, 0x36, 0x10, 0x4C, 0x49, 0xA7, 0xE9, 0x9D, 0xA2, 0x36, 0xD8, 0x3E, 0x9C, 0xCF, 0xE7, 0x3C, @@ -2957,7 +2957,7 @@ const uint8_t web_data_css_custom_min_css[1262] PROGMEM = { }; // Content of `/css/fontawesome.min.css` const uint8_t web_data_css_fontawesome_min_css[12410] PROGMEM = { -0x1F, 0x8B, 0x08, 0x00, 0x7C, 0x9D, 0x8D, 0x67, 0x02, 0xFF, 0xCD, 0x9D, 0x5B, 0xAF, 0xE3, 0xBC, +0x1F, 0x8B, 0x08, 0x00, 0xEC, 0x32, 0xB9, 0x67, 0x02, 0xFF, 0xCD, 0x9D, 0x5B, 0xAF, 0xE3, 0xBC, 0x95, 0xA6, 0xEF, 0xFB, 0x57, 0xEC, 0x49, 0xA3, 0x81, 0xA4, 0xF1, 0xA9, 0xA2, 0xB3, 0xE4, 0x2A, 0xCC, 0x20, 0xD3, 0x19, 0x04, 0x08, 0x90, 0xC6, 0x5C, 0x4C, 0x5F, 0x74, 0x80, 0xB9, 0xA1, 0x24, 0xCA, 0x66, 0x6D, 0x49, 0xD4, 0xA7, 0x83, 0xBD, 0x5D, 0x85, 0xFC, 0xF7, 0x21, 0x65, 0x2F, 0x8A, @@ -3736,7 +3736,7 @@ const uint8_t web_data_css_fontawesome_min_css[12410] PROGMEM = { }; // Content of `/css/solid.min.css` const uint8_t web_data_css_solid_min_css[309] PROGMEM = { -0x1F, 0x8B, 0x08, 0x00, 0x7C, 0x9D, 0x8D, 0x67, 0x02, 0xFF, 0x8D, 0x51, 0x3B, 0x6F, 0x83, 0x30, +0x1F, 0x8B, 0x08, 0x00, 0xEC, 0x32, 0xB9, 0x67, 0x02, 0xFF, 0x8D, 0x51, 0x3B, 0x6F, 0x83, 0x30, 0x10, 0xDE, 0xF3, 0x2B, 0xAE, 0x64, 0x81, 0x08, 0xEC, 0x50, 0x85, 0xA1, 0xCE, 0xD0, 0x47, 0xA4, 0x48, 0x91, 0xA8, 0x3A, 0x34, 0x4B, 0x47, 0x1E, 0xE7, 0xC4, 0xAA, 0xC1, 0x08, 0x3B, 0xA5, 0xA8, 0xCA, 0x7F, 0x2F, 0x8F, 0x54, 0x90, 0x25, 0x65, 0xB0, 0xE4, 0xBB, 0xEF, 0x75, 0xA7, 0xA3, 0x8B, @@ -3759,7 +3759,7 @@ const uint8_t web_data_css_solid_min_css[309] PROGMEM = { }; // Content of `/js/bootstrap.bundle.min.js` const uint8_t web_data_js_bootstrap_bundle_min_js[19041] PROGMEM = { -0x1F, 0x8B, 0x08, 0x00, 0x7C, 0x9D, 0x8D, 0x67, 0x02, 0xFF, 0xDD, 0x7D, 0x0D, 0x7B, 0xDB, 0xC6, +0x1F, 0x8B, 0x08, 0x00, 0xEC, 0x32, 0xB9, 0x67, 0x02, 0xFF, 0xDD, 0x7D, 0x0D, 0x7B, 0xDB, 0xC6, 0x91, 0xF0, 0x5F, 0xA1, 0xD0, 0x3B, 0x19, 0x08, 0x97, 0xB4, 0x94, 0x34, 0xD7, 0x96, 0x34, 0xCC, 0x57, 0x96, 0xE4, 0x44, 0x57, 0x5B, 0x72, 0x2D, 0xDA, 0x69, 0x2A, 0xF3, 0x14, 0x88, 0x5C, 0x92, 0xA8, 0x49, 0x80, 0x05, 0x40, 0xD9, 0xAA, 0xC8, 0xFB, 0xED, 0xEF, 0xCC, 0xEC, 0x07, 0x76, 0x81, @@ -4953,7 +4953,7 @@ const uint8_t web_data_js_bootstrap_bundle_min_js[19041] PROGMEM = { }; // Content of `/js/bootstrap.min.js` const uint8_t web_data_js_bootstrap_min_js[12893] PROGMEM = { -0x1F, 0x8B, 0x08, 0x00, 0x7C, 0x9D, 0x8D, 0x67, 0x02, 0xFF, 0xDD, 0x7D, 0x7B, 0x5F, 0xE3, 0x48, +0x1F, 0x8B, 0x08, 0x00, 0xEC, 0x32, 0xB9, 0x67, 0x02, 0xFF, 0xDD, 0x7D, 0x7B, 0x5F, 0xE3, 0x48, 0x92, 0xE0, 0x57, 0x31, 0x9A, 0xBD, 0x2A, 0xE9, 0x48, 0x54, 0xD0, 0x3D, 0xB3, 0x33, 0x63, 0x97, 0xCA, 0x47, 0x81, 0x7B, 0xDA, 0xD7, 0x14, 0xB0, 0x40, 0x75, 0x6F, 0x2F, 0xCD, 0xF2, 0x13, 0x76, 0x62, 0x67, 0x97, 0x2C, 0x69, 0x25, 0x99, 0x2A, 0x16, 0x7B, 0x3F, 0xFB, 0x45, 0xE4, 0x4B, 0x99, @@ -5762,7 +5762,7 @@ const uint8_t web_data_js_bootstrap_min_js[12893] PROGMEM = { }; // Content of `/js/chart.js` const uint8_t web_data_js_chart_js[69190] PROGMEM = { -0x1F, 0x8B, 0x08, 0x00, 0x7C, 0x9D, 0x8D, 0x67, 0x02, 0xFF, 0xD4, 0xBD, 0x0B, 0x77, 0xDB, 0xB6, +0x1F, 0x8B, 0x08, 0x00, 0xEC, 0x32, 0xB9, 0x67, 0x02, 0xFF, 0xD4, 0xBD, 0x0B, 0x77, 0xDB, 0xB6, 0xB2, 0x30, 0xFA, 0x57, 0x6C, 0x9D, 0xC6, 0x25, 0x2D, 0x48, 0x96, 0x94, 0x38, 0x0F, 0xCA, 0xB4, 0x56, 0x9E, 0x4D, 0xDA, 0x24, 0x4E, 0xE3, 0x34, 0x7D, 0x78, 0xEB, 0xF3, 0xA6, 0x44, 0x48, 0x42, 0x43, 0x93, 0x2A, 0x41, 0xC5, 0x56, 0x65, 0xFD, 0xF7, 0x3B, 0x33, 0x78, 0x52, 0x92, 0xD3, 0x7D, @@ -10090,7 +10090,7 @@ const uint8_t web_data_js_chart_js[69190] PROGMEM = { }; // Content of `/js/chart.min.js` const uint8_t web_data_js_chart_min_js[57330] PROGMEM = { -0x1F, 0x8B, 0x08, 0x00, 0x7C, 0x9D, 0x8D, 0x67, 0x02, 0xFF, 0xEC, 0xBD, 0x8B, 0x76, 0xDB, 0xC8, +0x1F, 0x8B, 0x08, 0x00, 0xEC, 0x32, 0xB9, 0x67, 0x02, 0xFF, 0xEC, 0xBD, 0x8B, 0x76, 0xDB, 0xC8, 0x95, 0x28, 0xFA, 0x2B, 0x12, 0x57, 0x1F, 0x85, 0x30, 0x8B, 0x34, 0xE5, 0xDC, 0x64, 0x66, 0x40, 0xA1, 0x79, 0xFD, 0xEA, 0xC4, 0x27, 0x76, 0xDB, 0xC7, 0x76, 0x4F, 0x92, 0xC3, 0xA5, 0xA5, 0x03, 0x11, 0x25, 0xB2, 0x62, 0x08, 0xE0, 0x00, 0xA0, 0x2C, 0x85, 0xC2, 0xBF, 0x9F, 0xFD, 0xA8, 0x27, @@ -13677,7 +13677,7 @@ const uint8_t web_data_js_chart_min_js[57330] PROGMEM = { }; // Content of `/js/jquery-3.6.0.min.js` const uint8_t web_data_js_jquery_3_6_0_min_js[30812] PROGMEM = { -0x1F, 0x8B, 0x08, 0x00, 0x7C, 0x9D, 0x8D, 0x67, 0x02, 0xFF, 0xBC, 0xBD, 0x09, 0x7B, 0xDB, 0x46, +0x1F, 0x8B, 0x08, 0x00, 0xEC, 0x32, 0xB9, 0x67, 0x02, 0xFF, 0xBC, 0xBD, 0x09, 0x7B, 0xDB, 0x46, 0xB2, 0x2E, 0xFC, 0x57, 0x44, 0x4C, 0x8E, 0x06, 0x30, 0x9B, 0x14, 0xE9, 0x4C, 0x72, 0xEF, 0x80, 0x42, 0xF8, 0x38, 0xB2, 0x93, 0xF8, 0x4C, 0x9C, 0xC5, 0x72, 0x26, 0xC9, 0x50, 0x4C, 0x1E, 0x88, 0x6C, 0x4A, 0x88, 0x21, 0x80, 0x01, 0x40, 0xC9, 0x8A, 0xC8, 0xF9, 0xED, 0x5F, 0xBD, 0xD5, 0x0B, @@ -15605,97 +15605,99 @@ const uint8_t web_data_js_jquery_3_6_0_min_js[30812] PROGMEM = { 0x93, 0xD3, 0xFF, 0x05, 0x52, 0x30, 0xE2, 0x20, 0x43, 0x5D, 0x01, 0x00 }; // Content of `/js/winfidel_calibration.js` -const uint8_t web_data_js_winfidel_calibration_js[815] PROGMEM = { -0x1F, 0x8B, 0x08, 0x00, 0x7C, 0x9D, 0x8D, 0x67, 0x02, 0xFF, 0xD5, 0x56, 0x51, 0x6F, 0xDA, 0x30, -0x10, 0x7E, 0xAF, 0xD4, 0xFF, 0x90, 0xA6, 0xD5, 0xEC, 0x08, 0x12, 0xE8, 0xA4, 0xBD, 0x2C, 0x84, -0xBE, 0x6C, 0x93, 0xBA, 0x87, 0x6E, 0xDA, 0x1E, 0x11, 0x42, 0x26, 0x36, 0xE0, 0xD5, 0x89, 0x23, -0xFB, 0x42, 0x3B, 0xB5, 0xFC, 0xF7, 0x9D, 0x13, 0x42, 0x03, 0x84, 0x76, 0xD2, 0x9E, 0x26, 0xA1, -0x28, 0xD8, 0x77, 0xDF, 0x7D, 0x77, 0xF7, 0xF9, 0x9C, 0x35, 0x33, 0x5E, 0x59, 0x70, 0x06, 0xE2, -0x36, 0x07, 0x61, 0xD6, 0x4C, 0xDD, 0x7E, 0x8A, 0xAF, 0x28, 0xD7, 0x69, 0x99, 0x89, 0x1C, 0x82, -0xC8, 0x08, 0xC6, 0x7F, 0xD3, 0x45, 0x99, 0xA7, 0x20, 0x75, 0x4E, 0x83, 0x27, 0x23, 0x16, 0x46, -0xD8, 0xD5, 0xCC, 0x6D, 0xC8, 0x7C, 0x49, 0x83, 0x78, 0x29, 0x60, 0x96, 0x32, 0x25, 0xE7, 0x86, -0xD5, 0x36, 0xB1, 0x05, 0x66, 0x60, 0x56, 0x08, 0x23, 0x35, 0x97, 0xE9, 0xAC, 0x0E, 0x80, 0xEB, -0x57, 0x94, 0x4C, 0xF0, 0x95, 0x85, 0xA0, 0x97, 0x4B, 0x25, 0x12, 0x1F, 0xB4, 0x56, 0x20, 0x0B, -0x7F, 0x4A, 0x82, 0x68, 0xFB, 0x4E, 0x83, 0xF3, 0xB3, 0x2B, 0xEA, 0x5F, 0xCE, 0x21, 0x0F, 0x1B, -0x54, 0xE1, 0x07, 0x11, 0x02, 0xFB, 0xA9, 0x92, 0xE9, 0xBD, 0xDF, 0x6F, 0xB1, 0x49, 0x75, 0x6E, -0xC1, 0x43, 0xBB, 0x19, 0xE3, 0x69, 0x82, 0xF8, 0x97, 0x32, 0x2F, 0x4A, 0x08, 0xF1, 0x5F, 0xA8, -0x98, 0x05, 0xC4, 0xC5, 0x9C, 0x30, 0xF4, 0x8B, 0x61, 0x96, 0xB5, 0xEC, 0x70, 0x21, 0xE4, 0x92, -0x65, 0x02, 0x93, 0xDF, 0xD9, 0xCA, 0x05, 0xBD, 0x90, 0xF6, 0x8E, 0xDD, 0xD1, 0x82, 0x19, 0x2B, -0xBE, 0x28, 0xCD, 0x80, 0xD6, 0xAE, 0x41, 0x80, 0xF4, 0x9E, 0x9C, 0xFF, 0x1E, 0x3F, 0x47, 0x5F, -0x3C, 0x02, 0x25, 0xDF, 0x95, 0x60, 0x56, 0x78, 0x0F, 0x4C, 0x42, 0x14, 0x45, 0x04, 0xE3, 0x62, -0x9D, 0x40, 0xB4, 0xEB, 0x33, 0x2B, 0xB4, 0xCC, 0x6B, 0x3C, 0x64, 0xD9, 0xDF, 0xE2, 0xC6, 0x9B, -0xF3, 0x33, 0xA1, 0xAC, 0xA8, 0xD0, 0x7D, 0x64, 0x87, 0x54, 0x24, 0x0F, 0xF1, 0x59, 0xBA, 0xEC, -0xED, 0x4A, 0x3F, 0x20, 0xB3, 0xCD, 0xC6, 0x15, 0xD1, 0xBF, 0xAC, 0xD3, 0x9B, 0x0B, 0xB5, 0x2D, -0x0C, 0x9F, 0xAB, 0xE3, 0xDA, 0x28, 0x01, 0x5E, 0xC6, 0xF2, 0x92, 0xA9, 0xA4, 0x86, 0x6C, 0x17, -0x06, 0x1D, 0x0B, 0xA3, 0x0B, 0x4A, 0xB8, 0xB4, 0x6C, 0xAE, 0x04, 0x27, 0x55, 0xDE, 0x5B, 0xFB, -0x04, 0x4C, 0x29, 0x5C, 0xA6, 0x4C, 0x09, 0x03, 0xD4, 0xFF, 0x9C, 0xA3, 0x0D, 0x76, 0x7B, 0x8B, -0xE7, 0xB5, 0xD2, 0xB9, 0xF0, 0x6B, 0x4A, 0x6F, 0xC1, 0xF7, 0x17, 0x0C, 0xD3, 0x3B, 0x61, 0xDB, -0xF4, 0xBE, 0x31, 0x27, 0x4E, 0x43, 0xBA, 0xE8, 0x96, 0x50, 0x77, 0x8B, 0x09, 0x39, 0xB1, 0xB9, -0x40, 0x2D, 0x5B, 0x7A, 0x5C, 0xE0, 0x37, 0xE8, 0x56, 0x15, 0x78, 0x83, 0xAD, 0xC8, 0x77, 0x64, -0xBB, 0x05, 0xEF, 0xFA, 0x85, 0xBF, 0xA6, 0x29, 0xDE, 0xD1, 0x51, 0x71, 0x6C, 0x22, 0x5C, 0xFD, -0xFA, 0xF3, 0xDB, 0x1D, 0x25, 0x03, 0x56, 0xC8, 0x41, 0x6B, 0x7F, 0xE0, 0x0E, 0x19, 0x79, 0xE9, -0xA9, 0x3B, 0x3B, 0x8D, 0xE6, 0x41, 0x03, 0x2A, 0xA7, 0xD2, 0x92, 0x4D, 0xDC, 0xC6, 0x84, 0xB8, -0x27, 0x99, 0x46, 0x4A, 0xE4, 0x4B, 0x58, 0x55, 0xC5, 0x68, 0x61, 0x85, 0xB5, 0x69, 0x98, 0xEA, -0x32, 0x87, 0x46, 0xAF, 0x6D, 0x90, 0x3A, 0xD9, 0x63, 0x0F, 0x6F, 0xEC, 0xC1, 0x5C, 0xF3, 0xDF, -0x98, 0xF8, 0x0A, 0x32, 0x45, 0x7D, 0x6C, 0xF8, 0x42, 0x1B, 0xEA, 0xE4, 0x25, 0x93, 0x61, 0x2C, -0x47, 0x6D, 0x94, 0x58, 0xF6, 0x7A, 0xC1, 0x13, 0x2A, 0x49, 0x26, 0xC9, 0xF0, 0xF9, 0x19, 0x9F, -0xED, 0xDD, 0xF0, 0x7A, 0x7B, 0x7C, 0xC0, 0x15, 0xAE, 0x23, 0x18, 0x12, 0x63, 0x45, 0x21, 0x72, -0x4E, 0xC9, 0x08, 0x8C, 0x97, 0x62, 0xC5, 0x6D, 0xE2, 0xF3, 0x70, 0xA1, 0xC4, 0xA3, 0x3F, 0x1E, -0x01, 0x6F, 0x96, 0x52, 0xAD, 0xC2, 0x0F, 0xFE, 0x98, 0xF4, 0xDA, 0xA9, 0x4F, 0xE4, 0x74, 0x32, -0x9C, 0xF6, 0xC8, 0x68, 0x00, 0xFC, 0xAF, 0x8C, 0xAF, 0xD1, 0xD8, 0xCB, 0xB2, 0x2E, 0xFB, 0xF7, -0x18, 0xAE, 0x5A, 0x1E, 0x80, 0x19, 0x93, 0x7D, 0xF9, 0xFC, 0x27, 0xF4, 0x99, 0xB7, 0xC2, 0x69, -0x9D, 0xF8, 0xBF, 0xD8, 0x9A, 0xD9, 0xD4, 0xC8, 0x02, 0x3E, 0x1A, 0x91, 0xE9, 0x75, 0xD7, 0x38, -0xEA, 0x06, 0x0F, 0x62, 0x7F, 0xFC, 0xA3, 0x72, 0x19, 0x0D, 0xD8, 0x41, 0x3D, 0x2A, 0x6D, 0x9F, -0x9F, 0xED, 0xB4, 0x7D, 0x72, 0xD2, 0xB9, 0x29, 0x87, 0x13, 0xAE, 0x91, 0x7A, 0x87, 0xCC, 0x6B, -0xD7, 0x1B, 0x37, 0xC2, 0x49, 0x0F, 0x9F, 0x3D, 0xF2, 0x0E, 0xA7, 0x34, 0xE9, 0x65, 0xD9, 0xA1, -0xF6, 0x51, 0x58, 0x35, 0x4F, 0x3C, 0x71, 0x50, 0x5A, 0x32, 0x4D, 0x12, 0xA2, 0xEF, 0x89, 0x03, -0x57, 0x3A, 0xAD, 0xD0, 0xF0, 0xCA, 0xC2, 0x81, 0xCD, 0x9B, 0xD3, 0xD7, 0x62, 0x78, 0x32, 0xF9, -0xE6, 0x06, 0x78, 0x8D, 0x63, 0xED, 0x7C, 0x53, 0xF1, 0x6A, 0xEC, 0xBB, 0x4E, 0xA6, 0x56, 0x22, -0x52, 0x7A, 0x59, 0xAF, 0xC4, 0xFF, 0xC8, 0xF7, 0xE0, 0xAA, 0xED, 0x98, 0x16, 0x0D, 0x95, 0xEE, -0x51, 0x71, 0x72, 0x5A, 0xEE, 0x35, 0x9B, 0xE0, 0x26, 0x99, 0x56, 0x93, 0x6A, 0x3F, 0xBC, 0xC5, -0x71, 0xE5, 0x88, 0x5B, 0x7A, 0x58, 0x99, 0x56, 0x58, 0x34, 0x22, 0xFB, 0x8E, 0x27, 0xA6, 0x21, -0x42, 0x1C, 0x7E, 0x6A, 0x24, 0x0F, 0x32, 0xE7, 0xFA, 0x21, 0x42, 0x8C, 0x66, 0xF1, 0xF5, 0x6F, -0x8D, 0x4D, 0xFF, 0x7A, 0x38, 0x1C, 0x1E, 0x86, 0xEB, 0xBA, 0x29, 0x30, 0x5A, 0x8A, 0x97, 0xB1, -0xD9, 0xE1, 0x1E, 0xC6, 0x46, 0x90, 0x3F, 0x06, 0x76, 0xE4, 0x42, 0xFE, 0x08, 0x00, 0x00 +const uint8_t web_data_js_winfidel_calibration_js[818] PROGMEM = { +0x1F, 0x8B, 0x08, 0x00, 0xEC, 0x32, 0xB9, 0x67, 0x02, 0xFF, 0xD5, 0x56, 0x51, 0x6F, 0xDA, 0x30, +0x10, 0x7E, 0xAF, 0xD4, 0xFF, 0x90, 0xA6, 0xD5, 0xEC, 0x08, 0x12, 0xE8, 0xA4, 0xBD, 0x0C, 0x42, +0x5F, 0xB6, 0x49, 0xDD, 0x43, 0x37, 0x6D, 0x8F, 0x08, 0x21, 0x13, 0x1B, 0xF0, 0xEA, 0xC4, 0x91, +0x7D, 0x81, 0x56, 0x2D, 0xFF, 0x7D, 0xE7, 0x84, 0xD0, 0x00, 0x61, 0x4C, 0xDA, 0xD3, 0x24, 0x14, +0x05, 0xFB, 0xEE, 0xBB, 0xEF, 0xEE, 0x3E, 0x9F, 0xB3, 0x62, 0xC6, 0x2B, 0x72, 0xCE, 0x40, 0xDC, +0x67, 0x20, 0xCC, 0x8A, 0xA9, 0xFB, 0x4F, 0x83, 0x1B, 0xCA, 0x75, 0x52, 0xA4, 0x22, 0x83, 0x20, +0x32, 0x82, 0xF1, 0x67, 0x3A, 0x2F, 0xB2, 0x04, 0xA4, 0xCE, 0x68, 0xF0, 0x62, 0xC4, 0xDC, 0x08, +0xBB, 0x9C, 0xBA, 0x0D, 0x99, 0x2D, 0x68, 0x30, 0x58, 0x08, 0x98, 0x26, 0x4C, 0xC9, 0x99, 0x61, +0x95, 0xCD, 0xC0, 0x02, 0x33, 0x30, 0xCD, 0x85, 0x91, 0x9A, 0xCB, 0x64, 0x5A, 0x05, 0xC0, 0xF5, +0x1B, 0x4A, 0xC6, 0xF8, 0xCA, 0x42, 0xD0, 0x8B, 0x85, 0x12, 0xB1, 0x0F, 0x5A, 0x2B, 0x90, 0xB9, +0x3F, 0x21, 0x41, 0xB4, 0x7D, 0xA7, 0xC1, 0xE5, 0xC5, 0x0D, 0xF5, 0xAF, 0x67, 0x90, 0x85, 0x35, +0xAA, 0xF0, 0x83, 0x08, 0x81, 0xFD, 0x44, 0xC9, 0xE4, 0xD1, 0xEF, 0x36, 0xD8, 0x24, 0x3A, 0xB3, +0xE0, 0xA1, 0xDD, 0x94, 0xF1, 0x24, 0x46, 0xFC, 0x6B, 0x99, 0xE5, 0x05, 0x84, 0xF8, 0x2F, 0x54, +0xCC, 0x02, 0xE2, 0x62, 0x4E, 0x18, 0xFA, 0xCD, 0x30, 0x4D, 0x1B, 0x76, 0xB8, 0x10, 0x72, 0xC9, +0x52, 0x81, 0xC9, 0xEF, 0x6C, 0xE5, 0x9C, 0x5E, 0x49, 0xFB, 0xC0, 0x1E, 0x68, 0xCE, 0x8C, 0x15, +0x5F, 0x94, 0x66, 0x40, 0x2B, 0xD7, 0x20, 0x40, 0x7A, 0x2F, 0xCE, 0x7F, 0x8F, 0x9F, 0xA3, 0x2F, +0x9E, 0x80, 0x92, 0xEF, 0x4A, 0x30, 0x2B, 0xBC, 0x35, 0x93, 0x10, 0x45, 0x11, 0xC1, 0xB8, 0x58, +0x27, 0x10, 0xCD, 0xFA, 0x4C, 0x73, 0x2D, 0xB3, 0x0A, 0x0F, 0x59, 0x76, 0xB7, 0xB8, 0x83, 0xCD, +0xE5, 0x85, 0x50, 0x56, 0x94, 0xE8, 0x3E, 0xB2, 0x43, 0x2A, 0x92, 0x87, 0xF8, 0x2C, 0x5C, 0xF6, +0x76, 0xA9, 0xD7, 0xC8, 0x6C, 0xB3, 0x71, 0x45, 0xF4, 0xAF, 0xAB, 0xF4, 0x66, 0x42, 0x6D, 0x0B, +0xC3, 0x67, 0xEA, 0xB8, 0x36, 0x4A, 0x80, 0x97, 0xB2, 0xAC, 0x60, 0x2A, 0xAE, 0x20, 0x9B, 0x85, +0x41, 0xC7, 0xDC, 0xE8, 0x9C, 0x12, 0x2E, 0x2D, 0x9B, 0x29, 0xC1, 0x49, 0x99, 0xF7, 0xD6, 0x3E, +0x06, 0x53, 0x08, 0x97, 0x29, 0x53, 0xC2, 0x00, 0xF5, 0x3F, 0x67, 0x68, 0x83, 0xDD, 0xDE, 0xE2, +0x79, 0x8D, 0x74, 0xAE, 0xFC, 0x8A, 0xD2, 0x39, 0xF8, 0xEE, 0x9C, 0x61, 0x7A, 0x27, 0x6C, 0xEB, +0xDE, 0xD7, 0xE6, 0xC4, 0x69, 0x48, 0xE7, 0xED, 0x12, 0x6A, 0x6F, 0x31, 0x21, 0x27, 0x36, 0xE7, +0xA8, 0x65, 0x4B, 0x8F, 0x0B, 0x7C, 0x86, 0x6E, 0x59, 0x81, 0x33, 0x6C, 0x45, 0xB6, 0x23, 0xDB, +0x2E, 0x78, 0xD7, 0x2F, 0xFC, 0xD5, 0x4D, 0xF1, 0x8E, 0x8E, 0x8A, 0x63, 0x13, 0xE1, 0xEA, 0xD7, +0x9F, 0xDF, 0x1E, 0x28, 0xE9, 0xB1, 0x5C, 0xF6, 0x56, 0xFD, 0x5E, 0xC3, 0xA4, 0xE7, 0xCE, 0x19, +0x79, 0x6B, 0xAB, 0x3B, 0x3E, 0xB5, 0xEC, 0x41, 0x03, 0x8A, 0xA7, 0x94, 0x93, 0x8D, 0xDD, 0xC6, +0x98, 0xB8, 0x27, 0x99, 0x44, 0x4A, 0x64, 0x0B, 0x58, 0x96, 0xF5, 0x68, 0x60, 0x85, 0x95, 0x69, +0x98, 0xE8, 0x22, 0x83, 0x5A, 0xB2, 0x4D, 0x90, 0x2A, 0xDF, 0x63, 0x0F, 0x6F, 0xE4, 0xC1, 0x4C, +0xF3, 0x67, 0xCC, 0x7D, 0x09, 0xA9, 0xA2, 0x3E, 0xF6, 0x7C, 0xAE, 0x0D, 0x75, 0x0A, 0x93, 0x71, +0x7F, 0x20, 0x87, 0x4D, 0x94, 0x81, 0xEC, 0x74, 0x82, 0x17, 0x14, 0x93, 0x8C, 0xE3, 0xFE, 0xEB, +0x2B, 0x3E, 0x9B, 0xBB, 0xE1, 0xED, 0xF6, 0x04, 0x81, 0xAB, 0x5D, 0x4B, 0x30, 0x24, 0xC6, 0xF2, +0x5C, 0x64, 0x9C, 0x92, 0x21, 0x18, 0x2F, 0xC1, 0xA2, 0xDB, 0xD8, 0xE7, 0xE1, 0x5C, 0x89, 0x27, +0x7F, 0x34, 0x04, 0x5E, 0x2F, 0x25, 0x5A, 0x85, 0x1F, 0xFC, 0x11, 0xE9, 0x34, 0x53, 0x1F, 0xCB, +0xC9, 0xB8, 0x3F, 0xE9, 0x90, 0x61, 0x0F, 0xF8, 0x5F, 0x19, 0xDF, 0xA2, 0xB1, 0x97, 0xA6, 0x6D, +0xF6, 0xEF, 0x31, 0x5C, 0xB9, 0xDC, 0x03, 0x33, 0x22, 0xFB, 0x0A, 0xFA, 0x4F, 0xE8, 0x33, 0x6F, +0x89, 0x03, 0x3B, 0xF6, 0x7F, 0xB1, 0x15, 0xB3, 0x89, 0x91, 0x39, 0x7C, 0x34, 0x22, 0xD5, 0xAB, +0xB6, 0x89, 0xD4, 0x0E, 0x1E, 0x0C, 0xFC, 0xD1, 0x8F, 0xD2, 0x65, 0xD8, 0x63, 0x07, 0xF5, 0x28, +0xE5, 0x7D, 0x79, 0xB1, 0x93, 0xF7, 0xC9, 0x61, 0xE7, 0x06, 0x1D, 0x0E, 0xB9, 0x5A, 0xED, 0xED, +0x4A, 0xAF, 0xBC, 0xEF, 0xDC, 0x20, 0x27, 0x1D, 0x7C, 0x76, 0xC8, 0x3B, 0x9C, 0xD5, 0xA4, 0x93, +0xA6, 0x87, 0xF2, 0x47, 0x6D, 0x55, 0x54, 0xF1, 0xDC, 0x41, 0x61, 0xC9, 0x24, 0x8E, 0x89, 0x7E, +0x24, 0x0E, 0x5F, 0xE9, 0xA4, 0x44, 0xC3, 0x8B, 0x0B, 0xC7, 0x36, 0xAF, 0xCF, 0x60, 0x83, 0xE4, +0xC9, 0xFC, 0xEB, 0x7B, 0xE0, 0x0C, 0xCD, 0xCA, 0xFF, 0xAE, 0xA4, 0x56, 0xBB, 0xB4, 0x9D, 0x4F, +0xAD, 0x44, 0xA4, 0xF4, 0xA2, 0x5A, 0x19, 0xFC, 0x23, 0xE5, 0x83, 0x3B, 0xB7, 0x7D, 0x6C, 0xD4, +0x6C, 0xDA, 0x67, 0xC6, 0xC9, 0xC9, 0xB9, 0xD7, 0x75, 0x82, 0x9B, 0x64, 0x52, 0x4E, 0xAD, 0x7D, +0x06, 0x16, 0x47, 0x97, 0xE3, 0x6E, 0x69, 0x4B, 0x7D, 0x1A, 0x91, 0xD1, 0x8E, 0xEC, 0xFB, 0x9E, +0x18, 0x8E, 0x88, 0x72, 0xF8, 0xE5, 0x11, 0xAF, 0x65, 0xC6, 0xF5, 0x3A, 0x42, 0x8C, 0x7A, 0xF1, +0xCF, 0x9F, 0x1E, 0x9B, 0xEE, 0x6D, 0xBF, 0xDF, 0x3F, 0x0C, 0xD7, 0x76, 0x71, 0x60, 0xB4, 0x04, +0xEF, 0x66, 0xB3, 0xC3, 0x3D, 0x8C, 0x8D, 0x20, 0xBF, 0x01, 0x70, 0x57, 0xF3, 0xE6, 0x0D, 0x09, +0x00, 0x00 }; // Content of `/js/winfidel_index.js` -const uint8_t web_data_js_winfidel_index_js[576] PROGMEM = { -0x1F, 0x8B, 0x08, 0x00, 0x7C, 0x9D, 0x8D, 0x67, 0x02, 0xFF, 0x7D, 0x94, 0x5B, 0x8B, 0xDA, 0x40, -0x14, 0xC7, 0xDF, 0x17, 0xF6, 0x3B, 0xC8, 0x56, 0x98, 0x04, 0xD3, 0x18, 0xB7, 0xF8, 0x32, 0xA9, -0x2D, 0x6D, 0x77, 0xA1, 0x16, 0x7A, 0x01, 0xDF, 0x2A, 0x22, 0xD3, 0xCC, 0x31, 0x0E, 0x4D, 0x26, -0x61, 0x2E, 0x1A, 0x37, 0xE4, 0xBB, 0xF7, 0x4C, 0xD4, 0x5D, 0x37, 0x6A, 0x05, 0x93, 0x61, 0xCE, -0xEF, 0xDC, 0xFE, 0x67, 0x26, 0x19, 0x98, 0x5E, 0x0E, 0x4C, 0x5B, 0x05, 0x39, 0x48, 0xA3, 0x97, -0xC9, 0x9A, 0x29, 0x13, 0xF7, 0xBD, 0x95, 0x95, 0x89, 0x11, 0x85, 0xF4, 0xFC, 0x7A, 0xC3, 0x54, -0x4F, 0x48, 0x03, 0x6A, 0xC3, 0xB2, 0x29, 0x9F, 0x6C, 0x85, 0xE4, 0xC5, 0x36, 0xD4, 0x60, 0xA6, -0x87, 0xCD, 0x53, 0x58, 0xC1, 0x4A, 0x81, 0x5E, 0x2F, 0x15, 0x30, 0x2E, 0x64, 0xEA, 0xF9, 0x71, -0x13, 0x8C, 0xA2, 0x28, 0xF2, 0xE3, 0xA4, 0x90, 0xDA, 0xF4, 0x12, 0x53, 0x4D, 0x78, 0x91, 0x58, -0x97, 0x2D, 0x4C, 0xC1, 0x3C, 0x66, 0x6D, 0xE2, 0xCF, 0xBB, 0x29, 0xF7, 0x48, 0xBE, 0xFB, 0xE2, -0xD2, 0x13, 0x3F, 0x3E, 0xAF, 0x69, 0x22, 0x61, 0xDB, 0x6B, 0xCD, 0x1E, 0xC6, 0x08, 0x6A, 0xB3, -0x2B, 0x81, 0x92, 0x4C, 0x48, 0x20, 0x01, 0x67, 0x86, 0xD1, 0xDA, 0x3D, 0xB1, 0x2A, 0x4D, 0xE7, -0xED, 0x92, 0xCE, 0x17, 0xCD, 0xA2, 0x09, 0x8A, 0xD2, 0x55, 0xA6, 0x69, 0xAD, 0x13, 0x96, 0x01, -0xBE, 0x77, 0xB4, 0xFE, 0x03, 0xA9, 0x90, 0x9F, 0xCC, 0x6F, 0x50, 0x05, 0x5D, 0xB1, 0x4C, 0x43, -0xA0, 0x6D, 0x9A, 0x82, 0x36, 0xC0, 0xBF, 0x0B, 0x49, 0x47, 0xE1, 0xBB, 0xF1, 0xC9, 0x0E, 0xAB, -0xE8, 0x7D, 0x78, 0x3F, 0x0E, 0x8C, 0x48, 0xFE, 0xBA, 0x38, 0x06, 0xCA, 0x99, 0x78, 0x02, 0x1A, -0x85, 0xD1, 0xB8, 0x69, 0x82, 0xEA, 0x52, 0x3C, 0x05, 0x1B, 0x50, 0x1A, 0xA8, 0x51, 0x16, 0x90, -0x29, 0x33, 0x8B, 0x04, 0x3A, 0x67, 0x90, 0x82, 0xE4, 0x58, 0xAB, 0xD0, 0x65, 0xC6, 0x76, 0x07, -0xBA, 0xC1, 0x1F, 0x0A, 0xE5, 0xC7, 0x47, 0x21, 0x7B, 0x6D, 0xCB, 0x4B, 0xC6, 0xF9, 0xB2, 0x2C, -0x50, 0x7B, 0x0F, 0x9B, 0x7F, 0xC0, 0x9E, 0xFC, 0xFA, 0x5C, 0x98, 0xD0, 0x35, 0x1B, 0x1E, 0x9B, -0x0F, 0x57, 0x85, 0x7A, 0x64, 0xC9, 0xDA, 0xF3, 0x0E, 0x3B, 0xFE, 0xE4, 0xC3, 0x51, 0x99, 0x3D, -0x69, 0xA5, 0x5E, 0x8B, 0xD5, 0x4B, 0x48, 0x97, 0xF7, 0x42, 0x54, 0x5B, 0x22, 0x0D, 0x1E, 0x91, -0x05, 0x2A, 0x8C, 0xD0, 0xED, 0xCD, 0x73, 0x71, 0x67, 0x33, 0xBE, 0xBD, 0xA9, 0xFB, 0x6E, 0x98, -0xDF, 0x66, 0x3F, 0x7F, 0x78, 0x64, 0xC8, 0x4A, 0x31, 0xE4, 0x82, 0xE5, 0x80, 0xC7, 0x63, 0xE8, -0x20, 0x12, 0x3C, 0x9F, 0x10, 0xDE, 0x76, 0xD1, 0xF7, 0xC8, 0x9B, 0x83, 0xF7, 0xDB, 0x8C, 0x69, -0x9C, 0x78, 0x68, 0xA0, 0x32, 0xAD, 0x75, 0x4E, 0xDC, 0x93, 0x2C, 0xF0, 0x7D, 0x88, 0x41, 0x16, -0x7E, 0x7C, 0xEA, 0x91, 0x0B, 0x79, 0xD9, 0xC1, 0x19, 0x3A, 0x2C, 0xDB, 0xA4, 0x97, 0x59, 0x67, -0xE8, 0xC6, 0x65, 0xD5, 0x95, 0xB8, 0x68, 0xE8, 0xB0, 0x49, 0x61, 0xE5, 0x95, 0xB2, 0xF7, 0x26, -0xE4, 0xBB, 0x43, 0xAC, 0x2B, 0x8A, 0x22, 0x2D, 0x8D, 0xC8, 0xF1, 0x60, 0xB1, 0xBC, 0xF4, 0xFC, -0x60, 0x47, 0xAF, 0xB5, 0xBC, 0x3F, 0x10, 0xAF, 0x65, 0xC7, 0x19, 0x2E, 0xD1, 0xD3, 0xE8, 0x17, -0xC9, 0xCF, 0xE5, 0x46, 0xA8, 0x33, 0xAF, 0x4E, 0x52, 0x74, 0xCD, 0xF0, 0xDA, 0xBB, 0xF1, 0xB6, -0x97, 0xEA, 0xC1, 0xCD, 0xD9, 0x8F, 0x15, 0x18, 0xAB, 0x64, 0xCF, 0x6C, 0x8B, 0x07, 0x91, 0x0A, -0xF3, 0x8B, 0x71, 0xD7, 0x17, 0xB8, 0x24, 0x5F, 0x0B, 0xAB, 0x30, 0xA7, 0x3F, 0x20, 0x94, 0x0C, -0x2E, 0x01, 0x78, 0x6B, 0xAC, 0x81, 0xFF, 0x22, 0x33, 0xC0, 0x0F, 0x00, 0x77, 0xC8, 0xAB, 0xDA, -0x4E, 0x51, 0x69, 0x73, 0xF7, 0x01, 0x69, 0xCB, 0xC0, 0xF5, 0xFB, 0x51, 0xF4, 0xF1, 0x2E, 0xBA, -0x1B, 0xE0, 0x92, 0xE2, 0x3F, 0x6E, 0xFE, 0x01, 0x83, 0xF4, 0xDD, 0x8E, 0xAD, 0x04, 0x00, 0x00 +const uint8_t web_data_js_winfidel_index_js[579] PROGMEM = { +0x1F, 0x8B, 0x08, 0x00, 0xEC, 0x32, 0xB9, 0x67, 0x02, 0xFF, 0x7D, 0x54, 0xDB, 0x8A, 0xDB, 0x30, +0x10, 0x7D, 0x5F, 0xD8, 0x7F, 0x08, 0xDB, 0x80, 0x6C, 0xE2, 0x3A, 0xCE, 0x96, 0xBC, 0xC8, 0x4D, +0x4B, 0xDB, 0x2C, 0x34, 0x85, 0x5E, 0x20, 0x6F, 0x0D, 0x21, 0xA8, 0xD6, 0xC4, 0x11, 0xB5, 0x65, +0xA3, 0x4B, 0x2E, 0x6B, 0xFC, 0xEF, 0x1D, 0x39, 0xC9, 0x6E, 0xD6, 0xEB, 0xD4, 0x60, 0x49, 0x68, +0xCE, 0x9C, 0x99, 0x39, 0x23, 0x29, 0x03, 0xD3, 0xCB, 0x81, 0x69, 0xAB, 0x20, 0x07, 0x69, 0xF4, +0x2A, 0xD9, 0x30, 0x65, 0xE2, 0xBE, 0xB7, 0xB6, 0x32, 0x31, 0xA2, 0x90, 0x9E, 0x5F, 0x6D, 0x99, +0xEA, 0x09, 0x69, 0x40, 0x6D, 0x59, 0x36, 0xE3, 0x93, 0x9D, 0x90, 0xBC, 0xD8, 0x85, 0x1A, 0xCC, +0xEC, 0xB4, 0x79, 0x09, 0x56, 0xB0, 0x56, 0xA0, 0x37, 0x2B, 0x05, 0x8C, 0x0B, 0x99, 0x7A, 0x7E, +0x5C, 0x07, 0xA3, 0x28, 0x8A, 0xFC, 0x38, 0x29, 0xA4, 0x36, 0xBD, 0xC4, 0xEC, 0x27, 0xBC, 0x48, +0xAC, 0x8B, 0x16, 0xA6, 0x60, 0x1E, 0xB2, 0x26, 0xF0, 0xE7, 0xC3, 0x8C, 0x7B, 0x24, 0x3F, 0x7C, +0x71, 0xE1, 0x89, 0x1F, 0xBF, 0xCE, 0x69, 0x22, 0x61, 0xD7, 0x6B, 0xCC, 0x1E, 0x72, 0x04, 0x95, +0x39, 0x94, 0x40, 0x49, 0x26, 0x24, 0x90, 0x80, 0x33, 0xC3, 0x68, 0xE5, 0x46, 0xCC, 0x4A, 0xD3, +0x45, 0xB3, 0xA4, 0x8B, 0x65, 0xBD, 0xAC, 0x83, 0xA2, 0x74, 0x99, 0x69, 0x5A, 0xE9, 0x84, 0x65, +0x80, 0xF3, 0x81, 0x56, 0x7F, 0x20, 0x15, 0xF2, 0x93, 0xF9, 0x0D, 0xAA, 0xA0, 0x6B, 0x96, 0x69, +0x08, 0xB4, 0x4D, 0x53, 0xD0, 0x06, 0xF8, 0x77, 0x21, 0xE9, 0x28, 0x7C, 0x37, 0xBE, 0xD8, 0x61, +0x7B, 0x7A, 0x1F, 0xDE, 0x8F, 0x03, 0x23, 0x92, 0xBF, 0x8E, 0xC7, 0x40, 0x39, 0x17, 0x8F, 0x40, +0xA3, 0x30, 0x1A, 0xD7, 0x75, 0xB0, 0xEF, 0xE2, 0x53, 0xB0, 0x05, 0xA5, 0x81, 0x1A, 0x65, 0x01, +0x31, 0x65, 0x66, 0x11, 0x81, 0xCE, 0x19, 0xA4, 0x20, 0x39, 0xE6, 0x2A, 0x74, 0x99, 0xB1, 0xC3, +0x09, 0x5D, 0xE3, 0x87, 0x42, 0xF9, 0xF1, 0x59, 0xC8, 0x5E, 0x53, 0xF2, 0x8A, 0x71, 0xBE, 0x2A, +0x0B, 0xD4, 0xDE, 0xC3, 0xE2, 0xA7, 0x58, 0x93, 0x5F, 0xBD, 0x16, 0x26, 0x74, 0xC5, 0x86, 0xE7, +0xE2, 0xC3, 0x75, 0xA1, 0x1E, 0x58, 0xB2, 0xF1, 0xBC, 0xD3, 0x8E, 0x3F, 0xF9, 0x70, 0x56, 0xE6, +0x88, 0xB4, 0x52, 0x6F, 0xC4, 0xFA, 0x99, 0xD2, 0xC5, 0xED, 0x60, 0xB5, 0x25, 0xA2, 0xC1, 0x23, +0xB2, 0x40, 0x85, 0x11, 0x74, 0x7B, 0xF3, 0x94, 0xDC, 0xAB, 0x1E, 0xDF, 0xDE, 0x54, 0x7D, 0xD7, +0xCC, 0x6F, 0xF3, 0x9F, 0x3F, 0x3C, 0x32, 0x64, 0xA5, 0x18, 0x6E, 0xA3, 0x21, 0x17, 0x2C, 0x07, +0x3C, 0x21, 0x43, 0x87, 0x23, 0xC1, 0xD3, 0x21, 0xE1, 0x4D, 0x21, 0x7D, 0x8F, 0xBC, 0x39, 0x11, +0xBC, 0xCD, 0x98, 0xC6, 0xA6, 0x87, 0x06, 0xF6, 0xA6, 0xB1, 0x2E, 0x88, 0x1B, 0xC9, 0x12, 0xE7, +0x13, 0x07, 0x59, 0xFA, 0xF1, 0xA5, 0x47, 0x2E, 0x64, 0xB7, 0x83, 0x33, 0xB4, 0xB0, 0x6C, 0x9B, +0x76, 0x63, 0x9D, 0xA1, 0xCD, 0xCB, 0xF6, 0x57, 0x78, 0xD1, 0xD0, 0xC2, 0x26, 0x85, 0x95, 0x57, +0xD2, 0x3E, 0x9A, 0x10, 0xDF, 0xEE, 0x63, 0xB5, 0xA7, 0xA8, 0xD3, 0xCA, 0x88, 0x1C, 0xCF, 0x16, +0xCB, 0x4B, 0xCF, 0x0F, 0x0E, 0xF4, 0x5A, 0xC9, 0xC7, 0x33, 0xF1, 0x52, 0x79, 0x6C, 0xE3, 0x0A, +0x3D, 0x8D, 0x7E, 0x56, 0xBD, 0x53, 0x71, 0xC4, 0xB5, 0xBA, 0xD6, 0x8A, 0x8B, 0xDE, 0x19, 0x5E, +0x7E, 0xD7, 0xE4, 0xE6, 0x6A, 0x4D, 0x5D, 0xB7, 0xFD, 0x58, 0x81, 0xB1, 0x4A, 0xF6, 0xCC, 0xAE, +0x98, 0x8A, 0x54, 0x98, 0x5F, 0x8C, 0xBB, 0xD2, 0xC0, 0xC5, 0xF9, 0x5A, 0x58, 0x85, 0x61, 0xFD, +0x01, 0xA1, 0x64, 0xD0, 0x05, 0xC0, 0xBB, 0x63, 0x0D, 0xFC, 0x17, 0x32, 0x07, 0x7C, 0x06, 0xB8, +0x83, 0xBC, 0xC8, 0xED, 0x12, 0x2A, 0x6D, 0xEE, 0x9E, 0x91, 0x26, 0x0D, 0x5C, 0xBF, 0x1F, 0x45, +0x1F, 0xEF, 0xA2, 0xBB, 0x01, 0x2E, 0x29, 0xFE, 0x71, 0xFD, 0x0F, 0x49, 0x23, 0x02, 0x6A, 0xB3, +0x04, 0x00, 0x00 }; // Content of `/webfonts/fa-brands-400.woff` const uint8_t web_data_webfonts_fa_brands_400_woff[89988] PROGMEM = { @@ -39316,12 +39318,12 @@ void server_init_handlers(void) request->send(response); }); server.on("/js/winfidel_calibration.js", HTTP_GET, [](AsyncWebServerRequest *request){ - AsyncWebServerResponse *response = request->beginResponse_P(200, "text/javascript", web_data_js_winfidel_calibration_js, 815); + AsyncWebServerResponse *response = request->beginResponse_P(200, "text/javascript", web_data_js_winfidel_calibration_js, 818); response->addHeader("Content-Encoding", "gzip"); request->send(response); }); server.on("/js/winfidel_index.js", HTTP_GET, [](AsyncWebServerRequest *request){ - AsyncWebServerResponse *response = request->beginResponse_P(200, "text/javascript", web_data_js_winfidel_index_js, 576); + AsyncWebServerResponse *response = request->beginResponse_P(200, "text/javascript", web_data_js_winfidel_index_js, 579); response->addHeader("Content-Encoding", "gzip"); request->send(response); }); diff --git a/Firmware/src/config_winfidel.h b/Firmware/src/config_winfidel.h index a27178f..25ba173 100644 --- a/Firmware/src/config_winfidel.h +++ b/Firmware/src/config_winfidel.h @@ -21,6 +21,8 @@ #define CAL_POINT_FIRST { .adc = ADC_MIN, .mm = ADC_MIN_EQUALS_MM } #define CAL_POINT_LAST { .adc = ADC_MAX, .mm = ADC_MAX_EQUALS_MM } +#define PRINT_MEASUREMENT_OVER_SERIAL // Define if we want serial printout for every measurement + #define ADC_MAX_SAMPLES 64 // Maximum number of ADC samples we can take in one measurement cycle #define ADC_SAMPLES_PER_MEASUREMENT_CYCLE 16 // How many samples to take for each measurement cycle #define ADC_FINAL_ADC_VALUE_USING_MEAN // Use mean instead of average ADC value diff --git a/Firmware/src/main.ino b/Firmware/src/main.ino index d3e484f..3855ed1 100644 --- a/Firmware/src/main.ino +++ b/Firmware/src/main.ino @@ -122,6 +122,8 @@ void setup() i2c_scan_bus(); LED_RED_OFF(); + + Serial.println("Entering main loop"); } diff --git a/Firmware/src/measurements.ino b/Firmware/src/measurements.ino index a90da94..d9d7314 100644 --- a/Firmware/src/measurements.ino +++ b/Firmware/src/measurements.ino @@ -116,6 +116,15 @@ void Measurements_Tick(void) LED_MEASUREMENT_ON(); } + #ifdef PRINT_MEASUREMENT_OVER_SERIAL + if (Serial) + { + Serial.print(">"); + Serial.print(gReadingLast); + Serial.print("mm\r\n"); + } + #endif + // Set next update timestamp nNextMeasurementTick = millis() + 200; } diff --git a/Firmware/src/webserver.ino b/Firmware/src/webserver.ino index 8069c9d..7859171 100644 --- a/Firmware/src/webserver.ino +++ b/Firmware/src/webserver.ino @@ -89,21 +89,21 @@ void setupWebServer(void) }); - server.on("/api/diameter/read", HTTP_GET, [] (AsyncWebServerRequest *request) { + server.on("/api/v0/diameter/read", HTTP_GET, [] (AsyncWebServerRequest *request) { format_sensor_data(); request->send(200, "application/json", sensor_data); }); - server.on("/api/diameter/reset", HTTP_GET, [] (AsyncWebServerRequest *request) { + server.on("/api/v0/diameter/reset", HTTP_GET, [] (AsyncWebServerRequest *request) { reset_stats(); request->send(200, "application/json", "{\"status\":\"ok\"}"); }); - server.on("/api/calibration/read", HTTP_GET, [] (AsyncWebServerRequest *request) { + server.on("/api/v0/calibration/read", HTTP_GET, [] (AsyncWebServerRequest *request) { request->send(200, "application/json", get_calibration_json()); }); - server.on("/api/calibration/create", HTTP_GET, [] (AsyncWebServerRequest *request) { + server.on("/api/v0/calibration/create", HTTP_GET, [] (AsyncWebServerRequest *request) { if ( request->hasParam("mm") ) { winfidel_status_t status; @@ -146,7 +146,7 @@ void setupWebServer(void) } }); - server.on("/api/calibration/remove", HTTP_GET, [] (AsyncWebServerRequest *request) { + server.on("/api/v0/calibration/remove", HTTP_GET, [] (AsyncWebServerRequest *request) { if ( request->hasParam("mm") ) { winfidel_status_t status; @@ -171,7 +171,7 @@ void setupWebServer(void) } }); - server.on("/api/calibration/reset", HTTP_GET, [] (AsyncWebServerRequest *request) { + server.on("/api/v0/calibration/reset", HTTP_GET, [] (AsyncWebServerRequest *request) { if ( request->hasParam("confirm") ) { calibration_reset(); @@ -184,7 +184,7 @@ void setupWebServer(void) }); - server.on("/api/wifi/reset", HTTP_GET, [] (AsyncWebServerRequest *request) { + server.on("/api/v0/wifi/reset", HTTP_GET, [] (AsyncWebServerRequest *request) { if ( request->hasParam("confirm") ) { Serial.println("WiFi reset request recevied."); @@ -197,7 +197,7 @@ void setupWebServer(void) } }); - server.on("/api/device/reboot", HTTP_GET, [] (AsyncWebServerRequest *request) { + server.on("/api/v0/device/reboot", HTTP_GET, [] (AsyncWebServerRequest *request) { if ( request->hasParam("confirm") ) { Serial.println("Device reboot request recevied. Rebooting...");