fix WEIGHT_HX711,GPSRaw,BPS_QMP6988,RTC_BM8563,PDM_SPM1423 compile issues

Author: Gitshaoxiang

examples/Modules/COM_LoRaWAN915/TFTTerminal.cpp

@@ -0,0 +1,131 @@
+#include "TFTTerminal.h"
+
+TFTTerminal::TFTTerminal(TFT_eSprite *dis_buff_ptr) {
+    _dis_buff_ptr = dis_buff_ptr;
+    memset(discharbuff, 0, 55 * 60);
+}
+
+TFTTerminal::~TFTTerminal() {
+}
+
+void TFTTerminal::setcolor(uint16_t color, uint16_t bk_color) {
+    _color   = color;
+    _bkcolor = bk_color;
+}
+
+void TFTTerminal::setGeometry(uint16_t x, uint16_t y, uint16_t w, uint16_t h) {
+    _win_x_pos = x;
+    _win_y_pos = y;
+    _win_w     = w;
+    _win_h     = h;
+
+    _line_x_limit = _win_w / _font_x_size;
+    _line_y_limit = _win_h / _font_y_size;
+}
+
+void TFTTerminal::setFontsize(uint8_t size) {
+    size         = (size == 0) ? 1 : size;
+    _font_x_size = 5 * size;
+    _font_y_size = 6 * size;
+    _fontSize    = size;
+
+    _line_x_limit = _win_w / _font_x_size;
+    _line_y_limit = _win_h / _font_y_size;
+}
+
+size_t TFTTerminal::write(uint8_t chardata) {
+    bool flush_page_flag = false;
+    uint8_t dis_y_pos    = 0;
+
+    if ((chardata == '\r') || (chardata == '\n')) {
+        xpos = 0;
+        ypos++;
+        ypos = ypos % 60;
+        memset(discharbuff[ypos % 60], 0, 55);
+        return 1;
+    } else if (xpos >= _line_x_limit) {
+        xpos = 0;
+        ypos++;
+        ypos = ypos % 60;
+        memset(discharbuff[ypos % 60], 0, 55);
+    }
+
+    discharbuff[ypos][xpos] = chardata;
+    xpos++;
+
+    if ((dispos <= ypos) && ((ypos - dispos) > _line_y_limit)) {
+        dispos          = ypos - _line_y_limit;
+        flush_page_flag = true;
+    } else if ((dispos <= ypos) && ((ypos - dispos) <= _line_y_limit)) {
+        dis_y_pos       = ypos - dispos;
+        flush_page_flag = false;
+    } else if ((dispos > ypos) && ((60 - (dispos - ypos)) > _line_y_limit)) {
+        dispos          = 60 - (_line_y_limit - ypos);
+        flush_page_flag = true;
+    } else if ((dispos > ypos) && ((60 - (dispos - ypos)) > _line_y_limit)) {
+        dis_y_pos       = 60 - (dispos - ypos);
+        flush_page_flag = false;
+    }
+
+    dispos = dispos % 60;
+
+    _dis_buff_ptr->setTextColor(_color);
+    _dis_buff_ptr->setTextSize(_fontSize);
+
+    if (flush_page_flag) {
+        _dis_buff_ptr->fillSprite(_bkcolor);
+
+        for (size_t i = 0; i < _line_y_limit; i++) {
+            _dis_buff_ptr->drawString((char *)discharbuff[(dispos + i) % 60], 0,
+                                      i * _font_y_size);
+        }
+    } else {
+        _dis_buff_ptr->drawChar(chardata, (xpos - 1) * _font_x_size,
+                                dis_y_pos * _font_y_size);
+    }
+    _dis_buff_ptr->pushSprite(_win_x_pos, _win_y_pos);
+
+    return 1;
+}
+
+size_t TFTTerminal::write(const uint8_t *buffer, size_t size) {
+    while ((size != 0) && (*buffer != '\0')) {
+        if ((*buffer == '\r') || (*buffer == '\n')) {
+            xpos = 0;
+            ypos++;
+            ypos = ypos % 60;
+            memset(discharbuff[ypos % 60], 0, 55);
+            buffer++;
+            size--;
+            continue;
+        } else if (xpos >= _line_x_limit) {
+            xpos = 0;
+            ypos++;
+            ypos = ypos % 60;
+            memset(discharbuff[ypos % 60], 0, 55);
+        }
+        discharbuff[ypos][xpos] = *buffer;
+        xpos++;
+        buffer++;
+        size--;
+    }
+
+    if ((dispos <= ypos) && ((ypos - dispos) > _line_y_limit)) {
+        dispos = ypos - _line_y_limit;
+    } else if ((dispos > ypos) && ((60 - (dispos - ypos)) > _line_y_limit)) {
+        dispos = 60 - (_line_y_limit - ypos);
+    }
+
+    dispos = dispos % 60;
+
+    _dis_buff_ptr->setTextColor(_color);
+    _dis_buff_ptr->setTextSize(_fontSize);
+    _dis_buff_ptr->fillSprite(_bkcolor);
+    //_dis_buff_ptr->fillRect(_win_x_pos, _win_y_pos, _win_w, _win_h, _bkcolor);
+    for (size_t i = 0; i < _line_y_limit; i++) {
+        _dis_buff_ptr->drawString((char *)discharbuff[(dispos + i) % 60], 0,
+                                  i * _font_y_size);
+    }
+    _dis_buff_ptr->pushSprite(_win_x_pos, _win_y_pos);
+    return 1;
+}

examples/Modules/COM_LoRaWAN915/TFTTerminal.h

@@ -0,0 +1,33 @@
+#ifndef _TFTTERMINAL_H_
+#define _TFTTERMINAL_H_
+
+#include <M5Stack.h>
+#include <Print.h>
+
+class TFTTerminal : public Print {
+   private:
+    TFT_eSprite *disptr;
+    char discharbuff[60][55];
+    uint32_t xpos = 0, ypos = 0, dispos = 0;
+    TFT_eSprite *_dis_buff_ptr = NULL;
+    uint16_t _bkcolor          = TFT_BLACK;
+    uint16_t _color            = TFT_GREEN;
+
+    uint16_t _win_x_pos = 0, _win_y_pos = 0, _win_w = 320, _win_h = 240;
+    uint16_t _font_x_size = 6, _font_y_size = 8;
+    uint8_t _fontSize      = 0;
+    uint16_t _line_x_limit = 53, _line_y_limit = 30;
+
+   public:
+    TFTTerminal(TFT_eSprite *dis_buff_ptr);
+    ~TFTTerminal();
+
+    void setcolor(uint16_t color, uint16_t bk_color);
+    void setGeometry(uint16_t x, uint16_t y, uint16_t w, uint16_t h);
+    void setFontsize(uint8_t size);
+
+    size_t write(uint8_t);
+    size_t write(const uint8_t *buffer, size_t size);
+};
+
+#endif

examples/Unit/BPS_QMP6988/BPS_QMP6988.ino

@@ -14,7 +14,7 @@ the display screen 请连接端口A(22、21),读取大气压强并在显示屏
 */
 #include <M5Stack.h>
 
-#include "UNIT_ENV.h"
+#include "M5_ENV.h"
 #include "Wire.h"  //The BPS uses I2C comunication.
 
 QMP6988 qmp6988;

examples/Unit/CAN/CAN.ino

@@ -19,8 +19,8 @@ https://github.com/miwagner/ESP32-Arduino-CAN
 
 #include <CAN_config.h>
 #include <ESP32CAN.h>
-#include <M5GFX.h>
 #include <M5Stack.h>
+#include <M5GFX.h>
 
 M5GFX display;
 M5Canvas canvas(&display);

examples/Unit/GPS_AT6558/GPSRaw/GPSRaw.ino

@@ -3,19 +3,29 @@
    for debugging and functional verification.
 */
 #include <M5Stack.h>
+#include "M5GFX.h"
 
 HardwareSerial GPSRaw(2);
 
+M5GFX display;
+M5Canvas canvas(&display);
+
 void setup() {
     M5.begin();
     M5.Power.begin();
     GPSRaw.begin(9600);
 
-    Serial.println("hello");
-    termInit();
-    M5.Lcd.setTextFont(4);
-    M5.Lcd.setCursor(50, 100, 4);
-    M5.Lcd.println(("GPS Raw Example"));
+    display.begin();
+
+    canvas.setColorDepth(1);  // mono color
+    canvas.setFont(&fonts::efontCN_14);
+    canvas.createSprite(display.width(), display.height());
+    canvas.setTextSize(2);
+    canvas.setPaletteColor(1, GREEN);
+    canvas.setTextScroll(true);
+
+    canvas.println("GPS Raw Example");
+    canvas.pushSprite(0, 0);
 }
 
 void loop() {
@@ -28,6 +38,7 @@ void loop() {
     if (GPSRaw.available()) {
         int ch = GPSRaw.read();
         Serial.write(ch);
-        termPutchar(ch);
+        canvas.print(ch);
+        canvas.pushSprite(0, 0);
     }
 }