Merge pull request #608 from cyberman54/development

v1.9.996

src/hal/generic.h

@@ -1,6 +1,7 @@
 // clang-format off
 // upload_speed 115200
 // board esp32dev
+// display_library lib_deps_oled_display
 
 #ifndef _GENERIC_H
 #define _GENERIC_H

src/hal/m5core.h

@@ -37,7 +37,12 @@
 #define HAS_LED NOT_A_PIN // no on board LED (?)
 #define HAS_BUTTON (39) // on board button A
 
-#define HAS_IP5306 1
+// power management settings
+#define HAS_IP5306 1 // has IP5306 chip
+#define PMU_CHG_CURRENT 2 // battery charge current
+// possible values: 0:200mA, 1:400mA, *2:500mA, 3:600mA
+#define PMU_CHG_CUTOFF 0 // battery charge cutoff
+// possible values: *0:4.2V, 1:4.3V, 2:4.35V, 3:4.4V
 
 // GPS settings
 #define HAS_GPS 1 // use on board GPS

src/hal/m5fire.h

@@ -41,7 +41,12 @@
 #define HAS_RGB_LED SmartLed rgb_led(LED_SK6812, RGB_LED_COUNT, GPIO_NUM_15) // LED_SK6812 RGB LED on GPIO15
 #define HAS_BUTTON (39) // on board button A
 
-#define HAS_IP5306 1
+// power management settings
+#define HAS_IP5306 1 // has IP5306 chip
+#define PMU_CHG_CURRENT 2 // battery charge current
+// possible values: 0:200mA, 1:400mA, *2:500mA, 3:600mA
+#define PMU_CHG_CUTOFF 0 // battery charge cutoff
+// possible values: *0:4.2V, 1:4.3V, 2:4.35V, 3:4.4V
 
 // GPS settings
 #define HAS_GPS 0 // use on board GPS

src/hal/olimexpoeiso.h

@@ -0,0 +1,24 @@
+// clang-format off
+// upload_speed 921600
+// board esp32-poe-iso
+
+#ifndef _OLIMEXPOEISO_H
+#define _OLIMEXPOEISO_H
+
+#include <stdint.h>
+
+// enable only if you want to store a local paxcount table on the device
+//#define HAS_SDCARD 2 // this board has a SDMMC card-reader/writer
+
+// enable only if you want to send paxcount via ethernet port to mqtt server
+#define HAS_MQTT 1  // use MQTT on ethernet interface
+
+//#define BAT_MEASURE_ADC ADC1_GPIO35_CHANNEL // battery probe GPIO pin -> ADC1_CHANNEL_7
+//#define BAT_VOLTAGE_DIVIDER 2 // voltage divider 470k/470k on board
+#define BAT_MEASURE_ADC ADC1_GPIO39_CHANNEL // external power probe GPIO pin
+#define BAT_VOLTAGE_DIVIDER 2.1277f // voltage divider 47k/442k on board
+
+#define HAS_BUTTON KEY_BUILTIN // on board button
+#define HAS_LED NOT_A_PIN // no on board LED
+
+#endif

src/hal/ttgobeam10.h

@@ -9,7 +9,7 @@
 
 /* 
 Hardware related definitions for TTGO T-Beam board
-(only) for newer T-Beam version T22_V10
+for T-Beam versions T22_V10 + T22_V11
 pinouts taken from https://github.com/lewisxhe/TTGO-T-Beam
 
 /// Button functions: ///
@@ -20,7 +20,7 @@ User, long press -> send LORA message
 Reset -> reset device
 */
 
-#define HAS_DISPLAY 1
+//#define HAS_DISPLAY 1
 #define MY_DISPLAY_SDA SDA
 #define MY_DISPLAY_SCL SCL
 #define MY_DISPLAY_RST NOT_A_PIN
@@ -29,11 +29,18 @@ Reset -> reset device
 #define HAS_LORA 1       // comment out if device shall not send data via LoRa
 #define CFG_sx1276_radio 1 // HPD13A LoRa SoC
 #define HAS_BUTTON GPIO_NUM_38 // middle on board button
-#define HAS_PMU 1 // AXP192 power management chip
-#define PMU_INT GPIO_NUM_35 // AXP192 interrupt
-
 #define HAS_LED NOT_A_PIN
 
+// power management settings
+#define HAS_PMU 1 // has AXP192 chip
+#define PMU_INT GPIO_NUM_35 // battery interrupt
+#define PMU_CHG_CURRENT AXP1XX_CHARGE_CUR_1000MA // battery charge current
+// possible values (mA):
+// 100/190/280/360/450/550/630/700/780/880/960/1000/1080/1160/1240/1320
+#define PMU_CHG_CUTOFF AXP202_TARGET_VOL_4_2V // battery charge cutoff
+// possible values (V):
+// 4_1/4_15/4_2/4_36
+
 // GPS settings
 #define HAS_GPS 1 // use on board GPS
 #define GPS_SERIAL 9600, SERIAL_8N1, GPIO_NUM_34, GPIO_NUM_12 // UBlox NEO 6M