djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '6.3.x-cherry-pick-from-main' of https://github.com/dhalbert/circuitpython into 6.3.x-cherry-pick-from-main

Browse Source
This commit is contained in:
Dan Halbert 2021-05-25 09:56:46 -04:00
commit 378a727ed0
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -494,7 +494,7 @@ jobs:
id: idf-cache id: idf-cache
with: with:
path: ${{ github.workspace }}/.idf_tools path: ${{ github.workspace }}/.idf_tools
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210513 key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210518
- name: Clone IDF submodules - name: Clone IDF submodules
run: | run: |
(cd $IDF_PATH && git submodule update --init) (cd $IDF_PATH && git submodule update --init)

6
ports/raspberrypi/supervisor/port.c
View File

@ -196,13 +196,13 @@ uint32_t *port_heap_get_top(void) {
return port_stack_get_top(); return port_stack_get_top();
} }
extern uint32_t __scratch_x_start__;
void port_set_saved_word(uint32_t value) { void port_set_saved_word(uint32_t value) {
// NOTE: This doesn't survive pressing the reset button (aka toggling RUN). __scratch_x_start__ = value;
watchdog_hw->scratch[0] = value;
} }
uint32_t port_get_saved_word(void) { uint32_t port_get_saved_word(void) {
return watchdog_hw->scratch[0]; return __scratch_x_start__;
} }
uint64_t port_get_raw_ticks(uint8_t *subticks) { uint64_t port_get_raw_ticks(uint8_t *subticks) {

2
supervisor/shared/safe_mode.c
View File

@ -78,7 +78,7 @@ safe_mode_t wait_for_safe_mode_reset(void) {
#endif #endif
uint64_t start_ticks = supervisor_ticks_ms64(); uint64_t start_ticks = supervisor_ticks_ms64();
uint64_t diff = 0; uint64_t diff = 0;
while (diff < 700) { while (diff < 1000) {
#ifdef MICROPY_HW_LED_STATUS #ifdef MICROPY_HW_LED_STATUS
// Blink on for 100, off for 100, on for 100, off for 100 and on for 200 // Blink on for 100, off for 100, on for 100, off for 100 and on for 200
common_hal_digitalio_digitalinout_set_value(&status_led, diff > 100 && diff / 100 != 2 && diff / 100 != 4); common_hal_digitalio_digitalinout_set_value(&status_led, diff > 100 && diff / 100 != 2 && diff / 100 != 4);