jlpoole/LilyGo-LoRa-Series
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixed build

Browse source
This commit is contained in:
lewisxhe 2026-01-27 16:28:07 +08:00
commit 30ce7f099d
68 changed files with 611 additions and 611 deletions
Download patch file Download diff file Expand all files Collapse all files

6
examples/RadioLibExamples/Receive_Interrupt/LoRaBoards.h
View file

@ -114,9 +114,9 @@ void disablePeripherals();
#endif
#ifdef DISPLAY_MODEL
extern DISPLAY_MODEL *u8g2;
#define U8G2_HOR_ALIGN_CENTER(t) ((u8g2->getDisplayWidth() - (u8g2->getUTF8Width(t))) / 2)
#define U8G2_HOR_ALIGN_RIGHT(t) ( u8g2->getDisplayWidth() - u8g2->getUTF8Width(t))
extern U8G2 *disp;
#define U8G2_HOR_ALIGN_CENTER(t) ((disp->getDisplayWidth() - (disp->getUTF8Width(t))) / 2)
#define U8G2_HOR_ALIGN_RIGHT(t) ( disp->getDisplayWidth() - disp->getUTF8Width(t))
#endif

36
examples/RadioLibExamples/Receive_Interrupt/Receive_Interrupt.ino
View file

@ -447,24 +447,24 @@ void loop()
void drawMain()
{
if (u8g2) {
u8g2->clearBuffer();
u8g2->drawRFrame(0, 0, 128, 64, 5);
u8g2->setFont(u8g2_font_pxplusibmvga8_mr);
u8g2->setCursor(15, 20);
u8g2->print("RX:");
u8g2->setCursor(15, 35);
u8g2->print("SNR:");
u8g2->setCursor(15, 50);
u8g2->print("RSSI:");
if (disp) {
disp->clearBuffer();
disp->drawRFrame(0, 0, 128, 64, 5);
disp->setFont(u8g2_font_pxplusibmvga8_mr);
disp->setCursor(15, 20);
disp->print("RX:");
disp->setCursor(15, 35);
disp->print("SNR:");
disp->setCursor(15, 50);
disp->print("RSSI:");
u8g2->setFont(u8g2_font_crox1h_tr);
u8g2->setCursor( U8G2_HOR_ALIGN_RIGHT(payload.c_str()) - 21, 20 );
u8g2->print(payload);
u8g2->setCursor( U8G2_HOR_ALIGN_RIGHT(snr.c_str()) - 21, 35 );
u8g2->print(snr);
u8g2->setCursor( U8G2_HOR_ALIGN_RIGHT(rssi.c_str()) - 21, 50 );
u8g2->print(rssi);
u8g2->sendBuffer();
disp->setFont(u8g2_font_crox1h_tr);
disp->setCursor( U8G2_HOR_ALIGN_RIGHT(payload.c_str()) - 21, 20 );
disp->print(payload);
disp->setCursor( U8G2_HOR_ALIGN_RIGHT(snr.c_str()) - 21, 35 );
disp->print(snr);
disp->setCursor( U8G2_HOR_ALIGN_RIGHT(rssi.c_str()) - 21, 50 );
disp->print(rssi);
disp->sendBuffer();
}
}

38
examples/RadioLibExamples/SX1280/Ranging_Master/Ranging_Master.ino
View file

@ -67,9 +67,9 @@ void setup()
delay(1000);
} else {
Serial.println(F("No device responding"));
u8g2->clearBuffer();
u8g2->drawStr(0, 12, "No device responding");
u8g2->sendBuffer();
disp->clearBuffer();
disp->drawStr(0, 12, "No device responding");
disp->sendBuffer();
while (1) {
led_Flash(50, 50); //long fast speed flash indicates device error
}
@ -89,19 +89,19 @@ void setup()
Serial.println();
#ifdef ENABLEDISPLAY
if (u8g2) {
if (disp) {
Serial.println("Display Enabled");
u8g2->setFont(u8g2_font_unifont_t_chinese2); // use chinese2 for all the glyphs of "你好世界"
u8g2->setFontDirection(0);
disp->setFont(u8g2_font_unifont_t_chinese2); // use chinese2 for all the glyphs of "你好世界"
disp->setFontDirection(0);
char buf[256];
u8g2->clearBuffer();
u8g2->drawStr(0, 12, "Ranging RAW Ready");
disp->clearBuffer();
disp->drawStr(0, 12, "Ranging RAW Ready");
snprintf(buf, sizeof(buf), "Power:%.d dBm", RangingTXPower);
u8g2->drawStr(0, 12 * 2, buf);
disp->drawStr(0, 12 * 2, buf);
snprintf(buf, sizeof(buf), "Cal: %d ", Calibration);
u8g2->drawStr(0, 12 * 3, buf);
disp->drawStr(0, 12 * 3, buf);
snprintf(buf, sizeof(buf), "Adjust: %d ", distance_adjustment);
u8g2->sendBuffer();
disp->sendBuffer();
}
#endif
@ -176,19 +176,19 @@ void loop()
Serial.print(distance_average, 1);
#ifdef ENABLEDISPLAY
if (u8g2) {
u8g2->clearBuffer();
if (disp) {
disp->clearBuffer();
char buf[256];
u8g2->drawStr(0, 12, "Rang_Master");
disp->drawStr(0, 12, "Rang_Master");
snprintf(buf, sizeof(buf), "Distance:%.2f m", distance_average);
u8g2->drawStr(0, 12 * 2, buf);
disp->drawStr(0, 12 * 2, buf);
snprintf(buf, sizeof(buf), "RSSI: %d dBm", RangingRSSI);
u8g2->drawStr(0, 12 * 3, buf);
disp->drawStr(0, 12 * 3, buf);
// snprintf(buf, sizeof(buf), "OK: %d ", rangeings_valid);
// u8g2->drawStr(0, 12 * 4, buf);
// disp->drawStr(0, 12 * 4, buf);
// snprintf(buf, sizeof(buf), "Err: %d ", rangeing_errors);
// u8g2->drawStr(0, 12 * 5, buf);
u8g2->sendBuffer();
// disp->drawStr(0, 12 * 5, buf);
disp->sendBuffer();
}
#endif

72
examples/RadioLibExamples/SX1280/Ranging_Master/boards.h
View file

@ -11,7 +11,7 @@
#ifdef HAS_DISPLAY
#include <U8g2lib.h>
U8G2_SSD1306_128X64_NONAME_F_HW_I2C *u8g2 = nullptr;
U8G2_SSD1306_128X64_NONAME_F_HW_I2C *disp = nullptr;
#endif
Ticker ledTicker;
@ -144,68 +144,68 @@ void initBoard()
Wire.beginTransmission(0x3C);
if (Wire.endTransmission() == 0) {
Serial.println("Started OLED");
u8g2 = new U8G2_SSD1306_128X64_NONAME_F_HW_I2C(U8G2_R0, U8X8_PIN_NONE);
u8g2->begin();
u8g2->clearBuffer();
u8g2->setFlipMode(0);
u8g2->setFontMode(1); // Transparent
u8g2->setDrawColor(1);
u8g2->setFontDirection(0);
u8g2->firstPage();
disp = new U8G2_SSD1306_128X64_NONAME_F_HW_I2C(U8G2_R0, U8X8_PIN_NONE);
disp->begin();
disp->clearBuffer();
disp->setFlipMode(0);
disp->setFontMode(1); // Transparent
disp->setDrawColor(1);
disp->setFontDirection(0);
disp->firstPage();
do {
u8g2->setFont(u8g2_font_inb19_mr);
u8g2->drawStr(0, 30, "LilyGo");
u8g2->drawHLine(2, 35, 47);
u8g2->drawHLine(3, 36, 47);
u8g2->drawVLine(45, 32, 12);
u8g2->drawVLine(46, 33, 12);
u8g2->setFont(u8g2_font_inb19_mf);
u8g2->drawStr(58, 60, "LoRa");
} while ( u8g2->nextPage() );
u8g2->sendBuffer();
u8g2->setFont(u8g2_font_fur11_tf);
disp->setFont(u8g2_font_inb19_mr);
disp->drawStr(0, 30, "LilyGo");
disp->drawHLine(2, 35, 47);
disp->drawHLine(3, 36, 47);
disp->drawVLine(45, 32, 12);
disp->drawVLine(46, 33, 12);
disp->setFont(u8g2_font_inb19_mf);
disp->drawStr(58, 60, "LoRa");
} while ( disp->nextPage() );
disp->sendBuffer();
disp->setFont(u8g2_font_fur11_tf);
delay(3000);
}
#endif
#ifdef HAS_SDCARD
if (u8g2) {
u8g2->setFont(u8g2_font_ncenB08_tr);
if (disp) {
disp->setFont(u8g2_font_ncenB08_tr);
}
pinMode(SDCARD_MISO, INPUT_PULLUP);
SDSPI.begin(SDCARD_SCLK, SDCARD_MISO, SDCARD_MOSI, SDCARD_CS);
if (u8g2) {
u8g2->clearBuffer();
if (disp) {
disp->clearBuffer();
}
if (!SD.begin(SDCARD_CS, SDSPI)) {
Serial.println("setupSDCard FAIL");
if (u8g2) {
if (disp) {
do {
u8g2->setCursor(0, 16);
u8g2->println( "SDCard FAILED");;
} while ( u8g2->nextPage() );
disp->setCursor(0, 16);
disp->println( "SDCard FAILED");;
} while ( disp->nextPage() );
}
} else {
uint32_t cardSize = SD.cardSize() / (1024 * 1024);
if (u8g2) {
if (disp) {
do {
u8g2->setCursor(0, 16);
u8g2->print( "SDCard:");;
u8g2->print(cardSize / 1024.0);;
u8g2->println(" GB");;
} while ( u8g2->nextPage() );
disp->setCursor(0, 16);
disp->print( "SDCard:");;
disp->print(cardSize / 1024.0);;
disp->println(" GB");;
} while ( disp->nextPage() );
}
Serial.print("setupSDCard PASS . SIZE = ");
Serial.print(cardSize / 1024.0);
Serial.println(" GB");
}
if (u8g2) {
u8g2->sendBuffer();
if (disp) {
disp->sendBuffer();
}
delay(3000);
#endif

8
examples/RadioLibExamples/SX1280/Ranging_Slave/Ranging_Slave.ino
View file

@ -67,10 +67,10 @@ void setup()
Serial.println(LT.getSetCalibrationValue()); //reads the calibratuion value currently set
delay(2000);
if (u8g2) {
u8g2->clearBuffer();
u8g2->drawStr(0, 12, "Rang_Slave");
u8g2->sendBuffer();
if (disp) {
disp->clearBuffer();
disp->drawStr(0, 12, "Rang_Slave");
disp->sendBuffer();
}
}

72
examples/RadioLibExamples/SX1280/Ranging_Slave/boards.h
View file

@ -11,7 +11,7 @@
#ifdef HAS_DISPLAY
#include <U8g2lib.h>
U8G2_SSD1306_128X64_NONAME_F_HW_I2C *u8g2 = nullptr;
U8G2_SSD1306_128X64_NONAME_F_HW_I2C *disp = nullptr;
#endif
Ticker ledTicker;
@ -144,68 +144,68 @@ void initBoard()
Wire.beginTransmission(0x3C);
if (Wire.endTransmission() == 0) {
Serial.println("Started OLED");
u8g2 = new U8G2_SSD1306_128X64_NONAME_F_HW_I2C(U8G2_R0, U8X8_PIN_NONE);
u8g2->begin();
u8g2->clearBuffer();
u8g2->setFlipMode(0);
u8g2->setFontMode(1); // Transparent
u8g2->setDrawColor(1);
u8g2->setFontDirection(0);
u8g2->firstPage();
disp = new U8G2_SSD1306_128X64_NONAME_F_HW_I2C(U8G2_R0, U8X8_PIN_NONE);
disp->begin();
disp->clearBuffer();
disp->setFlipMode(0);
disp->setFontMode(1); // Transparent
disp->setDrawColor(1);
disp->setFontDirection(0);
disp->firstPage();
do {
u8g2->setFont(u8g2_font_inb19_mr);
u8g2->drawStr(0, 30, "LilyGo");
u8g2->drawHLine(2, 35, 47);
u8g2->drawHLine(3, 36, 47);
u8g2->drawVLine(45, 32, 12);
u8g2->drawVLine(46, 33, 12);
u8g2->setFont(u8g2_font_inb19_mf);
u8g2->drawStr(58, 60, "LoRa");
} while ( u8g2->nextPage() );
u8g2->sendBuffer();
u8g2->setFont(u8g2_font_fur11_tf);
disp->setFont(u8g2_font_inb19_mr);
disp->drawStr(0, 30, "LilyGo");
disp->drawHLine(2, 35, 47);
disp->drawHLine(3, 36, 47);
disp->drawVLine(45, 32, 12);
disp->drawVLine(46, 33, 12);
disp->setFont(u8g2_font_inb19_mf);
disp->drawStr(58, 60, "LoRa");
} while ( disp->nextPage() );
disp->sendBuffer();
disp->setFont(u8g2_font_fur11_tf);
delay(3000);
}
#endif
#ifdef HAS_SDCARD
if (u8g2) {
u8g2->setFont(u8g2_font_ncenB08_tr);
if (disp) {
disp->setFont(u8g2_font_ncenB08_tr);
}
pinMode(SDCARD_MISO, INPUT_PULLUP);
SDSPI.begin(SDCARD_SCLK, SDCARD_MISO, SDCARD_MOSI, SDCARD_CS);
if (u8g2) {
u8g2->clearBuffer();
if (disp) {
disp->clearBuffer();
}
if (!SD.begin(SDCARD_CS, SDSPI)) {
Serial.println("setupSDCard FAIL");
if (u8g2) {
if (disp) {
do {
u8g2->setCursor(0, 16);
u8g2->println( "SDCard FAILED");;
} while ( u8g2->nextPage() );
disp->setCursor(0, 16);
disp->println( "SDCard FAILED");;
} while ( disp->nextPage() );
}
} else {
uint32_t cardSize = SD.cardSize() / (1024 * 1024);
if (u8g2) {
if (disp) {
do {
u8g2->setCursor(0, 16);
u8g2->print( "SDCard:");;
u8g2->print(cardSize / 1024.0);;
u8g2->println(" GB");;
} while ( u8g2->nextPage() );
disp->setCursor(0, 16);
disp->print( "SDCard:");;
disp->print(cardSize / 1024.0);;
disp->println(" GB");;
} while ( disp->nextPage() );
}
Serial.print("setupSDCard PASS . SIZE = ");
Serial.print(cardSize / 1024.0);
Serial.println(" GB");
}
if (u8g2) {
u8g2->sendBuffer();
if (disp) {
disp->sendBuffer();
}
delay(3000);
#endif

6
examples/RadioLibExamples/SX1280_Ranging/LoRaBoards.h
View file

@ -114,9 +114,9 @@ void disablePeripherals();
#endif
#ifdef DISPLAY_MODEL
extern DISPLAY_MODEL *u8g2;
#define U8G2_HOR_ALIGN_CENTER(t) ((u8g2->getDisplayWidth() - (u8g2->getUTF8Width(t))) / 2)
#define U8G2_HOR_ALIGN_RIGHT(t) ( u8g2->getDisplayWidth() - u8g2->getUTF8Width(t))
extern U8G2 *disp;
#define U8G2_HOR_ALIGN_CENTER(t) ((disp->getDisplayWidth() - (disp->getUTF8Width(t))) / 2)
#define U8G2_HOR_ALIGN_RIGHT(t) ( disp->getDisplayWidth() - disp->getUTF8Width(t))
#endif

28
examples/RadioLibExamples/SX1280_Ranging/SX1280_Ranging.ino
View file

@ -100,23 +100,23 @@ void loop()
}
if (u8g2) {
u8g2->clearBuffer();
u8g2->drawRFrame(0, 0, 128, 64, 5);
if (disp) {
disp->clearBuffer();
disp->drawRFrame(0, 0, 128, 64, 5);
u8g2->setFont(u8g2_font_pxplusibmvga8_mr);
u8g2->setCursor(22, 25);
u8g2->print("Meters(raw):");
u8g2->setCursor(22, 40);
u8g2->print("STATE:");
disp->setFont(u8g2_font_pxplusibmvga8_mr);
disp->setCursor(22, 25);
disp->print("Meters(raw):");
disp->setCursor(22, 40);
disp->print("STATE:");
u8g2->setFont(u8g2_font_crox1h_tr);
u8g2->setCursor( U8G2_HOR_ALIGN_RIGHT(result.c_str()) - 21, 25 );
u8g2->print(result);
disp->setFont(u8g2_font_crox1h_tr);
disp->setCursor( U8G2_HOR_ALIGN_RIGHT(result.c_str()) - 21, 25 );
disp->print(result);
String state = state == RADIOLIB_ERR_NONE ? "NONE" : String(state);
u8g2->setCursor( U8G2_HOR_ALIGN_RIGHT(state.c_str()) - 21, 40 );
u8g2->print(state);
u8g2->sendBuffer();
disp->setCursor( U8G2_HOR_ALIGN_RIGHT(state.c_str()) - 21, 40 );
disp->print(state);
disp->sendBuffer();
}

6
examples/RadioLibExamples/Transmit_Interrupt/LoRaBoards.h
View file

@ -114,9 +114,9 @@ void disablePeripherals();
#endif
#ifdef DISPLAY_MODEL
extern DISPLAY_MODEL *u8g2;
#define U8G2_HOR_ALIGN_CENTER(t) ((u8g2->getDisplayWidth() - (u8g2->getUTF8Width(t))) / 2)
#define U8G2_HOR_ALIGN_RIGHT(t) ( u8g2->getDisplayWidth() - u8g2->getUTF8Width(t))
extern U8G2 *disp;
#define U8G2_HOR_ALIGN_CENTER(t) ((disp->getDisplayWidth() - (disp->getUTF8Width(t))) / 2)
#define U8G2_HOR_ALIGN_RIGHT(t) ( disp->getDisplayWidth() - disp->getUTF8Width(t))
#endif

28
examples/RadioLibExamples/Transmit_Interrupt/Transmit_Interrupt.ino
View file

@ -437,22 +437,22 @@ void loop()
void drawMain()
{
if (u8g2) {
u8g2->clearBuffer();
u8g2->drawRFrame(0, 0, 128, 64, 5);
if (disp) {
disp->clearBuffer();
disp->drawRFrame(0, 0, 128, 64, 5);
u8g2->setFont(u8g2_font_pxplusibmvga8_mr);
u8g2->setCursor(22, 25);
u8g2->print("TX:");
u8g2->setCursor(22, 40);
u8g2->print("STATE:");
disp->setFont(u8g2_font_pxplusibmvga8_mr);
disp->setCursor(22, 25);
disp->print("TX:");
disp->setCursor(22, 40);
disp->print("STATE:");
u8g2->setFont(u8g2_font_crox1h_tr);
u8g2->setCursor( U8G2_HOR_ALIGN_RIGHT(payload.c_str()) - 21, 25 );
u8g2->print(payload);
disp->setFont(u8g2_font_crox1h_tr);
disp->setCursor( U8G2_HOR_ALIGN_RIGHT(payload.c_str()) - 21, 25 );
disp->print(payload);
String state = transmissionState == RADIOLIB_ERR_NONE ? "NONE" : String(transmissionState);
u8g2->setCursor( U8G2_HOR_ALIGN_RIGHT(state.c_str()) - 21, 40 );
u8g2->print(state);
u8g2->sendBuffer();
disp->setCursor( U8G2_HOR_ALIGN_RIGHT(state.c_str()) - 21, 40 );
disp->print(state);
disp->sendBuffer();
}
}