marcel
/
RNode_Firmware_CE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added display, power management and other foundations for bluetooth connectivity.

Browse Source
master
Mark Qvist 2 years ago
parent 2c826fb3dc
commit b0f49c0cce
4 changed files with 148 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 43
      Config.h
  2. 4
      Framing.h
  3. 65
      RNode_Firmware.ino
  4. 122
      Utilities.h

43
Config.h
Unescape View File

@ -4,7 +4,7 @@
#define CONFIG_H #define CONFIG_H
#define MAJ_VERS 0x01 #define MAJ_VERS 0x01
#define MIN_VERS 0x1E #define MIN_VERS 0x28
#define PLATFORM_AVR 0x90 #define PLATFORM_AVR 0x90
#define PLATFORM_ESP32 0x80 #define PLATFORM_ESP32 0x80
@ -36,6 +36,17 @@
#elif defined(ESP32) #elif defined(ESP32)
#define PLATFORM PLATFORM_ESP32 #define PLATFORM PLATFORM_ESP32
#define MCU_VARIANT MCU_ESP32 #define MCU_VARIANT MCU_ESP32
#define CABLE_STATE_DISCONNECTED 0x00
#define CABLE_STATE_CONNECTED 0x01
uint8_t cable_state = CABLE_STATE_DISCONNECTED;
#define BT_STATE_NA 0xff
#define BT_STATE_OFF 0x00
#define BT_STATE_ON 0x01
#define BT_STATE_PAIRING 0x02
#define BT_STATE_CONNECTED 0x03
uint8_t bt_state = BT_STATE_NA;
#else #else
#error "The firmware cannot be compiled for the selected MCU variant" #error "The firmware cannot be compiled for the selected MCU variant"
#endif #endif
@ -49,6 +60,10 @@
// MCU dependent configuration parameters // MCU dependent configuration parameters
#define HAS_DISPLAY false
#define HAS_BLUETOOTH false
#define HAS_PMU false
#if MCU_VARIANT == MCU_1284P #if MCU_VARIANT == MCU_1284P
const int pin_cs = 4; const int pin_cs = 4;
const int pin_reset = 3; const int pin_reset = 3;
@ -102,6 +117,7 @@
const int pin_dio = 26; const int pin_dio = 26;
const int pin_led_rx = 2; const int pin_led_rx = 2;
const int pin_led_tx = 4; const int pin_led_tx = 4;
#define HAS_PMU true
#elif BOARD_MODEL == BOARD_HUZZAH32 #elif BOARD_MODEL == BOARD_HUZZAH32
const int pin_cs = 4; const int pin_cs = 4;
const int pin_reset = 36; const int pin_reset = 36;
@ -119,6 +135,8 @@
const int pin_led_rx = 22; const int pin_led_rx = 22;
const int pin_led_tx = 22; const int pin_led_tx = 22;
#endif #endif
#define HAS_DISPLAY true
#define HAS_BLUETOOTH true
#elif BOARD_MODEL == BOARD_LORA32_V2_1 #elif BOARD_MODEL == BOARD_LORA32_V2_1
const int pin_cs = 18; const int pin_cs = 18;
const int pin_reset = 23; const int pin_reset = 23;
@ -130,6 +148,9 @@
const int pin_led_rx = 25; const int pin_led_rx = 25;
const int pin_led_tx = 25; const int pin_led_tx = 25;
#endif #endif
#define HAS_DISPLAY true
#define HAS_BLUETOOTH true
#define HAS_PMU true
#elif BOARD_MODEL == BOARD_HELTEC32_V2 #elif BOARD_MODEL == BOARD_HELTEC32_V2
const int pin_cs = 18; const int pin_cs = 18;
const int pin_reset = 23; const int pin_reset = 23;
@ -152,6 +173,8 @@
const int pin_led_rx = 22; const int pin_led_rx = 22;
const int pin_led_tx = 22; const int pin_led_tx = 22;
#endif #endif
#define HAS_DISPLAY true
#define HAS_BLUETOOTH true
#elif BOARD_MODEL == BOARD_RNODE_NG_21 #elif BOARD_MODEL == BOARD_RNODE_NG_21
const int pin_cs = 18; const int pin_cs = 18;
const int pin_reset = 23; const int pin_reset = 23;
@ -163,10 +186,15 @@
const int pin_led_rx = 25; const int pin_led_rx = 25;
const int pin_led_tx = 25; const int pin_led_tx = 25;
#endif #endif
#define HAS_DISPLAY true
#define HAS_BLUETOOTH true
#define HAS_PMU true
#else #else
#error An unsupported board was selected. Cannot compile RNode firmware. #error An unsupported board was selected. Cannot compile RNode firmware.
#endif #endif
bool mw_radio_online = false;
#define CONFIG_UART_BUFFER_SIZE 6144 #define CONFIG_UART_BUFFER_SIZE 6144
#define CONFIG_QUEUE_SIZE 6144 #define CONFIG_QUEUE_SIZE 6144
#define CONFIG_QUEUE_MAX_LENGTH 200 #define CONFIG_QUEUE_MAX_LENGTH 200
@ -206,6 +234,8 @@
bool radio_locked = true; bool radio_locked = true;
bool radio_online = false; bool radio_online = false;
bool hw_ready = false; bool hw_ready = false;
bool disp_ready = false;
bool pmu_ready = false;
bool promisc = false; bool promisc = false;
bool implicit = false; bool implicit = false;
uint8_t implicit_l = 0; uint8_t implicit_l = 0;
@ -214,9 +244,10 @@
uint8_t model = 0x00; uint8_t model = 0x00;
uint8_t hwrev = 0x00; uint8_t hwrev = 0x00;
int current_rssi = -292;
int last_rssi = -292; int last_rssi = -292;
uint8_t last_rssi_raw = 0x00; uint8_t last_rssi_raw = 0x00;
uint8_t last_snr_raw = 0x00; uint8_t last_snr_raw = 0x80;
uint8_t seq = 0xFF; uint8_t seq = 0xFF;
uint16_t read_len = 0; uint16_t read_len = 0;
@ -249,6 +280,14 @@
const uint8_t SIG_SYNCED = 0x02; const uint8_t SIG_SYNCED = 0x02;
const uint8_t RX_ONGOING = 0x04; const uint8_t RX_ONGOING = 0x04;
// Power management
#define BATTERY_STATE_DISCHARGING 0x01
#define BATTERY_STATE_CHARGING 0x02
#define BATTERY_STATE_CHARGED 0x03
float battery_voltage = 0.0;
float battery_percent = 0.0;
uint8_t battery_state = 0x00;
// Boot flags // Boot flags
#define START_FROM_BOOTLOADER 0x01 #define START_FROM_BOOTLOADER 0x01
#define START_FROM_POWERON 0x02 #define START_FROM_POWERON 0x02

4
Framing.h
Unescape View File

@ -27,6 +27,10 @@
#define CMD_BLINK 0x30 #define CMD_BLINK 0x30
#define CMD_RANDOM 0x40 #define CMD_RANDOM 0x40
#define CMD_FB_EXT 0x41
#define CMD_FB_READ 0x42
#define CMD_FB_WRITE 0x43
#define CMD_BOARD 0x47 #define CMD_BOARD 0x47
#define CMD_PLATFORM 0x48 #define CMD_PLATFORM 0x48
#define CMD_MCU 0x49 #define CMD_MCU 0x49

65
RNode_Firmware.ino
Unescape View File

@ -24,8 +24,6 @@
#include <SPI.h> #include <SPI.h>
#include "Utilities.h" #include "Utilities.h"
FIFOBuffer serialFIFO; FIFOBuffer serialFIFO;
uint8_t serialBuffer[CONFIG_UART_BUFFER_SIZE+1]; uint8_t serialBuffer[CONFIG_UART_BUFFER_SIZE+1];
@ -89,9 +87,8 @@ void setup() {
LoRa.setPins(pin_cs, pin_reset, pin_dio); LoRa.setPins(pin_cs, pin_reset, pin_dio);
#if MCU_VARIANT == MCU_ESP32 #if MCU_VARIANT == MCU_ESP32
#if BOARD_MODEL == BOARD_TBEAM #if HAS_PMU == true
Wire.begin(I2C_SDA, I2C_SCL); pmu_ready = init_pmu();
initPMU();
#endif #endif
kiss_indicate_reset(); kiss_indicate_reset();
@ -99,6 +96,14 @@ void setup() {
// Validate board health, EEPROM and config // Validate board health, EEPROM and config
validateStatus(); validateStatus();
#if HAS_DISPLAY
disp_ready = display_init();
#endif
#if HAS_BLUETOOTH
bt_ready = bt_init();
#endif
} }
void lora_receive() { void lora_receive() {
@ -448,6 +453,7 @@ void serialCallback(uint8_t sbyte) {
if (frame_len == 0 && command == CMD_UNKNOWN) { if (frame_len == 0 && command == CMD_UNKNOWN) {
command = sbyte; command = sbyte;
} else if (command == CMD_DATA) { } else if (command == CMD_DATA) {
cable_state = CABLE_STATE_CONNECTED;
if (sbyte == FESC) { if (sbyte == FESC) {
ESCAPE = true; ESCAPE = true;
} else { } else {
@ -547,6 +553,7 @@ void serialCallback(uint8_t sbyte) {
set_implicit_length(sbyte); set_implicit_length(sbyte);
kiss_indicate_implicit_length(); kiss_indicate_implicit_length();
} else if (command == CMD_RADIO_STATE) { } else if (command == CMD_RADIO_STATE) {
cable_state = CABLE_STATE_CONNECTED;
if (sbyte == 0xFF) { if (sbyte == 0xFF) {
kiss_indicate_radiostate(); kiss_indicate_radiostate();
} else if (sbyte == 0x00) { } else if (sbyte == 0x00) {
@ -571,6 +578,7 @@ void serialCallback(uint8_t sbyte) {
kiss_indicate_random(getRandom()); kiss_indicate_random(getRandom());
} else if (command == CMD_DETECT) { } else if (command == CMD_DETECT) {
if (sbyte == DETECT_REQ) { if (sbyte == DETECT_REQ) {
cable_state = CABLE_STATE_CONNECTED;
kiss_indicate_detect(); kiss_indicate_detect();
} }
} else if (command == CMD_PROMISC) { } else if (command == CMD_PROMISC) {
@ -623,6 +631,40 @@ void serialCallback(uint8_t sbyte) {
eeprom_conf_save(); eeprom_conf_save();
} else if (command == CMD_CONF_DELETE) { } else if (command == CMD_CONF_DELETE) {
eeprom_conf_delete(); eeprom_conf_delete();
} else if (command == CMD_FB_EXT) {
#if HAS_DISPLAY == true
if (sbyte == 0xFF) {
kiss_indicate_fbstate();
} else if (sbyte == 0x00) {
ext_fb_disable();
kiss_indicate_fbstate();
} else if (sbyte == 0x01) {
ext_fb_enable();
kiss_indicate_fbstate();
}
#endif
} else if (command == CMD_FB_WRITE) {
if (sbyte == FESC) {
ESCAPE = true;
} else {
if (ESCAPE) {
if (sbyte == TFEND) sbyte = FEND;
if (sbyte == TFESC) sbyte = FESC;
ESCAPE = false;
}
cbuf[frame_len++] = sbyte;
}
if (frame_len == 9) {
uint8_t line = cbuf[0];
if (line > 63) line = 63;
int fb_o = line*8;
memcpy(fb+fb_o, cbuf+1, 8);
}
} else if (command == CMD_FB_READ) {
if (sbyte != 0x00) {
kiss_indicate_fb();
}
} }
} }
} }
@ -637,6 +679,7 @@ void updateModemStatus() {
#endif #endif
uint8_t status = LoRa.modemStatus(); uint8_t status = LoRa.modemStatus();
current_rssi = LoRa.currentRssi();
last_status_update = millis(); last_status_update = millis();
#if MCU_VARIANT == MCU_ESP32 #if MCU_VARIANT == MCU_ESP32
@ -783,6 +826,18 @@ void loop() {
#else #else
if (!fifo_isempty_locked(&serialFIFO)) serial_poll(); if (!fifo_isempty_locked(&serialFIFO)) serial_poll();
#endif #endif
#if HAS_DISPLAY
if (disp_ready) {
update_display();
}
#endif
#if HAS_PMU
if (pmu_ready) {
update_pmu();
}
#endif
} }
volatile bool serial_polling = false; volatile bool serial_polling = false;

122
Utilities.h
Unescape View File

@ -6,6 +6,18 @@
#include "Framing.h" #include "Framing.h"
#include "MD5.h" #include "MD5.h"
#if HAS_DISPLAY == true
#include "Display.h"
#endif
#if HAS_BLUETOOTH == true
#include "Bluetooth.h"
#endif
#if HAS_PMU == true
#include "Power.h"
#endif
#if MCU_VARIANT == MCU_ESP32 #if MCU_VARIANT == MCU_ESP32
#include "soc/rtc_wdt.h" #include "soc/rtc_wdt.h"
#define ISR_VECT IRAM_ATTR #define ISR_VECT IRAM_ATTR
@ -568,6 +580,37 @@ void kiss_indicate_random(uint8_t byte) {
Serial.write(FEND); Serial.write(FEND);
} }
void kiss_indicate_fbstate() {
Serial.write(FEND);
Serial.write(CMD_FB_EXT);
#if HAS_DISPLAY
if (disp_ext_fb) {
Serial.write(0x01);
} else {
Serial.write(0x00);
}
#else
Serial.write(0xFF)
#endif
Serial.write(FEND);
}
void kiss_indicate_fb() {
Serial.write(FEND);
Serial.write(CMD_FB_READ);
#if HAS_DISPLAY
for (int i = 0; i < 512; i++) {
uint8_t byte = fb[i];
if (byte == FEND) { Serial.write(FESC); byte = TFEND; }
if (byte == FESC) { Serial.write(FESC); byte = TFESC; }
Serial.write(byte);
}
#else
Serial.write(0xFF)
#endif
Serial.write(FEND);
}
void kiss_indicate_ready() { void kiss_indicate_ready() {
Serial.write(FEND); Serial.write(FEND);
Serial.write(CMD_READY); Serial.write(CMD_READY);
@ -1087,82 +1130,3 @@ inline void fifo16_init(FIFOBuffer16 *f, uint16_t *buffer, uint16_t size) {
inline uint16_t fifo16_len(FIFOBuffer16 *f) { inline uint16_t fifo16_len(FIFOBuffer16 *f) {
return (f->end - f->begin); return (f->end - f->begin);
} }
#if BOARD_MODEL == BOARD_TBEAM
#include <axp20x.h>
AXP20X_Class PMU;
bool initPMU()
{
if (PMU.begin(Wire, AXP192_SLAVE_ADDRESS) == AXP_FAIL) {
return false;
}
/*
* The charging indicator can be turned on or off
* * * */
PMU.setChgLEDMode(AXP20X_LED_OFF);
/*
* The default ESP32 power supply has been turned on,
* no need to set, please do not set it, if it is turned off,
* it will not be able to program
*
* PMU.setDCDC3Voltage(3300);
* PMU.setPowerOutPut(AXP192_DCDC3, AXP202_ON);
*
* * * */
/*
* Turn off unused power sources to save power
* **/
PMU.setPowerOutPut(AXP192_DCDC1, AXP202_OFF);
PMU.setPowerOutPut(AXP192_DCDC2, AXP202_OFF);
PMU.setPowerOutPut(AXP192_LDO2, AXP202_OFF);
PMU.setPowerOutPut(AXP192_LDO3, AXP202_OFF);
PMU.setPowerOutPut(AXP192_EXTEN, AXP202_OFF);
/*
* Set the power of LoRa and GPS module to 3.3V
**/
PMU.setLDO2Voltage(3300); //LoRa VDD
PMU.setLDO3Voltage(3300); //GPS VDD
PMU.setDCDC1Voltage(3300); //3.3V Pin next to 21 and 22 is controlled by DCDC1
PMU.setPowerOutPut(AXP192_DCDC1, AXP202_ON);
// Turn on SX1276
PMU.setPowerOutPut(AXP192_LDO2, AXP202_ON);
// Turn off GPS
PMU.setPowerOutPut(AXP192_LDO3, AXP202_OFF);
pinMode(PMU_IRQ, INPUT_PULLUP);
attachInterrupt(PMU_IRQ, [] {
// pmu_irq = true;
}, FALLING);
PMU.adc1Enable(AXP202_VBUS_VOL_ADC1 |
AXP202_VBUS_CUR_ADC1 |
AXP202_BATT_CUR_ADC1 |
AXP202_BATT_VOL_ADC1,
AXP202_ON);
PMU.enableIRQ(AXP202_VBUS_REMOVED_IRQ |
AXP202_VBUS_CONNECT_IRQ |
AXP202_BATT_REMOVED_IRQ |
AXP202_BATT_CONNECT_IRQ,
AXP202_ON);
PMU.clearIRQ();
return true;
}
void disablePeripherals()
{
PMU.setPowerOutPut(AXP192_DCDC1, AXP202_OFF);
PMU.setPowerOutPut(AXP192_LDO2, AXP202_OFF);
PMU.setPowerOutPut(AXP192_LDO3, AXP202_OFF);
}
#endif

Write Preview
Loading…
Cancel
Save