diff --git a/.pioenvs/.sconsign.dblite b/.pioenvs/.sconsign.dblite index 6b96321..d528451 100644 Binary files a/.pioenvs/.sconsign.dblite and b/.pioenvs/.sconsign.dblite differ diff --git a/.pioenvs/structure.hash b/.pioenvs/structure.hash index 8451214..cf7bf3e 100644 --- a/.pioenvs/structure.hash +++ b/.pioenvs/structure.hash @@ -1 +1 @@ -ed29a20d4d5440e7bc8a8339197df0ad37810755 \ No newline at end of file +038a2af16b7c85a15994c1dfcc3294cf5461948a \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 56b8276..2047d69 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,6 @@ { "terminal.integrated.env.windows": { - "PATH": "C:\\Users\\Debug\\.platformio\\penv\\Scripts;C:\\Users\\Debug\\.platformio\\penv;C:\\Program Files (x86)\\SIEMENS\\S7-PCT\\bin;C:\\Program Files (x86)\\Common Files\\Siemens\\Sqlany;C:\\Program Files (x86)\\Siemens\\Step7\\S7bin;C:\\Program Files\\Common Files\\Siemens\\Automation\\Simatic OAM\\bin;C:\\Program Files (x86)\\LonWorks\\Bin;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Git\\cmd;C:\\AWRoot\\bin\\common;C:\\AWRoot\\bin\\lib;C:\\Program Files\\PKWARE\\pkzipc;C:\\Program Files\\bladeRF\\x64;C:\\Program Files\\Microsoft VS Code\\bin;;C:\\Program Files (x86)\\Microsoft VS Code\\bin;C:\\Program Files (x86)\\Nmap;C:\\Program Files (x86)\\SIEMENS\\S7-PCT\\bin;C:\\Program Files (x86)\\Common Files\\Siemens\\Sqlany;C:\\Program Files (x86)\\Siemens\\Step7\\S7bin;C:\\Program Files\\Common Files\\Siemens\\Automation\\Simatic OAM\\bin;C:\\Program Files (x86)\\LonWorks\\Bin;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Git\\cmd;C:\\AWRoot\\bin\\common;C:\\AWRoot\\bin\\lib;C:\\Program Files\\PKWARE\\pkzipc;C:\\Program Files\\bladeRF\\x64;C:\\Program Files\\Microsoft VS Code\\bin;;C:\\Program Files (x86)\\Microsoft VS Code\\bin;C:\\Program Files (x86)\\Nmap", + "PATH": "C:\\Users\\carsten\\.platformio\\penv\\Scripts;C:\\Users\\carsten\\.platformio\\penv;C:\\Program Files (x86)\\Common Files\\Oracle\\Java\\javapath;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Microsoft VS Code\\bin;C:\\Program Files\\Git\\cmd;C:\\Program Files\\bladeRF\\x64;C:\\Program Files\\PothosSDR\\bin;C:\\Users\\carsten\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Program Files (x86)\\Nmap;C:\\Program Files (x86)\\Common Files\\Oracle\\Java\\javapath;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Microsoft VS Code\\bin;C:\\Program Files\\Git\\cmd;C:\\Program Files\\bladeRF\\x64;C:\\Program Files\\PothosSDR\\bin;C:\\Users\\carsten\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Program Files (x86)\\Nmap", "PLATFORMIO_CALLER": "vscode" }, "files.associations": { diff --git a/platformio.ini b/platformio.ini index 0c5bdfd..566da72 100644 --- a/platformio.ini +++ b/platformio.ini @@ -16,5 +16,5 @@ lib_deps = ArduinoINA219, Wire, TaskScheduler, LiquidCrystal_I2C, ESPAsyncWifiMa board_build.partitions = partitions.csv monitor_port = COM6 monitor_speed = 115200 -upload_port = 10.11.0.44 -upload_flags = "--port=1337 --auth=powerlyzer" \ No newline at end of file +;upload_port = 10.11.0.44 +;upload_flags = "--port=1337 --auth=powerlyzer" \ No newline at end of file diff --git a/src/PowerAnalyzer.ino b/src/PowerAnalyzer.ino index 7547c4d..dc369a7 100644 --- a/src/PowerAnalyzer.ino +++ b/src/PowerAnalyzer.ino @@ -520,7 +520,7 @@ void readCurrent() { void read_bat() { battery_average += (analogRead(adc_battery_pin) - battery_average) * 0.3; - battery_voltage = map(battery_average,0,4096,0,450)/100.0; + battery_voltage = map(battery_average,0,3480,0,440)/100.0; if (battery_voltage < 3.3 && battery_low == false) { battery_low = true; lcd.noBacklight();