Mirrors
/
RNode_Firmware
mirror of https://github.com/markqvist/RNode_Firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:markqvist/RNode_Firmware

This commit is contained in:
Mark Qvist 2024-05-06 01:47:20 +02:00
parent 11238720e5 25a195a132
commit 3d9a88a1b0
5 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Bluetooth.h
View File

@ -313,7 +313,6 @@ bool bt_setup_hw() {
Bluefruit.Security.setPairPasskeyCallback(bt_passkey_callback); Bluefruit.Security.setPairPasskeyCallback(bt_passkey_callback);
Bluefruit.Periph.setConnectCallback(bt_connect_callback); Bluefruit.Periph.setConnectCallback(bt_connect_callback);
Bluefruit.Periph.setDisconnectCallback(bt_disconnect_callback); Bluefruit.Periph.setDisconnectCallback(bt_disconnect_callback);
Bluefruit.Security.setIOCaps(true, true, false);
Bluefruit.Security.setPairCompleteCallback(bt_pairing_complete); Bluefruit.Security.setPairCompleteCallback(bt_pairing_complete);
const ble_gap_addr_t gap_addr = Bluefruit.getAddr(); const ble_gap_addr_t gap_addr = Bluefruit.getAddr();
char *data = (char*)malloc(BT_DEV_ADDR_LEN+1); char *data = (char*)malloc(BT_DEV_ADDR_LEN+1);

10
Display.h
View File

@ -134,7 +134,11 @@ bool display_init() {
#endif #endif
#if DISP_CUSTOM_ADDR == true #if DISP_CUSTOM_ADDR == true
#if HAS_EEPROM
uint8_t display_address = EEPROM.read(eeprom_addr(ADDR_CONF_DADR)); uint8_t display_address = EEPROM.read(eeprom_addr(ADDR_CONF_DADR));
#elif MCU_VARIANT == MCU_NRF52
uint8_t display_address = eeprom_read(eeprom_addr(ADDR_CONF_DADR));
#endif
if (display_address == 0xFF) display_address = DISP_ADDR; if (display_address == 0xFF) display_address = DISP_ADDR;
#else #else
uint8_t display_address = DISP_ADDR; uint8_t display_address = DISP_ADDR;
@ -188,7 +192,11 @@ bool display_init() {
disp_area.cp437(true); disp_area.cp437(true);
display.cp437(true); display.cp437(true);
display_intensity = EEPROM.read(eeprom_addr(ADDR_CONF_DINT)); #if HAS_EEPROM
uint8_t display_intensity = EEPROM.read(eeprom_addr(ADDR_CONF_DINT));
#elif MCU_VARIANT == MCU_NRF52
uint8_t display_intensity = eeprom_read(eeprom_addr(ADDR_CONF_DINT));
#endif
return true; return true;
} }

4
RNode_Firmware.ino
View File

@ -151,7 +151,11 @@ void setup() {
#endif #endif
#if HAS_DISPLAY #if HAS_DISPLAY
#if HAS_EEPROM
if (EEPROM.read(eeprom_addr(ADDR_CONF_DSET)) != CONF_OK_BYTE) { if (EEPROM.read(eeprom_addr(ADDR_CONF_DSET)) != CONF_OK_BYTE) {
#elif MCU_VARIANT == MCU_NRF52
if (eeprom_read(eeprom_addr(ADDR_CONF_DSET)) != CONF_OK_BYTE) {
#endif
eeprom_update(eeprom_addr(ADDR_CONF_DSET), CONF_OK_BYTE); eeprom_update(eeprom_addr(ADDR_CONF_DSET), CONF_OK_BYTE);
eeprom_update(eeprom_addr(ADDR_CONF_DINT), 0xFF); eeprom_update(eeprom_addr(ADDR_CONF_DINT), 0xFF);
} }

4
Utilities.h
View File

@ -43,6 +43,10 @@ sx128x *LoRa = &sx128x_modem;
#include "Framing.h" #include "Framing.h"
#include "MD5.h" #include "MD5.h"
#if !HAS_EEPROM && MCU_VARIANT == MCU_NRF52
uint8_t eeprom_read(uint32_t mapped_addr);
#endif
#if HAS_DISPLAY == true #if HAS_DISPLAY == true
#include "Display.h" #include "Display.h"
#endif #endif

8
sx128x.cpp
View File

@ -361,6 +361,14 @@ int sx128x::begin(unsigned long frequency)
delay(10); delay(10);
} }
if (_rxen != -1) {
pinMode(_rxen, OUTPUT);
}
if (_txen != -1) {
pinMode(_txen, OUTPUT);
}
if (_busy != -1) { if (_busy != -1) {
pinMode(_busy, INPUT); pinMode(_busy, INPUT);
} }