Merge branch 'development' of https://github.com/cyberman54/ESP32-Paxcounter into development

include/cyclic.h

@@ -5,6 +5,7 @@
 #include "senddata.h"
 #include "rcommand.h"
 #include "spislave.h"
+
 #if(HAS_LORA)
 #include <lmic.h>
 #endif
@@ -13,6 +14,10 @@
 #include "bmesensor.h"
 #endif
 
+#ifdef HAS_DISPLAY
+#include "display.h"
+#endif
+
 extern Ticker housekeeper;
 
 void housekeeping(void);

include/display.h

@@ -1,16 +1,26 @@
 #ifndef _DISPLAY_H
 #define _DISPLAY_H
 
-#include <U8x8lib.h>
 #include "cyclic.h"
+#include "qrcode.h"
 
 extern uint8_t DisplayIsOn;
 
-extern HAS_DISPLAY u8x8;
-
-void init_display(const char *Productname, const char *Version);
 void refreshTheDisplay(bool nextPage = false);
+void init_display(uint8_t verbose = 0);
 void draw_page(time_t t, uint8_t page);
-void DisplayKey(const uint8_t *key, uint8_t len, bool lsb);
+void dp_printf(uint16_t x, uint16_t y, uint8_t font, uint8_t inv,
+               const char *format, ...);
+void dp_printqr(uint16_t offset_x, uint16_t offset_y, const char *Message);
+void oledfillRect(uint16_t x, uint16_t y, uint16_t width, uint16_t height,
+                  uint8_t bRender);
+void oledScrollBufferHorizontal(uint8_t *buf, const uint16_t width,
+                                const uint16_t height, bool left = true);
+void oledScrollBufferVertical(uint8_t *buf, const uint16_t width,
+                              const uint16_t height, int offset = 0);
+int oledDrawPixel(uint8_t *buf, const uint16_t x, const uint16_t y,
+                  const uint8_t dot);
+void oledPlotCurve(uint16_t count, bool reset);
+void oledRescaleBuffer(uint8_t *buf, const int factor);
 
 #endif

include/ledmatrixdisplay.h

@@ -13,6 +13,6 @@ void refreshTheMatrixDisplay(bool nextPage = false);
 void DrawNumber(String strNum, uint8_t iDotPos = 0);
 uint8_t GetCharFromFont(char cChar);
 uint8_t GetCharWidth(char cChar);
-void ScrollLeft(uint8_t *buf, const uint16_t cols, const uint16_t rows);
+void ScrollMatrixLeft(uint8_t *buf, const uint16_t cols, const uint16_t rows);
 
 #endif

include/ota.h

@@ -4,6 +4,7 @@
 #ifdef USE_OTA
 
 #include "globals.h"
+#include <ss_oled.h>
 #include <Update.h>
 #include <WiFi.h>
 #include <WiFiClientSecure.h>
@@ -14,11 +15,9 @@
 int do_ota_update();
 void start_ota_update();
 int version_compare(const String v1, const String v2);
-void display(const uint8_t row, const std::string status,
-                       const std::string msg);
-#ifdef HAS_DISPLAY
+void ota_display(const uint8_t row, const std::string status,
+                 const std::string msg);
 void show_progress(unsigned long current, unsigned long size);
-#endif
 
 #endif // USE_OTA
 

include/power.h

@@ -19,6 +19,8 @@ void power_event_IRQ(void);
 void AXP192_power(bool on);
 void AXP192_init(void);
 void AXP192_showstatus(void);
+uint8_t i2c_writeBytes(uint8_t addr, uint8_t reg, uint8_t *data, uint8_t len);
+uint8_t i2c_readBytes(uint8_t addr, uint8_t reg, uint8_t *data, uint8_t len);
 #endif // HAS_PMU
 
 #endif

include/senddata.h

@@ -2,10 +2,15 @@
 #define _SENDDATA_H
 
 #include "spislave.h"
+#include "cyclic.h"
+
 #if(HAS_LORA)
 #include "lorawan.h"
 #endif
-#include "cyclic.h"
+
+#ifdef HAS_DISPLAY
+#include "display.h"
+#endif
 
 extern Ticker sendcycler;
 

include/timesync.h

@@ -7,12 +7,15 @@
 #include "timekeeper.h"
 
 //#define TIME_SYNC_TRIGGER 100 // threshold for time sync [milliseconds]
-#define TIME_SYNC_FRAME_LENGTH 0x06 // timeserver answer frame length [bytes]
+#define TIME_SYNC_FRAME_LENGTH 0x07 // timeserver answer frame length [bytes]
 #define TIME_SYNC_FIXUP 4 // calibration to fixup processing time [milliseconds]
+#define TIMEREQUEST_MAX_SEQNO 0xf0 // threshold for wrap around seqno
 
 void timesync_init(void);
 void send_timesync_req(void);
+
 int recv_timesync_ans(const uint8_t buf[], uint8_t buf_len);
+
 void process_timesync_req(void *taskparameter);
 void store_time_sync_req(uint32_t t_millisec);