diff --git a/bin/install-bootloader.sh b/bin/install-bootloader.sh index cd03281fb..eeb2071b9 100755 --- a/bin/install-bootloader.sh +++ b/bin/install-bootloader.sh @@ -8,12 +8,13 @@ set -e BOOTDIR=/home/kevinh/development/meshtastic/Adafruit_nRF52_Bootloader BOARD=othernet_ppr1 BOOTVER=0.3.2 -BOOTNUM=125 -BOOTSHA=g4582f73 -SDVER=6.1.1 +BOOTNUM=128 +BOOTSHA=gc01b9ea +SDCODE=s113 +SDVER=7.2.0 PROJ=ppr1 -# FIXME for nRF52840 use 0xff000 +# FIXME for nRF52840 use 0xff000, for nRF52833 use 0x7f000 BOOTSET=0x7f000 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 srec_cat /tmp/bootconf.bin -binary -offset $BOOTSET -output /tmp/bootconf.hex -intel -echo Generating merged hex file -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 +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_${SDCODE}_$SDVER.hex .pio/build/$PROJ/firmware.hex /tmp/bootconf.hex echo Telling bootloader app region is valid and telling CPU to run nrfjprog --program ${BOARD}_full.hex -f nrf52 --reset diff --git a/boards/ppr1.json b/boards/ppr1.json index 6c395b0b4..4c0528245 100644 --- a/boards/ppr1.json +++ b/boards/ppr1.json @@ -1,7 +1,7 @@ { "build": { "arduino": { - "ldscript": "nrf52833_s140_v6.ld" + "ldscript": "nrf52833_s113_v7.ld" }, "core": "nRF5", "cpu": "cortex-m4", @@ -16,9 +16,9 @@ "name": "adafruit" }, "softdevice": { - "sd_flags": "-DS140", - "sd_name": "s140", - "sd_version": "6.1.1", + "sd_flags": "-DS113", + "sd_name": "s113", + "sd_version": "7.2.0", "sd_fwid": "0x00b6" }, "bootloader": { diff --git a/src/gps/NMEAGPS.cpp b/src/gps/NMEAGPS.cpp index 78a8e4eb4..6a707bd8f 100644 --- a/src/gps/NMEAGPS.cpp +++ b/src/gps/NMEAGPS.cpp @@ -104,7 +104,7 @@ bool NMEAGPS::whileIdle() // First consume any chars that have piled up at the receiver while (_serial_gps->available() > 0) { int c = _serial_gps->read(); - DEBUG_MSG("%c", c); + // DEBUG_MSG("%c", c); isValid |= reader.encode(c); } diff --git a/src/nrf52/main-nrf52.cpp b/src/nrf52/main-nrf52.cpp index 3048588f2..6b4b1adc1 100644 --- a/src/nrf52/main-nrf52.cpp +++ b/src/nrf52/main-nrf52.cpp @@ -49,7 +49,7 @@ void getMacAddr(uint8_t *dmac) NRF52Bluetooth *nrf52Bluetooth; 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) { diff --git a/variants/pca10056-rc-clock/variant.h b/variants/pca10056-rc-clock/variant.h index b7201812a..48dc72df2 100644 --- a/variants/pca10056-rc-clock/variant.h +++ b/variants/pca10056-rc-clock/variant.h @@ -146,6 +146,9 @@ static const uint8_t SCK = PIN_SPI_SCK; #define SX1262_RESET (0 + 3) // P0.03 #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 } #endif