Merge branch 'master' into S3-usb-stick

include/display.h

@@ -2,6 +2,7 @@
 #define _DISPLAY_H
 
 #include <libpax_api.h>
+#include <Wire.h>
 #include "cyclic.h"
 #include "qrcode.h"
 #include "power.h"
@@ -9,8 +10,10 @@
 
 #if (HAS_DISPLAY) == 1
 #include <OneBitDisplay.h>
+extern ONE_BIT_DISPLAY *dp;
 #elif (HAS_DISPLAY) == 2
-#include <TFT_eSPI.h>
+#include <bb_spi_lcd.h>
+extern BB_SPI_LCD *dp;
 #endif
 
 #define DISPLAY_PAGES (7) // number of paxcounter display pages
@@ -22,7 +25,6 @@
 #define MY_FONT_NORMAL FONT_8x8
 #define MY_FONT_LARGE FONT_16x32
 #define MY_FONT_STRETCHED FONT_12x16
-
 #define MY_DISPLAY_FIRSTLINE 30
 
 #ifndef MY_DISPLAY_RST
@@ -40,33 +42,32 @@
 #endif
 
 #ifndef MY_DISPLAY_FGCOLOR
-#define MY_DISPLAY_FGCOLOR OLED_WHITE
+#define MY_DISPLAY_FGCOLOR 1 // OLED_WHITE
 #endif
 #ifndef MY_DISPLAY_BGCOLOR
-#define MY_DISPLAY_BGCOLOR OLED_BLACK
+#define MY_DISPLAY_BGCOLOR 0 // OLED_BLACK
 #endif
 
 // settings for TFT display library
-#elif (HAS_DISPLAY == 2)
+#elif (HAS_DISPLAY) == 2
 
-#define MY_FONT_SMALL 1
+#define MY_FONT_SMALL 2
 #define MY_FONT_NORMAL 2
-#define MY_FONT_LARGE 4
-#define MY_FONT_STRETCHED 6
-
+#define MY_FONT_LARGE 2
+#define MY_FONT_STRETCHED 2
 #define MY_DISPLAY_FIRSTLINE 30
 
+#ifndef TFT_FREQUENCY
+#define TFT_FREQUENCY 400000L
+#endif
+
 #ifndef MY_DISPLAY_FGCOLOR
-#define MY_DISPLAY_FGCOLOR TFT_WHITE
+#define MY_DISPLAY_FGCOLOR TFT_YELLOW
 #endif
 #ifndef MY_DISPLAY_BGCOLOR
 #define MY_DISPLAY_BGCOLOR TFT_BLACK
 #endif
 
-#ifndef TOUCH_CS
-#define TOUCH_CS NOT_A_PIN
-#endif
-
 #endif
 
 // setup display hardware type, default is OLED 128x64
@@ -74,10 +75,6 @@
 #define OLED_TYPE OLED_128x64
 #endif
 
-#ifndef MY_DISPLAY_INVERT
-#define MY_DISPLAY_INVERT 0
-#endif
-
 #ifndef MY_DISPLAY_FLIP
 #define MY_DISPLAY_FLIP 0
 #endif
@@ -106,18 +103,12 @@ void dp_setup(int contrast = 0);
 void dp_refresh(bool nextPage = false);
 void dp_init(bool verbose = false);
 void dp_shutdown(void);
-void dp_message(const char *msg, int line, bool invers);
-void dp_drawPage(bool nextpage);
-void dp_printf(const char *format, ...);
 void dp_setFont(int font, int inv = 0);
 void dp_dump(uint8_t *pBuffer = NULL);
-void dp_setTextCursor(int col = 0, int row = MY_DISPLAY_FIRSTLINE);
 void dp_contrast(uint8_t contrast);
 void dp_clear(void);
 void dp_power(uint8_t screenon);
 void dp_printqr(uint16_t offset_x, uint16_t offset_y, const char *Message);
-void dp_fillRect(uint16_t x, uint16_t y, uint16_t width, uint16_t height,
-                 uint8_t bRender);
 void dp_scrollHorizontal(uint8_t *buf, const uint16_t width,
                          const uint16_t height, bool left = true);
 void dp_scrollVertical(uint8_t *buf, const uint16_t width,

include/globals.h

@@ -12,7 +12,10 @@
 #include <set>
 #include <array>
 #include <algorithm>
-//#include <bsec.h>
+
+#ifdef HAS_BME680
+#include <bsec.h>
+#endif
 
 #define _bit(b) (1U << (b))
 #define _bitl(b) (1UL << (b))

include/i2c.h

@@ -2,6 +2,7 @@
 #define _I2C_H
 
 #include <Arduino.h>
+#include <Wire.h>
 #include <BitBang_I2C.h>
 #include <Wire.h>
 

include/led.h

@@ -1,8 +1,12 @@
 #ifndef _LED_H
 #define _LED_H
 
-//#include <SmartLeds.h>
-//#include "lorawan.h"
+#ifdef RGB_LED_COUNT
+#include <SmartLeds.h>
+#endif
+#ifdef HAS_LORA
+#include "lorawan.h"
+#endif
 
 #ifndef RGB_LED_COUNT
 #define RGB_LED_COUNT 1

include/payload.h

@@ -39,7 +39,6 @@
 #endif
 
 class PayloadConvert {
-
 public:
   PayloadConvert(uint8_t size);
   ~PayloadConvert();
@@ -59,6 +58,7 @@ public:
   void addSensor(uint8_t[]);
   void addTime(time_t value);
   void addSDS(sdsStatus_t value);
+
 private:
   void addChars( char* string, int len);
 
@@ -100,6 +100,6 @@ private:
 };
 
 extern PayloadConvert payload;
-extern uint8_t batt_level;
+extern int8_t batt_level;
 
 #endif // _PAYLOAD_H_

include/power.h

@@ -20,7 +20,7 @@
 
 #ifndef PMU_CHG_CUTOFF
 #ifdef HAS_PMU
-#define PMU_CHG_CUTOFF AXP202_TARGET_VOL_4_2V
+#define PMU_CHG_CUTOFF XPOWERS_CHG_VOL_4V2
 #elif defined HAS_IP5306
 #define PMU_CHG_CUTOFF 0
 #endif
@@ -28,7 +28,7 @@
 
 #ifndef PMU_CHG_CURRENT
 #ifdef HAS_PMU
-#define PMU_CHG_CURRENT AXP1XX_CHARGE_CUR_450MA
+#define PMU_CHG_CURRENT XPOWERS_CHG_CUR_450MA
 #elif defined HAS_IP5306
 #define PMU_CHG_CURRENT 2
 #endif
@@ -55,8 +55,8 @@ void calibrate_voltage(void);
 bool batt_sufficient(void);
 
 #ifdef HAS_PMU
-#include <axp20x.h>
-extern AXP20X_Class pmu;
+#include <XPowersLib.h>
+extern XPowersPMU pmu;
 enum pmu_power_t { pmu_power_on, pmu_power_off, pmu_power_sleep };
 void AXP192_powerevent_IRQ(void);
 void AXP192_power(pmu_power_t powerlevel);
@@ -131,6 +131,6 @@ static inline uint8_t linear(uint16_t voltage, uint16_t minVoltage,
          (maxVoltage - minVoltage);
 }
 
-uint8_t read_battlevel(mapFn_t mapFunction = &sigmoidal);
+int8_t read_battlevel(mapFn_t mapFunction = &sigmoidal);
 
 #endif

include/reset.h

@@ -2,7 +2,7 @@
 #define _RESET_H
 
 #include <driver/rtc_io.h>
-#include <rom/rtc.h>
+#include <soc/reset_reasons.h>
 
 #include "i2c.h"
 #include "lorawan.h"