pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-07-31 19:05:44 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

The new 7.2.0 soft device works on nrf52833

Browse Source
This commit is contained in:
Kevin Hester 2020-10-28 13:01:50 +08:00
parent 6b838002d4
commit 4ad562b9f4
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/install-bootloader.sh
View File

@ -8,12 +8,13 @@ set -e
BOOTDIR=/home/kevinh/development/meshtastic/Adafruit_nRF52_Bootloader BOOTDIR=/home/kevinh/development/meshtastic/Adafruit_nRF52_Bootloader
BOARD=othernet_ppr1 BOARD=othernet_ppr1
BOOTVER=0.3.2 BOOTVER=0.3.2
BOOTNUM=125 BOOTNUM=128
BOOTSHA=g4582f73 BOOTSHA=gc01b9ea
SDVER=6.1.1 SDCODE=s113
SDVER=7.2.0
PROJ=ppr1 PROJ=ppr1
# FIXME for nRF52840 use 0xff000 # FIXME for nRF52840 use 0xff000, for nRF52833 use 0x7f000
BOOTSET=0x7f000 BOOTSET=0x7f000
nrfjprog --eraseall -f nrf52 nrfjprog --eraseall -f nrf52
@ -25,8 +26,8 @@ nrfjprog --eraseall -f nrf52
echo "01 00 00 00 00 00 00 00" | xxd -r -p - >/tmp/bootconf.bin echo "01 00 00 00 00 00 00 00" | xxd -r -p - >/tmp/bootconf.bin
srec_cat /tmp/bootconf.bin -binary -offset $BOOTSET -output /tmp/bootconf.hex -intel srec_cat /tmp/bootconf.bin -binary -offset $BOOTSET -output /tmp/bootconf.hex -intel
echo Generating merged hex file echo Generating merged hex file from .pio/build/$PROJ/firmware.hex
mergehex -o ${BOARD}_full.hex -m $BOOTDIR/_build/build-$BOARD/${BOARD}_bootloader-$BOOTVER-$BOOTNUM-$BOOTSHA-dirty_s140_$SDVER.hex .pio/build/$PROJ/firmware.hex /tmp/bootconf.hex mergehex -o ${BOARD}_full.hex -m $BOOTDIR/_build/build-$BOARD/${BOARD}_bootloader-$BOOTVER-$BOOTNUM-$BOOTSHA-dirty_${SDCODE}_$SDVER.hex .pio/build/$PROJ/firmware.hex /tmp/bootconf.hex
echo Telling bootloader app region is valid and telling CPU to run echo Telling bootloader app region is valid and telling CPU to run
nrfjprog --program ${BOARD}_full.hex -f nrf52 --reset nrfjprog --program ${BOARD}_full.hex -f nrf52 --reset

8
boards/ppr1.json
View File

@ -1,7 +1,7 @@
{ {
"build": { "build": {
"arduino": { "arduino": {
"ldscript": "nrf52833_s140_v6.ld" "ldscript": "nrf52833_s113_v7.ld"
}, },
"core": "nRF5", "core": "nRF5",
"cpu": "cortex-m4", "cpu": "cortex-m4",
@ -16,9 +16,9 @@
"name": "adafruit" "name": "adafruit"
}, },
"softdevice": { "softdevice": {
"sd_flags": "-DS140", "sd_flags": "-DS113",
"sd_name": "s140", "sd_name": "s113",
"sd_version": "6.1.1", "sd_version": "7.2.0",
"sd_fwid": "0x00b6" "sd_fwid": "0x00b6"
}, },
"bootloader": { "bootloader": {

2
src/gps/NMEAGPS.cpp
View File

@ -104,7 +104,7 @@ bool NMEAGPS::whileIdle()
// First consume any chars that have piled up at the receiver // First consume any chars that have piled up at the receiver
while (_serial_gps->available() > 0) { while (_serial_gps->available() > 0) {
int c = _serial_gps->read(); int c = _serial_gps->read();
DEBUG_MSG("%c", c); // DEBUG_MSG("%c", c);
isValid |= reader.encode(c); isValid |= reader.encode(c);
} }

2
src/nrf52/main-nrf52.cpp
View File

@ -49,7 +49,7 @@ void getMacAddr(uint8_t *dmac)
NRF52Bluetooth *nrf52Bluetooth; NRF52Bluetooth *nrf52Bluetooth;
static bool bleOn = false; static bool bleOn = false;
static const bool enableBle = false; // Set to false for easier debugging static const bool enableBle = true; // Set to false for easier debugging
void setBluetoothEnable(bool on) void setBluetoothEnable(bool on)
{ {

3
variants/pca10056-rc-clock/variant.h
View File

@ -146,6 +146,9 @@ static const uint8_t SCK = PIN_SPI_SCK;
#define SX1262_RESET (0 + 3) // P0.03 #define SX1262_RESET (0 + 3) // P0.03
#define SX1262_ANT_SW (32 + 10) // P1.10 #define SX1262_ANT_SW (32 + 10) // P1.10
// To debug via the segger JLINK console rather than the CDC-ACM serial device
#define USE_SEGGER
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif