Git-Mirrors/RNode_Firmware
1
0
Fork 0
mirror of https://github.com/markqvist/RNode_Firmware.git synced 2025-07-13 10:09:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Preliminary GPS control/build support

Browse source
This commit is contained in:
faragher 2024-10-21 20:15:19 -05:00
parent f6695a8674
commit c0403a7232
4 changed files with 53 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Framing.h
View file

@ -77,6 +77,9 @@
#define CMD_RESET 0x55
#define CMD_RESET_BYTE 0xF8
#define CMD_GPS_CMD 0xA0
#define CMD_GPS_RATE 0xA1
#define DETECT_REQ 0x73
#define DETECT_RESP 0x46

15
Makefile
View file

@ -130,15 +130,15 @@ firmware-rak4631:
arduino-cli compile --log --fqbn rakwireless:nrf52:WisCoreRAK4631Board -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x51\""
upload:
arduino-cli upload -p /dev/ttyUSB0 --fqbn unsignedio:avr:rnode
arduino-cli upload -p /dev/ttyACM0 --fqbn unsignedio:avr:rnode
upload-mega2560:
arduino-cli upload -p /dev/ttyACM0 --fqbn arduino:avr:mega
upload-tbeam:
arduino-cli upload -p /dev/ttyUSB0 --fqbn esp32:esp32:t-beam
arduino-cli upload -p /dev/ttyACM0 --fqbn esp32:esp32:t-beam
@sleep 1
rnodeconf /dev/ttyUSB0 --firmware-hash $$(./partition_hashes ./build/esp32.esp32.t-beam/RNode_Firmware.ino.bin)
rnodeconf /dev/ttyACM0 --firmware-hash $$(./partition_hashes ./build/esp32.esp32.t-beam/RNode_Firmware.ino.bin)
@sleep 3
python ./Release/esptool/esptool.py --chip esp32 --port /dev/ttyACM0 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin
@ -252,6 +252,15 @@ release-tbeam: check_bt_buffers
zip --junk-paths ./Release/rnode_firmware_tbeam.zip ./Release/esptool/esptool.py ./Release/console_image.bin build/rnode_firmware_tbeam.boot_app0 build/rnode_firmware_tbeam.bin build/rnode_firmware_tbeam.bootloader build/rnode_firmware_tbeam.partitions
rm -r build
release-tbeam_GPS: check_bt_buffers
arduino-cli compile --fqbn esp32:esp32:t-beam -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x33\" \"-DENABLE_GPS\""
cp ~/.arduino15/packages/esp32/hardware/esp32/$(ARDUINO_ESP_CORE_VER)/tools/partitions/boot_app0.bin build/rnode_firmware_tbeam_GPS.boot_app0
cp build/esp32.esp32.t-beam/RNode_Firmware.ino.bin build/rnode_firmware_tbeam_GPS.bin
cp build/esp32.esp32.t-beam/RNode_Firmware.ino.bootloader.bin build/rnode_firmware_tbeam_GPS.bootloader
cp build/esp32.esp32.t-beam/RNode_Firmware.ino.partitions.bin build/rnode_firmware_tbeam_GPS.partitions
zip --junk-paths ./Release/rnode_firmware_tbeam_GPS.zip ./Release/esptool/esptool.py ./Release/console_image.bin build/rnode_firmware_tbeam_GPS.boot_app0 build/rnode_firmware_tbeam_GPS.bin build/rnode_firmware_tbeam_GPS.bootloader build/rnode_firmware_tbeam_GPS.partitions
rm -r build
release-tbeam_sx1262: check_bt_buffers
arduino-cli compile --fqbn esp32:esp32:t-beam -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x33\" \"-DMODEM=0x03\""
cp ~/.arduino15/packages/esp32/hardware/esp32/$(ARDUINO_ESP_CORE_VER)/tools/partitions/boot_app0.bin build/rnode_firmware_tbeam_sx1262.boot_app0

19
Power.h
View file

@ -344,7 +344,10 @@ bool init_pmu() {
PMU->enablePowerOutput(XPOWERS_LDO2);
// Turn on GPS
//PMU->enablePowerOutput(XPOWERS_LDO3);
#if defined(ENABLE_GPS)
PMU->enablePowerOutput(XPOWERS_LDO3);
PMU->enablePowerOutput(XPOWERS_VBACKUP); // RTC/GPS battery charging
#endif
// protected oled power source
PMU->setProtectedChannel(XPOWERS_DCDC1);
@ -385,7 +388,7 @@ bool init_pmu() {
// Set the power of LoRa and GPS module to 3.3V
// LoRa
PMU->setPowerChannelVoltage(XPOWERS_ALDO2, 3300);
// GPS
// GPS Voltage
PMU->setPowerChannelVoltage(XPOWERS_ALDO3, 3300);
PMU->setPowerChannelVoltage(XPOWERS_VBACKUP, 3300);
@ -398,11 +401,15 @@ bool init_pmu() {
// LoRa VDD
PMU->enablePowerOutput(XPOWERS_ALDO2);
// GNSS VDD
//PMU->enablePowerOutput(XPOWERS_ALDO3);
// GPS/GNSS VDD
#if defined(ENABLE_GPS)
PMU->enablePowerOutput(XPOWERS_ALDO3);
#endif
// GNSS RTC PowerVDD
//PMU->enablePowerOutput(XPOWERS_VBACKUP);
// GNSS RTC Power - Enables charging onboard battery
#if defined(ENABLE_GPS)
PMU->enablePowerOutput(XPOWERS_VBACKUP);
#endif
}
PMU->enableSystemVoltageMeasure();

25
RNode_Firmware.ino
View file

@ -41,6 +41,10 @@ volatile bool serial_buffering = false;
#include "Console.h"
#endif
#if defined(ENABLE_GPS)
#include "GPS.h"
#endif
#if PLATFORM == PLATFORM_ESP32 || PLATFORM == PLATFORM_NRF52
#define MODEM_QUEUE_SIZE 4
typedef struct {
@ -228,6 +232,10 @@ void setup() {
kiss_indicate_reset();
}
#endif
#if defined(ENABLE_GPS)
GPS_init();
#endif
// Validate board health, EEPROM and config
validate_status();
@ -1054,6 +1062,17 @@ void serialCallback(uint8_t sbyte) {
}
}
#endif
} else if (command == CMD_GPS_CMD) {
#if defined(ENABLE_GPS)
GPS_handler(sbyte);
#endif
} else if (command == CMD_GPS_RATE) {
#if defined(ENABLE_GPS)
if(frame_len < CMD_L) cmdbuf[frame_len++] = sbyte;
if(frame_len == 2){
GPS_poling(cmdbuf[0],int(cmdbuf[1]));
}
#endif
} else if (command == CMD_DISP_INT) {
#if HAS_DISPLAY
if (sbyte == FESC) {
@ -1475,6 +1494,12 @@ void loop() {
#if HAS_INPUT
input_read();
#endif
#if defined(ENABLE_GPS)
if(hw_ready){
GPS_process();
}
#endif
if (memory_low) {
#if PLATFORM == PLATFORM_ESP32