From 424329afb20f06ea414e33ac1bff2f50c8e94f91 Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Fri, 20 Sep 2019 21:45:16 +0200 Subject: [PATCH 1/2] Update paxcounter.conf --- src/paxcounter.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/paxcounter.conf b/src/paxcounter.conf index 4f866c27..40852f59 100644 --- a/src/paxcounter.conf +++ b/src/paxcounter.conf @@ -75,7 +75,7 @@ #define TIME_SYNC_INTERVAL_RETRY 10 // retry time sync after lost sync each .. minutes [default = 10], 0 means off #define TIME_SYNC_COMPILEDATE 0 // set to 1 to use compile date to initialize RTC after power outage [default = 0] #define TIME_SYNC_LORAWAN 0 // set to 1 to use LORA network as time source, 0 means off [default = 0] -#define TIME_SYNC_LORASERVER 1 // set to 1 to use LORA timeserver as time source, 0 means off [default = 0] +#define TIME_SYNC_LORASERVER 0 // set to 1 to use LORA timeserver as time source, 0 means off [default = 0] // settings for syncing time with timeserver applications #define TIME_SYNC_SAMPLES 1 // number of time requests for averaging @@ -111,4 +111,4 @@ #define CAYENNE_ACTUATOR 10 // actuator commands #define CAYENNE_DEVICECONFIG 11 // device period configuration #define CAYENNE_SENSORREAD 13 // sensor period configuration -#define CAYENNE_SENSORENABLE 14 // sensor enable configuration \ No newline at end of file +#define CAYENNE_SENSORENABLE 14 // sensor enable configuration From 9408ed99feb99b4040243509ea41521e9b0f7e67 Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Sat, 21 Sep 2019 08:23:39 +0200 Subject: [PATCH 2/2] PMU: show USB power --- src/power.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/power.cpp b/src/power.cpp index 8d06c39d..c7297123 100644 --- a/src/power.cpp +++ b/src/power.cpp @@ -16,9 +16,10 @@ void pover_event_IRQ(void) { // put your power event handler code here if (pmu.isVbusOverVoltageIRQ()) - ESP_LOGI(TAG, "USB voltage %.1fV too high.", pmu.getVbusVoltage()); + ESP_LOGI(TAG, "USB voltage %.2fV too high.", pmu.getVbusVoltage() / 1000); if (pmu.isVbusPlugInIRQ()) - ESP_LOGI(TAG, "USB plugged."); + ESP_LOGI(TAG, "USB plugged, %.2fV @ %.0mA", pmu.getVbusVoltage() / 1000, + pmu.getVbusCurrent()); if (pmu.isVbusRemoveIRQ()) ESP_LOGI(TAG, "USB unplugged."); @@ -78,14 +79,16 @@ void AXP192_power(bool on) { void AXP192_displaypower(void) { if (pmu.isBatteryConnect()) if (pmu.isChargeing()) - ESP_LOGI(TAG, "Battery charging @ %.0fmAh", pmu.getBattChargeCurrent()); + ESP_LOGI(TAG, "Battery charging, %.2fV @ %.0fmAh", + pmu.getBattVoltage() / 1000, pmu.getBattChargeCurrent()); else ESP_LOGI(TAG, "Battery not charging"); else ESP_LOGI(TAG, "No Battery"); if (pmu.isVBUSPlug()) - ESP_LOGI(TAG, "USB present"); + ESP_LOGI(TAG, "USB present, %.2fV @ %.0fmA", pmu.getVbusVoltage() / 1000, + pmu.getVbusCurrent()); else ESP_LOGI(TAG, "USB not present"); } @@ -101,9 +104,14 @@ void AXP192_init(void) { // switch power on pmu.setDCDC1Voltage(3300); // for external OLED display - pmu.adc1Enable(AXP202_BATT_CUR_ADC1, 1); AXP192_power(true); + // switch ADCs on + pmu.adc1Enable(AXP202_BATT_VOL_ADC1, true); + pmu.adc1Enable(AXP202_BATT_CUR_ADC1, true); + pmu.adc1Enable(AXP202_VBUS_VOL_ADC1, true); + pmu.adc1Enable(AXP202_VBUS_CUR_ADC1, true); + // set TS pin mode off to save power pmu.setTSmode(AXP_TS_PIN_MODE_DISABLE);