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

Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Hosted Weblate 2021-05-20 15:02:41 +02:00
parent 0c2c725978 74355e8281
commit 132185238a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
supervisor/shared/safe_mode.c
View File

@ -78,7 +78,7 @@ safe_mode_t wait_for_safe_mode_reset(void) {
#endif
uint64_t start_ticks = supervisor_ticks_ms64();
uint64_t diff = 0;
while (diff < 700) {
while (diff < 1000) {
#ifdef MICROPY_HW_LED_STATUS
// 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);