pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-12 16:12:07 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

switch to my new SD 7.2.0 S113 based bootloader

Browse Source
This commit is contained in:
Kevin Hester 2020-10-31 12:22:20 +08:00
parent d7368d5a51
commit bbc36f7b6f
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boards/nrf52840_dk_modified.json
View File

@ -1,7 +1,7 @@
{ {
"build": { "build": {
"arduino": { "arduino": {
"ldscript": "nrf52840_s140_v6.ld" "ldscript": "nrf52840_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": {

9
src/mesh/SX1262Interface.cpp
View File

@ -201,16 +201,17 @@ bool SX1262Interface::isActivelyReceiving()
bool SX1262Interface::sleep() bool SX1262Interface::sleep()
{ {
DEBUG_MSG("sx1262 entering sleep mode\n"); // Not keeping config is busted - next time nrf52 board boots lora sending fails tcxo related? - see datasheet
DEBUG_MSG("sx1262 entering sleep mode (FIXME, don't keep config)\n");
setStandby(); // Stop any pending operations setStandby(); // Stop any pending operations
// turn off TCXO if it was powered // turn off TCXO if it was powered
// FIXME - this isn't correct // FIXME - this isn't correct
// lora.setTCXO(0); // lora.setTCXO(0);
// put chipset into sleep mode // put chipset into sleep mode (we've already disabled interrupts by now)
disableInterrupt(); bool keepConfig = true;
lora.sleep(false); // Note: we do not keep the config, full reinit will be needed lora.sleep(keepConfig); // Note: we do not keep the config, full reinit will be needed
#ifdef SX1262_POWER_EN #ifdef SX1262_POWER_EN
digitalWrite(SX1262_POWER_EN, LOW); digitalWrite(SX1262_POWER_EN, LOW);

3
variants/eink/variant.h
View File

@ -205,6 +205,7 @@ External serial flash WP25R1635FZUIL0
#define PIN_EINK_MOSI (0 + 29) // also called SDI #define PIN_EINK_MOSI (0 + 29) // also called SDI
// Controls power for the eink display - Board power is enabled either by VBUS from USB or the CPU asserting PWR_ON // Controls power for the eink display - Board power is enabled either by VBUS from USB or the CPU asserting PWR_ON
// FIXME - I think this is actually just the board power enable - it enables power to the CPU also
#define PIN_EINK_PWR_ON (0 + 12) #define PIN_EINK_PWR_ON (0 + 12)
#define HAS_EINK #define HAS_EINK
@ -242,7 +243,7 @@ External serial flash WP25R1635FZUIL0
#define PIN_SPI_SCK (0 + 19) #define PIN_SPI_SCK (0 + 19)
// To debug via the segger JLINK console rather than the CDC-ACM serial device // To debug via the segger JLINK console rather than the CDC-ACM serial device
// #define USE_SEGGER #define USE_SEGGER
#ifdef __cplusplus #ifdef __cplusplus
} }