ua1zbe
/
LoRa_APRS_iGate111
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

first test

This commit is contained in:
richonguzman 2024-08-16 15:52:20 -04:00
parent 4fb4712a33
commit ee687e6959
5 changed files with 120 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
platformio.ini
View File

@ -439,3 +439,15 @@ lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 adafruit/Adafruit GFX Library @ 1.11.9
adafruit/Adafruit SSD1306 @ 2.5.10 adafruit/Adafruit SSD1306 @ 2.5.10
[env:heltec_wireless_paper]
board = esp32-s3-devkitc-1
board_build.mcu = esp32s3
build_flags =
-Werror -Wall
-DHELTEC_WP
-DHAS_SX1262
-DHAS_EPAPER
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps =
${common.lib_deps}

4
src/battery_utils.cpp
View File

@ -99,7 +99,7 @@ namespace BATTERY_Utils {
int sample; int sample;
int sampleSum = 0; int sampleSum = 0;
#ifdef ADC_CTRL #ifdef ADC_CTRL
#if defined(HELTEC_WIRELESS_TRACKER) #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_WP)
digitalWrite(ADC_CTRL, HIGH); digitalWrite(ADC_CTRL, HIGH);
#endif #endif
#if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3)
@ -130,7 +130,7 @@ namespace BATTERY_Utils {
} }
#ifdef ADC_CTRL #ifdef ADC_CTRL
#if defined(HELTEC_WIRELESS_TRACKER) #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_WP)
digitalWrite(ADC_CTRL, LOW); digitalWrite(ADC_CTRL, LOW);
#endif #endif
#if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3)

19
src/boards_pinout.h
View File

@ -18,7 +18,7 @@
#define RADIO_BUSY_PIN 26 // GPIO26 - SX1278 IRQ ---->DIO0 #define RADIO_BUSY_PIN 26 // GPIO26 - SX1278 IRQ ---->DIO0
#endif #endif
#if defined(HELTEC_V3) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY) || defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_WS) #if defined(HELTEC_V3) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY) || defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_WS) || defined(HELTEC_WP)
#define RADIO_SCLK_PIN 9 // SX1262 SCK #define RADIO_SCLK_PIN 9 // SX1262 SCK
#define RADIO_MISO_PIN 11 // SX1262 MISO #define RADIO_MISO_PIN 11 // SX1262 MISO
#define RADIO_MOSI_PIN 10 // SX1262 MOSI #define RADIO_MOSI_PIN 10 // SX1262 MOSI
@ -84,7 +84,7 @@
#define RADIO_TXEN 13 #define RADIO_TXEN 13
#endif #endif
#ifdef HELTEC_HTCT62 #if defined(HELTEC_HTCT62)
#define RADIO_SCLK_PIN 10 // SX1262 SCK #define RADIO_SCLK_PIN 10 // SX1262 SCK
#define RADIO_MISO_PIN 6 // SX1262 MISO #define RADIO_MISO_PIN 6 // SX1262 MISO
#define RADIO_MOSI_PIN 7 // SX1262 MOSI #define RADIO_MOSI_PIN 7 // SX1262 MOSI
@ -204,6 +204,21 @@
#define BOARD_I2C_SCL 6 #define BOARD_I2C_SCL 6
#endif #endif
#ifdef HELTEC_WP
#define INTERNAL_LED_PIN 18
#define BATTERY_PIN 20
#define ADC_CTRL 19
#define VEXT_CTRL 45
#define BOARD_I2C_SDA 37
#define BOARD_I2C_SCL 36
#define EPAPER_BUSY 7
#define EPAPER_RST 6
#define EPAPER_DC 5
#define EPAPER_CS 4
#define EPAPER_SCL 3
#define EPAPER_SDA 2
#endif
#ifdef ESP32_C3_DIY_LoRa // just testing! #ifdef ESP32_C3_DIY_LoRa // just testing!
#define OLED_SDA 8 #define OLED_SDA 8
#define OLED_SCL 9 #define OLED_SCL 9

141
src/display.cpp
View File

@ -16,15 +16,19 @@
#define lineSpacing 12 #define lineSpacing 12
#endif #endif
#else #else
#include <Adafruit_GFX.h> #if HAS_EPAPER
#include <Adafruit_SSD1306.h> //
#if defined(HELTEC_V3)
#define OLED_DISPLAY_HAS_RST_PIN
#endif
#ifdef HELTEC_WSL_V3_DISPLAY
Adafruit_SSD1306 display(128, 64, &Wire1, OLED_RST);
#else #else
Adafruit_SSD1306 display(128, 64, &Wire, OLED_RST); #include <Adafruit_GFX.h>
#include <Adafruit_SSD1306.h>
#if defined(HELTEC_V3)
#define OLED_DISPLAY_HAS_RST_PIN
#endif
#ifdef HELTEC_WSL_V3_DISPLAY
Adafruit_SSD1306 display(128, 64, &Wire1, OLED_RST);
#else
Adafruit_SSD1306 display(128, 64, &Wire, OLED_RST);
#endif
#endif #endif
#endif #endif
#endif #endif
@ -53,31 +57,35 @@ void displaySetup() {
tft.setTextFont(0); tft.setTextFont(0);
tft.fillScreen(TFT_BLACK); tft.fillScreen(TFT_BLACK);
#else #else
#ifdef OLED_DISPLAY_HAS_RST_PIN #if HAS_EPAPER
pinMode(OLED_RST, OUTPUT); //
digitalWrite(OLED_RST, LOW); #else
delay(20); #ifdef OLED_DISPLAY_HAS_RST_PIN
digitalWrite(OLED_RST, HIGH); pinMode(OLED_RST, OUTPUT);
#endif digitalWrite(OLED_RST, LOW);
delay(20);
digitalWrite(OLED_RST, HIGH);
#endif
#ifndef HELTEC_WSL_V3_DISPLAY #ifndef HELTEC_WSL_V3_DISPLAY
Wire.begin(OLED_SDA, OLED_SCL); Wire.begin(OLED_SDA, OLED_SCL);
#endif #endif
if(!display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) { if(!display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) {
Serial.println(F("SSD1306 allocation failed")); Serial.println(F("SSD1306 allocation failed"));
for(;;); // Don't proceed, loop forever for(;;); // Don't proceed, loop forever
} }
if (Config.display.turn180) { if (Config.display.turn180) {
display.setRotation(2); display.setRotation(2);
} }
display.clearDisplay(); display.clearDisplay();
display.setTextColor(WHITE); display.setTextColor(WHITE);
display.setTextSize(1); display.setTextSize(1);
display.setCursor(0, 0); display.setCursor(0, 0);
display.ssd1306_command(SSD1306_SETCONTRAST); display.ssd1306_command(SSD1306_SETCONTRAST);
display.ssd1306_command(1); display.ssd1306_command(1);
display.display(); display.display();
#endif
#endif #endif
delay(1000); delay(1000);
#endif #endif
@ -89,13 +97,21 @@ void displayToggle(bool toggle) {
#ifdef HAS_TFT #ifdef HAS_TFT
digitalWrite(TFT_BL, HIGH); digitalWrite(TFT_BL, HIGH);
#else #else
display.ssd1306_command(SSD1306_DISPLAYON); #if HAS_EPAPER
// ... to be continued
#else
display.ssd1306_command(SSD1306_DISPLAYON);
#endif
#endif #endif
} else { } else {
#ifdef HAS_TFT #ifdef HAS_TFT
digitalWrite(TFT_BL, LOW); digitalWrite(TFT_BL, LOW);
#else #else
display.ssd1306_command(SSD1306_DISPLAYOFF); #if HAS_EPAPER
// ... to be continued
#else
display.ssd1306_command(SSD1306_DISPLAYOFF);
#endif
#endif #endif
} }
#endif #endif
@ -145,18 +161,22 @@ void displayShow(const String& header, const String& line1, const String& line2,
tft.print(*lines[i]); tft.print(*lines[i]);
} }
#else #else
display.clearDisplay(); #ifdef HAS_EPAPER
display.setTextColor(WHITE); // ... to be continued
display.setTextSize(1); #else
display.setCursor(0, 0); display.clearDisplay();
display.println(header); display.setTextColor(WHITE);
for (int i = 0; i < 3; i++) { display.setTextSize(1);
display.setCursor(0, 8 + (8 * i)); display.setCursor(0, 0);
display.println(*lines[i]); display.println(header);
} for (int i = 0; i < 3; i++) {
display.ssd1306_command(SSD1306_SETCONTRAST); display.setCursor(0, 8 + (8 * i));
display.ssd1306_command(1); display.println(*lines[i]);
display.display(); }
display.ssd1306_command(SSD1306_SETCONTRAST);
display.ssd1306_command(1);
display.display();
#endif
#endif #endif
delay(wait); delay(wait);
#endif #endif
@ -179,20 +199,23 @@ void displayShow(const String& header, const String& line1, const String& line2,
tft.print(*lines[i]); tft.print(*lines[i]);
} }
#else #else
display.clearDisplay(); #ifdef HAS_EPAPER
display.setTextColor(WHITE); // ... to be continued
display.setTextSize(2); #else
display.setCursor(0, 0); display.clearDisplay();
display.println(header); display.setTextColor(WHITE);
display.setTextSize(1); display.setTextSize(2);
for (int i = 0; i < 6; i++) { display.setCursor(0, 0);
display.setCursor(0, 16 + (8 * i)); display.println(header);
display.println(*lines[i]); display.setTextSize(1);
} for (int i = 0; i < 6; i++) {
display.ssd1306_command(SSD1306_SETCONTRAST); display.setCursor(0, 16 + (8 * i));
display.ssd1306_command(1); display.println(*lines[i]);
display.display(); }
display.ssd1306_command(SSD1306_SETCONTRAST);
display.ssd1306_command(1);
display.display();
#endif
#endif #endif
delay(wait); delay(wait);
#endif #endif
}

5
src/power_utils.cpp
View File

@ -154,13 +154,16 @@ namespace POWER_Utils {
#ifndef HELTEC_WSL_V3 #ifndef HELTEC_WSL_V3
digitalWrite(VEXT_CTRL, HIGH); digitalWrite(VEXT_CTRL, HIGH);
#endif #endif
#ifdef HELTEC_WP
digitalWrite(VEXT_CTRL, LOW);
#endif
#endif #endif
#ifdef ADC_CTRL #ifdef ADC_CTRL
pinMode(ADC_CTRL, OUTPUT); pinMode(ADC_CTRL, OUTPUT);
#endif #endif
#ifdef HELTEC_WIRELESS_TRACKER #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_WP)
Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL); Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
#endif #endif