mirror of
https://github.com/meshtastic/firmware.git
synced 2025-12-21 18:22:32 +00:00
WIP: unify the RAK targets into one firmware (#1350)
* First steps to unify GPS Lib for RAK 1910 and RAK 12500 * Technicalities. Out with the old and build the new. * Adapt Matrix * We use 0.4.5 now * While we're at it, yank the RAK815, it's EOL * Satisfy CI - for now * - yank UBX library, talk to GPS chip with NMEA only. - more autodetect going on, this time for the Eink Display. TODO: actually do something with the scan findings. * i swear this works on windows! :-) * these are only there to make CI happy * don't update eink display if not detected. * Replace Oberon Crypt Library with modified Adafruit Library. This elimintaes the need for the sdk-nfxlib submodule. * - Revert auto screen selection (incomplete) - Revert nrF crypto engine (needs more work) - add separate defines for not-auto-selecting screen lib. * Define 2 new variants for RAK - with or without epaper * Update variants Co-authored-by: Sacha Weatherstone <sachaw100@hotmail.com> Co-authored-by: Ben Meadors <thebentern@tuta.io>
This commit is contained in:
@@ -27,6 +27,10 @@ class Screen
|
||||
|
||||
#ifdef USE_ST7567
|
||||
#include <ST7567Wire.h>
|
||||
#elif defined(USE_SH1106)
|
||||
#include <SH1106Wire.h>
|
||||
#elif defined(USE_SSD1306)
|
||||
#include <SSD1306Wire.h>
|
||||
#else
|
||||
// the SH1106/SSD1306 variant is auto-detected
|
||||
#include <AutoOLEDWire.h>
|
||||
@@ -297,9 +301,16 @@ class Screen : public concurrency::OSThread
|
||||
/// Holds state for debug information
|
||||
DebugInfo debugInfo;
|
||||
|
||||
/// Display device
|
||||
/** FIXME cleanup display abstraction */
|
||||
#ifdef ST7735_CS
|
||||
/// Display device
|
||||
|
||||
// #ifdef RAK4630
|
||||
// EInkDisplay dispdev;
|
||||
// AutoOLEDWire dispdev_oled;
|
||||
#ifdef USE_SH1106
|
||||
SH1106Wire dispdev;
|
||||
#elif defined(USE_SSD1306)
|
||||
SSD1306Wire dispdev;
|
||||
#elif defined(ST7735_CS)
|
||||
TFTDisplay dispdev;
|
||||
#elif defined(HAS_EINK)
|
||||
EInkDisplay dispdev;
|
||||
|
||||
Reference in New Issue
Block a user