\n";
const char IOTWEBCONF_CONSOLE_BODY_INNER[] PROGMEM = "
\n";
const char IOTWEBCONF_CONSOLE_SCRIPT[] PROGMEM = "var x=null,lt,to,tp,pc='';var sn=0,id=0;function f(p){var c,o='',t;clearTimeout(lt);t = document.getElementById('t1');if (p==1) {c =document.getElementById('c1');o='&c1='+encodeURIComponent(c.value);c.value='';t.scrollTop=99999;sn=t.scrollTop;}if (t.scrollTop >= sn){if (x!=null){x.abort();}x=new XMLHttpRequest();x.onreadystatechange=function() {if(x.readyState==4&&x.status==200){var z,d;var a=x.responseText;console.log(a);id=a.substr(0,a.indexOf('\\n'));z=a.substr(a.indexOf('\\n')+1);if(z.length>0){t.value+=z;}t.scrollTop=99999;sn=t.scrollTop;}};x.open('GET','cs?c2='+id+o,true);x.send();}lt=setTimeout(f,2345);return false;}window.addEventListener('load', f);";
@@ -61,6 +61,6 @@ const char ADVANCED_CONFIG_SCRIPT[] PROGMEM =
"function tableDoneHandler(btn){var tbd=document.getElementById('current-table'); var ds=tableDictString(tbd); current_ctrl.value=ds; document.getElementById('dt-' + current_id).remove(); current_ctrl=null; current_id=null; }"
"function editElementDict(ed){if (current_ctrl===null){var ph=ed.getAttribute('placeholder'); var dstring = ed.value!='' ? ed.value : ph; if(dstring !== ''){ current_id=ed.id; var dict = JSON.parse(dstring); var tblhtml = '
' + dictTable(dict) + '
'; ed.insertAdjacentHTML('afterend', tblhtml); current_ctrl=ed; } } }"
"var current_id, current_ctrl=null; window.addEventListener('load', function() {setup_click('board_template'); setup_click('modem_startup');});";
-const char IOTWEBCONF_WORLDMAP_SCRIPT[] PROGMEM = "var wmx=null,wmt;function wmf(p){var sp,mc,gs,lp;clearTimeout(wmt);wmx=new XMLHttpRequest();wmx.onreadystatechange=function() {if(wmx.readyState==4&&x.status==200){var wma=wmx.responseText;var wmp = wma.split(',');sp=document.getElementById('wmsatpos');sp.setAttribute('cx', wmp[0]);sp.setAttribute('cy', wmp[1]);mc=document.getElementById('modemconfig');for(let r=0;r<6;r++){mc.rows[r].cells[1].innerHTML=wmp[r+2]};if(wmp[3]=='LoRa'){mc.rows[3].cells[0].innerHTML='Spreading Factor ';mc.rows[4].cells[0].innerHTML='Coding Rate ';}else{mc.rows[3].cells[0].innerHTML='Bitrate ';mc.rows[4].cells[0].innerHTML='Frequency dev ';};gs=document.getElementById('gsstatus');for(let r=0;r<6;r++){gs.rows[r].cells[1].innerHTML=wmp[r+8];};lp=document.getElementById('lastpacket');for(let r=0;r<4;r++){lp.rows[r].cells[1].innerHTML=wmp[r+14];};lp.rows[4].cells[0].innerHTML=wmp[18];}};wmx.open('GET','wm',true);wmx.send();wmt=setTimeout(wmf,5000);return false;}window.addEventListener('load', wmf);";
+const char IOTWEBCONF_WORLDMAP_SCRIPT[] PROGMEM = "var wmx=null,wmt;function wmf(p){var sp,mc,gs,lp;clearTimeout(wmt);wmx=new XMLHttpRequest();wmx.onreadystatechange=function() {if(wmx.readyState==4&&x.status==200){var wma=wmx.responseText;var wmp = wma.split(',');sp=document.getElementById('wmsatpos');sp.setAttribute('cx', wmp[0]);sp.setAttribute('cy', wmp[1]);mc=document.getElementById('modemconfig');for(let r=0;r<6;r++){mc.rows[r].cells[1].innerHTML=wmp[r+2]};if(wmp[3]=='LoRa'){mc.rows[3].cells[0].innerHTML='Spreading Factor ';mc.rows[4].cells[0].innerHTML='Coding Rate ';}else{mc.rows[3].cells[0].innerHTML='Bitrate ';mc.rows[4].cells[0].innerHTML='Frequency dev ';};gs=document.getElementById('gsstatus');for(let r=0;r<7;r++){gs.rows[r].cells[1].innerHTML=wmp[r+8];};lp=document.getElementById('lastpacket');for(let r=0;r<4;r++){lp.rows[r].cells[1].innerHTML=wmp[r+15];};lp.rows[4].cells[0].innerHTML=wmp[19];}};wmx.open('GET','wm',true);wmx.send();wmt=setTimeout(wmf,5000);return false;}window.addEventListener('load', wmf);";
const char IOTWEBCONF_CONFIG_STYLE_INNER[] PROGMEM = " fieldset[id='Board config'] div:nth-of-type(3) ~ div { display:none}";
diff --git a/tinyGS/src/Display/Display.cpp b/tinyGS/src/Display/Display.cpp
index 80be7513..768b5cf5 100644
--- a/tinyGS/src/Display/Display.cpp
+++ b/tinyGS/src/Display/Display.cpp
@@ -220,6 +220,11 @@ void drawFrame3(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int1
display->drawString(128 + x, 23 + y, String(status.modeminfo.freqDev)+ "/" + String(status.modeminfo.bw)+ "kHz");
display->drawString(128 + x, 34 + y, String(status.modeminfo.bitrate)+ "kbps");
}
+ if (status.vbat != 0.0)
+ {
+ display->setTextAlignment(TEXT_ALIGN_LEFT);
+ display->drawString(x, 45 + y, "Bat: " + String(status.vbat) + "V");
+ }
}
void drawFrame4(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y)
diff --git a/tinyGS/src/Mqtt/MQTT_Client.cpp b/tinyGS/src/Mqtt/MQTT_Client.cpp
index 205155c4..6add90ab 100644
--- a/tinyGS/src/Mqtt/MQTT_Client.cpp
+++ b/tinyGS/src/Mqtt/MQTT_Client.cpp
@@ -94,7 +94,7 @@ void MQTT_Client::loop()
else
{
StaticJsonDocument<128> doc;
- doc["Vbat"] = voltage();
+ doc["Vbat"] = status.vbat;
doc["Mem"] = ESP.getFreeHeap();
doc["RSSI"] =WiFi.RSSI();
doc["radio"]= status.radio_error;
@@ -203,7 +203,7 @@ void MQTT_Client::sendWelcome()
doc["board"] = configManager.getBoard();
doc["mac"] = clientId;
doc["seconds"] = millis()/1000;
- doc["Vbat"] = voltage();
+ doc["Vbat"] = status.vbat;
char buffer[1048];
serializeJson(doc, buffer);
@@ -864,37 +864,3 @@ void MQTT_Client::begin()
setServer(configManager.getMqttServer(), configManager.getMqttPort());
setCallback(manageMQTTDataCallback);
}
-
-
-
-int MQTT_Client::voltage() {
- int medianVoltage;
- int length = 21;
- int voltages[22];
-
- for (int i = 0; i < 22; i++)
- {
- voltages[i] = analogRead(36);
- }
-
- // BubbleSortAsc from https://www.luisllamas.es/arduino-bubble-sort/
- int i, j, flag = 1;
- int temp;
- for (i = 1; (i <= length) && flag; i++)
- {
- flag = 0;
- for (j = 0; j < (length - 1); j++)
- {
- if (voltages[j + 1] < voltages[j])
- {
- temp = voltages[j];
- voltages[j] = voltages[j + 1];
- voltages[j + 1] = temp;
- flag = 1;
- }
- }
- }
- medianVoltage = voltages[10];
- return medianVoltage;
-}
-
diff --git a/tinyGS/src/Mqtt/MQTT_Client.h b/tinyGS/src/Mqtt/MQTT_Client.h
index 33cf10e5..f9b2f2d4 100644
--- a/tinyGS/src/Mqtt/MQTT_Client.h
+++ b/tinyGS/src/Mqtt/MQTT_Client.h
@@ -72,9 +72,6 @@ class MQTT_Client : public PubSubClient {
void remoteGoToSleep(char* payload, size_t payload_len);
void remoteGoToSiesta(char* payload, size_t payload_len);
-
- int voltage();
-
bool usingNewCert = true;
unsigned long lastPing = 0;
unsigned long lastConnectionAtempt = 0;
diff --git a/tinyGS/src/Status.h b/tinyGS/src/Status.h
index 023dc061..ef109f9a 100644
--- a/tinyGS/src/Status.h
+++ b/tinyGS/src/Status.h
@@ -71,6 +71,7 @@ struct Status {
bool mqtt_connected = false;
bool radio_ready = false;
int16_t radio_error = 0;
+ float vbat = 0.0;
PacketInfo lastPacketInfo;
ModemInfo modeminfo;
float satPos[2] = {0, 0};
diff --git a/tinyGS/tinyGS.ino b/tinyGS/tinyGS.ino
index c19f1371..fae2963d 100644
--- a/tinyGS/tinyGS.ino
+++ b/tinyGS/tinyGS.ino
@@ -101,6 +101,7 @@ Status status;
void printControls();
void switchTestmode();
void checkButton();
+void checkBattery(void);
void setupNTP();
void configured()
@@ -204,6 +205,8 @@ void loop() {
return;
}
+ checkBattery();
+
// connected
mqtt.loop();
@@ -249,6 +252,23 @@ void checkButton()
}
}
+void checkBattery(void)
+{
+ #define BATTERY_INTERVAL 250
+ static unsigned long lastReadTime = 0;
+ board_t board;
+
+ if (millis() - lastReadTime > BATTERY_INTERVAL) {
+ lastReadTime = millis();
+ if (configManager.getBoardConfig(board)) {
+ if (board.VBAT_AIN != UNUSED) {
+ float vbatMeas = (float)analogReadMilliVolts(board.VBAT_AIN) * board.VBAT_SCALE * 0.001f;
+ status.vbat = (0.75 * status.vbat) + (0.25 * vbatMeas);
+ }
+ }
+ }
+}
+
void handleSerial()
{
if(Serial.available())