Airsoft/DarkEmergency-Timer
Airsoft/DarkEmergency-Timer
1
0
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

fixed Warning (for Real this time)

Browse Source
This commit is contained in:
Marcel Peterkau 2022-04-16 17:36:05 +02:00
parent 5e6f4b6a84
commit 8d271e9678
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/globals.h
View File

@ -23,7 +23,7 @@ typedef enum eEERequest
typedef struct Globals_s typedef struct Globals_s
{ {
char DeviceName[33]; char DeviceName[33];
char DeviceName_ID[42]; char DeviceName_ID[43];
tSystem_Status systemStatus = sysStat_Startup; tSystem_Status systemStatus = sysStat_Startup;
tSystem_Status resumeStatus = sysStat_Startup; tSystem_Status resumeStatus = sysStat_Startup;
eEERequest requestEEAction = EE_IDLE; eEERequest requestEEAction = EE_IDLE;

6
src/main.cpp
View File

@ -98,7 +98,7 @@ void setup()
Serial.print("\n\n\n"); Serial.print("\n\n\n");
strcpy(globals.DeviceName, DEVICE_NAME); strcpy(globals.DeviceName, DEVICE_NAME);
snprintf(globals.DeviceName_ID, 41, "%s_%08X", globals.DeviceName, ESP.getChipId()); snprintf(globals.DeviceName_ID, 42, "%s_%08X", globals.DeviceName, ESP.getChipId());
pinMode(DIO_FAC_1_TRG, INPUT_PULLUP); pinMode(DIO_FAC_1_TRG, INPUT_PULLUP);
pinMode(DIO_FAC_2_TRG, INPUT_PULLUP); pinMode(DIO_FAC_2_TRG, INPUT_PULLUP);
@ -323,13 +323,15 @@ void powerMonitorTicker_callback()
float current_mA = 0; float current_mA = 0;
float busvoltage = 0; float busvoltage = 0;
float power_mW = 0; float power_mW = 0;
int battery_level = 0;
shuntvoltage = ina219.getShuntVoltage_mV(); shuntvoltage = ina219.getShuntVoltage_mV();
busvoltage = ina219.getBusVoltage_V(); busvoltage = ina219.getBusVoltage_V();
current_mA = ina219.getCurrent_mA(); current_mA = ina219.getCurrent_mA();
power_mW = ina219.getPower_mW(); power_mW = ina219.getPower_mW();
globals.loadvoltage = busvoltage + (shuntvoltage / 1000); globals.loadvoltage = busvoltage + (shuntvoltage / 1000);
globals.battery_level = map(globals.loadvoltage * 100, 655, 840, 0, 100); battery_level = map(globals.loadvoltage * 100, 655, 840, 0, 100);
globals.battery_level = battery_level < 0 ? 0 : battery_level;
debugV("Battery Level: %d %%", globals.battery_level); debugV("Battery Level: %d %%", globals.battery_level);
debugV("Bus Voltage: %f V", busvoltage); debugV("Bus Voltage: %f V", busvoltage);