Skip to content
This repository was archived by the owner on Sep 14, 2025. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/Display/SSD1306.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#include "SSD1306.h"
#include "../System/System.h"

#define MODULE_NAME "SSD1306"

extern System LoRaSystem;

SSD1306::SSD1306(TwoWire *wire, uint8_t address, OLEDDISPLAY_GEOMETRY g) : OLEDDisplay(g), _wire(wire), _address(address) {
sendInitCommands();
Expand All @@ -23,13 +28,21 @@ void SSD1306::internDisplay(Bitmap *bitmap) {
Wire.write(bitmap->_buffer[i]);
i++;
}
Wire.endTransmission();
int ret = Wire.endTransmission();
if (ret != 0)
{
LoRaSystem.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, MODULE_NAME, "send bitmap error");
}
}
}

void SSD1306::sendCommand(uint8_t command) {
_wire->beginTransmission(_address);
_wire->write(0x80);
_wire->write(command);
_wire->endTransmission();
int ret = _wire->endTransmission();
if (ret != 0)
{
LoRaSystem.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, MODULE_NAME, "command error");
}
}
9 changes: 8 additions & 1 deletion src/LoRa_APRS_iGate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ BeaconTask beaconTask(toModem, toAprsIs);
void setup() {
Serial.begin(115200);
LoRaSystem.getLogger().setSerial(&Serial);

#ifdef HELTEC_V3
// Power the display
pinMode(36, OUTPUT);
digitalWrite(36, LOW);
#endif

setWiFiLogger(&LoRaSystem.getLogger());
delay(1000);
LoRaSystem.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_INFO, MODULE_NAME, "LoRa APRS iGate by OE5BPA (Peter Buchegger)");
Expand Down Expand Up @@ -150,7 +157,7 @@ void setup() {
;
}

if (userConfig.display.overwritePin != 0) {
if (userConfig.display.overwritePin != -1) {
pinMode(userConfig.display.overwritePin, INPUT);
pinMode(userConfig.display.overwritePin, INPUT_PULLUP);
}
Expand Down
2 changes: 1 addition & 1 deletion src/TaskDisplay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ bool DisplayTask::setup(System &system) {
}

bool DisplayTask::loop(System &system) {
if (system.getUserConfig()->display.overwritePin != 0 && !digitalRead(system.getUserConfig()->display.overwritePin)) {
if (system.getUserConfig()->display.overwritePin != -1 && !digitalRead(system.getUserConfig()->display.overwritePin)) {
system.getDisplay().activateDistplay();
}
system.getDisplay().update();
Expand Down
2 changes: 1 addition & 1 deletion src/project_configuration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ void ProjectConfigurationManagement::readProjectConfiguration(JsonDocument &data

conf.display.alwaysOn = data["display"]["always_on"] | true;
conf.display.timeout = data["display"]["timeout"] | 10;
conf.display.overwritePin = data["display"]["overwrite_pin"] | 0;
conf.display.overwritePin = data["display"]["overwrite_pin"] | -1;
conf.display.turn180 = data["display"]["turn180"] | true;

conf.ftp.active = data["ftp"]["active"] | false;
Expand Down
2 changes: 1 addition & 1 deletion variants/heltec_v3/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
extends = esp32s3_base
board = heltec_wifi_lora_32_V3
build_flags =
${esp32s3_base.build_flags} -DHELTEC_V3 -DUSE_SX1268
${esp32s3_base.build_flags} -DHELTEC_V3 -DUSE_SX1268 -DOLED_SDA=SDA_OLED -DOLED_SCL=SCL_OLED -DRESET_OLED=21