Skip to content

Commit ba96bb1

Browse files
committed
test new screen
1 parent 944d1fc commit ba96bb1

4 files changed

Lines changed: 82 additions & 4 deletions

File tree

src/LoRa_APRS_iGate.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ ___________________________________________________________________*/
6868
#endif
6969

7070

71-
String versionDate = "2026-03-25";
72-
String versionNumber = "3.2.3";
71+
String versionDate = "2026-04-20";
72+
String versionNumber = "3.2.3.1";
7373
Configuration Config;
7474
WiFiClient aprsIsClient;
7575
WiFiClient mqttClient;

src/display.cpp

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,12 @@
6565
#ifdef HELTEC_WSL_V3_DISPLAY
6666
Adafruit_SSD1306 display(128, 64, &Wire1, OLED_RST);
6767
#else
68-
Adafruit_SSD1306 display(128, 64, &Wire, OLED_RST);
68+
#if defined RPC_LORA_DIGIGATE_1W
69+
#define SCREEN_HEIGHT 32
70+
#else
71+
#define SCREEN HEIGHT 64
72+
#endif
73+
Adafruit_SSD1306 display(128, SCREEN_HEIGHT, &Wire, OLED_RST);
6974
#endif
7075
#endif
7176
#endif
@@ -75,6 +80,7 @@
7580
extern Configuration Config;
7681

7782
bool displayFound = false;
83+
int maxLines;
7884

7985
void displaySetup() {
8086
#ifdef HAS_DISPLAY
@@ -97,6 +103,11 @@ void displaySetup() {
97103
sprite.createSprite(160, 80);
98104
#endif
99105
#else
106+
#if (SCREEN_HEIGHT == 64)
107+
maxLines = 6;
108+
#elif (SCREEN_HEIGHT == 32)
109+
maxLines = 3;
110+
#endif
100111
#ifdef HAS_EPAPER
101112
display.landscape();
102113
display.printCenter("LoRa APRS iGate Initialising...");
@@ -297,7 +308,7 @@ void displayShow(const String& header, const String& line1, const String& line2,
297308
display.setCursor(0, 0);
298309
display.println(header);
299310
display.setTextSize(1);
300-
for (int i = 0; i < 6; i++) {
311+
for (int i = 0; i < maxLines; i++) {
301312
display.setCursor(0, 16 + (8 * i));
302313
display.println(*lines[i]);
303314
}
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/* Copyright (C) 2025 Ricardo Guzman - CA2RXU
2+
*
3+
* This file is part of LoRa APRS iGate.
4+
*
5+
* LoRa APRS iGate is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* LoRa APRS iGate is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with LoRa APRS iGate. If not, see <https://www.gnu.org/licenses/>.
17+
*/
18+
19+
#ifndef BOARD_PINOUT_H_
20+
#define BOARD_PINOUT_H_
21+
22+
// LoRa Radio
23+
#define HAS_SX1268
24+
#define HAS_1W_LORA
25+
#define HAS_TCXO
26+
#define RADIO_SCLK_PIN 18
27+
#define RADIO_MISO_PIN 19
28+
#define RADIO_MOSI_PIN 23
29+
#define RADIO_CS_PIN 5
30+
#define RADIO_RST_PIN 27
31+
#define RADIO_DIO1_PIN 12
32+
#define RADIO_BUSY_PIN 14
33+
#define RADIO_RXEN 32
34+
#define RADIO_TXEN 25
35+
#define RADIO_WAKEUP_PIN RADIO_DIO1_PIN
36+
#define GPIO_WAKEUP_PIN GPIO_SEL_12
37+
38+
// I2C
39+
#define USE_WIRE_WITH_OLED_PINS
40+
41+
// Display
42+
#define HAS_DISPLAY
43+
44+
#undef OLED_SDA
45+
#undef OLED_SCL
46+
#undef OLED_RST
47+
48+
#define OLED_SDA 21
49+
#define OLED_SCL 22
50+
#define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin)
51+
52+
// Aditional Config
53+
#define INTERNAL_LED_PIN 2
54+
#define BATTERY_PIN 35
55+
56+
#endif
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[env:RPC_LORA_DIGIGATE_1W]
2+
board = esp32dev
3+
build_flags =
4+
${common.build_flags}
5+
-D RADIOLIB_EXCLUDE_LR11X0=1
6+
-D RADIOLIB_EXCLUDE_SX127X=1
7+
-D RADIOLIB_EXCLUDE_SX128X=1
8+
-D RPC_LORA_DIGIGATE_1W
9+
lib_deps =
10+
${common.lib_deps}
11+
${common.display_libs}

0 commit comments

Comments
 (0)