Git-Mirrors/RNode_Firmware_CE
1
0
Fork 0
mirror of https://github.com/liberatedsystems/RNode_Firmware_CE.git synced 2025-08-07 22:02:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

merged worksd

Browse source 
merged both works
This commit is contained in:
TheBeadster 2025-06-30 09:49:19 +01:00
parent 558ffd3a6f
commit 8163a35a45
4 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Display.h
View file

@ -33,31 +33,31 @@ void busyCallback(const void* p) { display_callback(); }
#define DISPLAY_BLACK GxEPD_BLACK #define DISPLAY_BLACK GxEPD_BLACK
#define DISPLAY_WHITE GxEPD_WHITE #define DISPLAY_WHITE GxEPD_WHITE
#elif DISPLAY == ADAFRUIT_TFT #elif DISPLAY_TYPE == ADAFRUIT_TFT
// t-deck // t-deck
#include <Adafruit_ST7789.h> #include <Adafruit_ST7789.h>
#define DISPLAY_WHITE ST77XX_WHITE #define DISPLAY_WHITE ST77XX_WHITE
#define DISPLAY_BLACK ST77XX_BLACK #define DISPLAY_BLACK ST77XX_BLACK
#elif DISPLAY == TFT #elif DISPLAY_TYPE == TFT
// t114 // t114
#include "src/display/ST7789.h" #include "src/display/ST7789.h"
#define DISPLAY_WHITE ST77XX_WHITE #define DISPLAY_WHITE ST77XX_WHITE
#define DISPLAY_BLACK ST77XX_BLACK #define DISPLAY_BLACK ST77XX_BLACK
#define COLOR565(r, g, b) (((r & 0xF8) << 8) | ((g & 0xFC) << 3) | ((b & 0xF8) >> 3)) #define COLOR565(r, g, b) (((r & 0xF8) << 8) | ((g & 0xFC) << 3) | ((b & 0xF8) >> 3))
#elif DISPLAY == MONO_OLED #elif DISPLAY_TYPE == MONO_OLED
// tbeam_s // tbeam_s
#include <Adafruit_SH110X.h> #include <Adafruit_SH110X.h>
#define DISPLAY_WHITE SH110X_WHITE #define DISPLAY_WHITE SH110X_WHITE
#define DISPLAY_BLACK SH110X_BLACK #define DISPLAY_BLACK SH110X_BLACK
#endif #endif
#if DISPLAY == EINK_BW #if DISPLAY_TYPE == EINK_BW
// use GxEPD2 because adafruit EPD support for partial refresh is bad // use GxEPD2 because adafruit EPD support for partial refresh is bad
#include <GxEPD2_BW.h> #include <GxEPD2_BW.h>
#include <SPI.h> #include <SPI.h>
#elif DISPLAY == EINK_3C #elif DISPLAY_TYPE == EINK_3C
#include <GxEPD2_3C.h> #include <GxEPD2_3C.h>
#include <SPI.h> #include <SPI.h>
#endif #endif

5
Makefile
View file

@ -158,6 +158,11 @@ firmware-heltec_t114:
firmware-heltec_t114_gps: firmware-heltec_t114_gps:
arduino-cli compile --log --fqbn Heltec_nRF52:Heltec_nRF52:HT-n5262 -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x3C\" \"-DBOARD_VARIANT=0xCB\"" arduino-cli compile --log --fqbn Heltec_nRF52:Heltec_nRF52:HT-n5262 -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x3C\" \"-DBOARD_VARIANT=0xCB\""
firmware-heltec_meshpocket:
arduino-cli compile --log --fqbn Heltec_nRF52:Heltec_nRF52:HT-n5262-e213 -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x46\""
upload-tbeam: upload-tbeam:
arduino-cli upload -p $(or $(port), /dev/ttyACM0) --fqbn esp32:esp32:t-beam arduino-cli upload -p $(or $(port), /dev/ttyACM0) --fqbn esp32:esp32:t-beam
@sleep 1 @sleep 1

10
RNode_Firmware_CE.ino
View file

@ -16,6 +16,8 @@
#include <Arduino.h> #include <Arduino.h>
#include <SPI.h> #include <SPI.h>
#include "Utilities.h" #include "Utilities.h"
#define BOARD_MODEL BOARD_HELTEC_MESHP // MeshPocket
#include "Boards.h"
#if MCU_VARIANT == MCU_NRF52 #if MCU_VARIANT == MCU_NRF52
#if BOARD_MODEL == BOARD_RAK4631 || BOARD_MODEL == BOARD_OPENCOM_XL #if BOARD_MODEL == BOARD_RAK4631 || BOARD_MODEL == BOARD_OPENCOM_XL
@ -59,7 +61,13 @@
// INTERFACE_SPI is only required on NRF52 platforms, as the SPI pins are set in the class constructor and not by a setter method. // INTERFACE_SPI is only required on NRF52 platforms, as the SPI pins are set in the class constructor and not by a setter method.
// Even if custom SPI interfaces are not needed, the array must exist to prevent compilation errors. // Even if custom SPI interfaces are not needed, the array must exist to prevent compilation errors.
#define INTERFACE_SPI #define INTERFACE_SPI
SPIClass interface_spi[1]; // MeshPocket has only one radio → use SPIM0 and the pins you already defined
SPIClass interface_spi[1] = {
SPIClass(NRF_SPIM0, // hardware block
interface_pins[0][3], // MISO → 23
interface_pins[0][1], // SCK → 19
interface_pins[0][2]) // MOSI → 22
};
#endif #endif
FIFOBuffer serialFIFO; FIFOBuffer serialFIFO;

7
Radio.hpp
View file

@ -60,8 +60,13 @@
#define RSSI_OFFSET 157 #define RSSI_OFFSET 157
#ifdef PHY_HEADER_LORA_SYMBOLS
#undef PHY_HEADER_LORA_SYMBOLS
#endif
#define PHY_HEADER_LORA_SYMBOLS 8 #define PHY_HEADER_LORA_SYMBOLS 8
#define MODEM_TIMEOUT_MULT 1.5 #define MODEM_TIMEOUT_MULT 1.5
// Status flags // Status flags
@ -98,7 +103,7 @@ public:
_csma_slot_ms(CSMA_SLOT_MIN_MS), _csma_slot_ms(CSMA_SLOT_MIN_MS),
_preambleLength(LORA_PREAMBLE_SYMBOLS_MIN), _lora_symbol_time_ms(0.0), _preambleLength(LORA_PREAMBLE_SYMBOLS_MIN), _lora_symbol_time_ms(0.0),
_lora_preamble_time_ms(0), _lora_header_time_ms(0), _lora_symbol_rate(0.0), _lora_us_per_byte(0.0), _bitrate(0), _lora_preamble_time_ms(0), _lora_header_time_ms(0), _lora_symbol_rate(0.0), _lora_us_per_byte(0.0), _bitrate(0),
_packet{0}, _onReceive(NULL), _txp(0), _ldro(false), _limit_rate(false), _interference_detected(false), _avoid_interference(true), _difs_ms(CSMA_SIFS_MS + 2 * _csma_slot_ms), _difs_wait_start(0), _cw_wait_start(0), _cw_wait_target(0), _cw_wait_passed(0), _csma_cw(-1), _cw_band(1), _cw_min(0), _cw_max(CSMA_CW_PER_BAND_WINDOWS), _noise_floor_sampled(false), _noise_floor_sample(0), _noise_floor_buffer({0}), _noise_floor(-292), _led_id_filter(0), _preamble_detected_at(0) {}; _packet{0}, _onReceive(NULL), _txp(0), _ldro(false), _limit_rate(false), _interference_detected(false), _avoid_interference(true), _difs_ms(CSMA_SIFS_MS + 2 * _csma_slot_ms), _difs_wait_start(0), _cw_wait_start(0), _cw_wait_target(0), _cw_wait_passed(0), _csma_cw(-1), _cw_band(1), _cw_min(0), _cw_max(CSMA_CW_PER_BAND_WINDOWS), _noise_floor_sampled(false), _noise_floor_sample(0), _noise_floor_buffer{0}, _noise_floor(-292), _led_id_filter(0), _preamble_detected_at(0) {};
virtual void reset() = 0; virtual void reset() = 0;