Fix Voltage Reading
This commit is contained in:
parent
0748877113
commit
6067d62e8b
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -1,3 +1,5 @@
|
||||||
.vscode/.browse.c_cpp.db*
|
.vscode/.browse.c_cpp.db*
|
||||||
.vscode/c_cpp_properties.json
|
.vscode/c_cpp_properties.json
|
||||||
.vscode/launch.json
|
.vscode/launch.json
|
||||||
|
.pioenvs
|
||||||
|
.piolibdeps
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Before Width: | Height: | Size: 2.9 MiB After Width: | Height: | Size: 2.9 MiB |
Binary file not shown.
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"terminal.integrated.env.windows": {
|
"terminal.integrated.env.windows": {
|
||||||
"PATH": "C:\\Users\\Carsten\\.platformio\\penv\\Scripts;C:\\Users\\Carsten\\.platformio\\penv;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:\\Users\\Carsten\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Program Files (x86)\\Nmap;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:\\Users\\Carsten\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Program Files (x86)\\Nmap",
|
"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",
|
||||||
"PLATFORMIO_CALLER": "vscode"
|
"PLATFORMIO_CALLER": "vscode"
|
||||||
},
|
},
|
||||||
"files.associations": {
|
"files.associations": {
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<h3>
|
<h3>
|
||||||
Battery Analyzer / Tracker - v0.3 alpha
|
Battery Analyzer / Tracker - v0.17 alpha
|
||||||
</h3>
|
</h3>
|
||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
|
|
|
@ -14,3 +14,5 @@ board = nodemcu-32s
|
||||||
framework = arduino
|
framework = arduino
|
||||||
lib_deps = ArduinoINA219, Wire, EEPROM, TaskScheduler, LiquidCrystal_I2C, ESPAsyncWifiManager, ESP Async WebServer, FS, ESP8266FtpServer
|
lib_deps = ArduinoINA219, Wire, EEPROM, TaskScheduler, LiquidCrystal_I2C, ESPAsyncWifiManager, ESP Async WebServer, FS, ESP8266FtpServer
|
||||||
board_build.partitions = partitions.csv
|
board_build.partitions = partitions.csv
|
||||||
|
monitor_port = COM6
|
||||||
|
monitor_speed = 115200
|
||||||
|
|
|
@ -26,7 +26,7 @@ FtpServer ftpSrv;
|
||||||
#define V_BUS_MAX 26
|
#define V_BUS_MAX 26
|
||||||
#define I_MAX_EXPECTED 60
|
#define I_MAX_EXPECTED 60
|
||||||
#define i2c_address 1
|
#define i2c_address 1
|
||||||
#define led_lowbat_pin 27
|
#define led_lowbat_pin 25
|
||||||
#define led_run_pin 26
|
#define led_run_pin 26
|
||||||
#define button1_pin 14
|
#define button1_pin 14
|
||||||
#define button2_pin 17
|
#define button2_pin 17
|
||||||
|
@ -138,7 +138,7 @@ void setup() {
|
||||||
lcd.setCursor(7,1);
|
lcd.setCursor(7,1);
|
||||||
lcd.print("Tracker");
|
lcd.print("Tracker");
|
||||||
lcd.setCursor(5,2);
|
lcd.setCursor(5,2);
|
||||||
lcd.print("V0.3 Alpha");
|
lcd.print("V0.17 Alpha");
|
||||||
lcd.setCursor(7,3);
|
lcd.setCursor(7,3);
|
||||||
lcd.print("CS,2018");
|
lcd.print("CS,2018");
|
||||||
lcd.write(1);
|
lcd.write(1);
|
||||||
|
@ -165,12 +165,16 @@ void setup() {
|
||||||
|
|
||||||
//Init Wi-Fi
|
//Init Wi-Fi
|
||||||
lcd.setCursor(0,0);
|
lcd.setCursor(0,0);
|
||||||
lcd.print("Setup Wi-Fi...");
|
if (digitalRead(button3_pin)) {
|
||||||
delay(300);
|
lcd.print("Setup Wi-Fi...");
|
||||||
AsyncWiFiManager wifiManager(&server,&dns);
|
delay(300);
|
||||||
wifiManager.autoConnect("BatteryAnalyzer WiFi");
|
AsyncWiFiManager wifiManager(&server,&dns);
|
||||||
lcd.setCursor(16,0);
|
wifiManager.autoConnect("BatteryAnalyzer WiFi");
|
||||||
lcd.print("Done");
|
lcd.setCursor(16,0);
|
||||||
|
lcd.print("Done");
|
||||||
|
} else {
|
||||||
|
lcd.print("Wi-Fi disabled");
|
||||||
|
}
|
||||||
|
|
||||||
//Init ina219s
|
//Init ina219s
|
||||||
lcd.setCursor(0,1);
|
lcd.setCursor(0,1);
|
||||||
|
@ -210,7 +214,7 @@ void setup() {
|
||||||
server.serveStatic("/img", SPIFFS, "/img");
|
server.serveStatic("/img", SPIFFS, "/img");
|
||||||
server.serveStatic("/", SPIFFS, "/").setDefaultFile("index.html");
|
server.serveStatic("/", SPIFFS, "/").setDefaultFile("index.html");
|
||||||
server.begin();
|
server.begin();
|
||||||
ftpSrv.begin("esp8266","esp8266");
|
ftpSrv.begin("battery","tracker");
|
||||||
delay(500);
|
delay(500);
|
||||||
lcd.setCursor(16,2);
|
lcd.setCursor(16,2);
|
||||||
lcd.print("Done");
|
lcd.print("Done");
|
||||||
|
@ -300,6 +304,7 @@ void lcd_header() {
|
||||||
i_header = 0;
|
i_header = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//Flash Battery Low LED
|
||||||
if (battery_low && digitalRead(led_lowbat_pin)) {
|
if (battery_low && digitalRead(led_lowbat_pin)) {
|
||||||
digitalWrite(led_lowbat_pin,LOW);
|
digitalWrite(led_lowbat_pin,LOW);
|
||||||
} else if (battery_low && digitalRead(led_lowbat_pin) == false) { digitalWrite(led_lowbat_pin,HIGH); }
|
} else if (battery_low && digitalRead(led_lowbat_pin) == false) { digitalWrite(led_lowbat_pin,HIGH); }
|
||||||
|
@ -380,11 +385,13 @@ void readCurrent() {
|
||||||
reset_actual = false;
|
reset_actual = false;
|
||||||
}
|
}
|
||||||
lastread = newtime;
|
lastread = newtime;
|
||||||
|
ina219.recalibrate();
|
||||||
|
ina219.reconfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
void read_bat() {
|
void read_bat() {
|
||||||
battery_average += (analogRead(adc_battery_pin) - battery_average) * 0.1;
|
battery_average += (analogRead(adc_battery_pin) - battery_average) * 0.1;
|
||||||
battery_voltage = map(battery_average,0,4096,0,490)/100.0;
|
battery_voltage = map(battery_average,0,4096,0,450)/100.0;
|
||||||
if (battery_voltage < 3.3 && battery_low == false) {
|
if (battery_voltage < 3.3 && battery_low == false) {
|
||||||
battery_low = true;
|
battery_low = true;
|
||||||
lcd.noBacklight();
|
lcd.noBacklight();
|
||||||
|
|
Loading…
Reference in a new issue