ua1zbe
/
LoRa_APRS_iGate111
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

favicon and battery adc calibration

This commit is contained in:
richonguzman 2024-07-08 23:29:04 -04:00
parent 5d69cfbe1c
commit 864ed44a5d
5 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data_embed/favicon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 813 B

2
data_embed/index.html
View File

@ -16,7 +16,7 @@
> >
<div class="container"> <div class="container">
<a class="navbar-brand" href="" <a class="navbar-brand" href=""
>CA2RXU's LoRa</a >CA2RXU's LoRa iGate</a
> >
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarColor01" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarColor01" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>

10
src/battery_utils.cpp
View File

@ -75,11 +75,13 @@ namespace BATTERY_Utils {
} }
void setup() { void setup() {
if (Config.battery.voltageDividerR2 != 0) voltageDividerTransformation = (Config.battery.voltageDividerR1 + Config.battery.voltageDividerR2) / Config.battery.voltageDividerR2; if ((Config.battery.sendExternalVoltage || Config.battery.monitorExternalVoltage) && Config.battery.voltageDividerR2 != 0) voltageDividerTransformation = (Config.battery.voltageDividerR1 + Config.battery.voltageDividerR2) / Config.battery.voltageDividerR2;
#if defined(HAS_ADC_CALIBRATION) #if defined(HAS_ADC_CALIBRATION)
adcCalibrationCheck(); if (Config.battery.sendInternalVoltage || Config.battery.monitorInternalVoltage || Config.battery.sendExternalVoltage || Config.battery.monitorExternalVoltage) {
adcCalibration(); adcCalibrationCheck();
adcCalibration();
}
#endif #endif
} }

12
src/web_utils.cpp
View File

@ -29,6 +29,11 @@ extern const char web_bootstrap_js[] asm("_binary_data_embed_bootstrap_js_gz_sta
extern const char web_bootstrap_js_end[] asm("_binary_data_embed_bootstrap_js_gz_end"); extern const char web_bootstrap_js_end[] asm("_binary_data_embed_bootstrap_js_gz_end");
extern const size_t web_bootstrap_js_len = web_bootstrap_js_end - web_bootstrap_js; extern const size_t web_bootstrap_js_len = web_bootstrap_js_end - web_bootstrap_js;
// Declare external symbols for the embedded image data
extern const unsigned char favicon_data[] asm("_binary_data_embed_favicon_png_gz_start");
extern const unsigned char favicon_data_end[] asm("_binary_data_embed_favicon_png_gz_end");
extern const size_t favicon_data_len = favicon_data_end - favicon_data;
namespace WEB_Utils { namespace WEB_Utils {
AsyncWebServer server(80); AsyncWebServer server(80);
@ -49,6 +54,12 @@ namespace WEB_Utils {
request->send(response); request->send(response);
} }
void handleFavicon(AsyncWebServerRequest *request) {
AsyncWebServerResponse *response = request->beginResponse_P(200, "image/x-icon", (const uint8_t*)favicon_data, favicon_data_len);
response->addHeader("Content-Encoding", "gzip");
request->send(response);
}
void handleReadConfiguration(AsyncWebServerRequest *request) { void handleReadConfiguration(AsyncWebServerRequest *request) {
File file = SPIFFS.open("/igate_conf.json"); File file = SPIFFS.open("/igate_conf.json");
@ -243,6 +254,7 @@ namespace WEB_Utils {
server.on("/script.js", HTTP_GET, handleScript); server.on("/script.js", HTTP_GET, handleScript);
server.on("/bootstrap.css", HTTP_GET, handleBootstrapStyle); server.on("/bootstrap.css", HTTP_GET, handleBootstrapStyle);
server.on("/bootstrap.js", HTTP_GET, handleBootstrapScript); server.on("/bootstrap.js", HTTP_GET, handleBootstrapScript);
server.on("/favicon.png", HTTP_GET, handleFavicon);
OTA_Utils::setup(&server); // Include OTA Updater for WebServer OTA_Utils::setup(&server); // Include OTA Updater for WebServer

1
tools/compress.py
View File

@ -9,6 +9,7 @@ files = [
'data_embed/style.css', 'data_embed/style.css',
'data_embed/bootstrap.js', 'data_embed/bootstrap.js',
'data_embed/bootstrap.css', 'data_embed/bootstrap.css',
'data_embed/favicon.png',
] ]
for src in files: for src in files: