diff options
| author | Hierophect <hierophect@gmail.com> | 2019-06-28 19:22:23 -0400 |
|---|---|---|
| committer | Hierophect <hierophect@gmail.com> | 2019-06-28 19:22:23 -0400 |
| commit | 94a2eff05c410ee6a111efa0c48abd78b3518092 (patch) | |
| tree | 936a0c8335d3f67465e2f2fdd092f297b92903a9 /supervisor | |
| parent | 04a9bc0d352e76d65d50178e6f7a364511bf75b9 (diff) | |
remove build, fix link issues)
Diffstat (limited to 'supervisor')
| -rw-r--r-- | supervisor/shared/micropython.c | 6 | ||||
| -rw-r--r-- | supervisor/shared/safe_mode.c | 19 | ||||
| -rw-r--r-- | supervisor/supervisor.mk | 3 |
3 files changed, 15 insertions, 13 deletions
diff --git a/supervisor/shared/micropython.c b/supervisor/shared/micropython.c index 245db11d4..db9864793 100644 --- a/supervisor/shared/micropython.c +++ b/supervisor/shared/micropython.c @@ -30,7 +30,7 @@ #include "lib/oofatfs/ff.h" #include "py/mpconfig.h" -#include "supervisor/shared/status_leds.h" +//#include "supervisor/shared/status_leds.h" int mp_hal_stdin_rx_chr(void) { for (;;) { @@ -38,14 +38,14 @@ int mp_hal_stdin_rx_chr(void) { MICROPY_VM_HOOK_LOOP #endif if (serial_bytes_available()) { - toggle_rx_led(); + //toggle_rx_led(); return serial_read(); } } } void mp_hal_stdout_tx_strn(const char *str, size_t len) { - toggle_tx_led(); + //toggle_tx_led(); #ifdef CIRCUITPY_BOOT_OUTPUT_FILE if (boot_output_file != NULL) { diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c index d8d3ab379..33a9e660e 100644 --- a/supervisor/shared/safe_mode.c +++ b/supervisor/shared/safe_mode.c @@ -59,15 +59,16 @@ safe_mode_t wait_for_safe_mode_reset(void) { common_hal_digitalio_digitalinout_construct(&status_led, MICROPY_HW_LED_STATUS); common_hal_digitalio_digitalinout_switch_to_output(&status_led, true, DRIVE_MODE_PUSH_PULL); #endif - uint64_t start_ticks = ticks_ms; - uint64_t diff = 0; - while (diff < 700) { - #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); - #endif - diff = ticks_ms - start_ticks; - } + // uint64_t start_ticks = 0;//ticks_ms; + // uint64_t diff = 0; + // while (diff < 700) { + // #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); + // #endif + // diff = 0 - start_ticks; + // //diff = ticks_ms - start_ticks; + // } #ifdef MICROPY_HW_LED_STATUS common_hal_digitalio_digitalinout_deinit(&status_led); #endif diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index 614daba4d..4ea3a8260 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -6,13 +6,14 @@ SRC_SUPERVISOR = \ supervisor/shared/flash.c \ supervisor/shared/micropython.c \ supervisor/shared/rgb_led_status.c \ - supervisor/shared/safe_mode.c \ supervisor/shared/stack.c \ + supervisor/shared/safe_mode.c \ supervisor/shared/translate.c #bug, not conditional # supervisor/shared/display.c \ # supervisor/shared/status_leds.c \ +# supervisor/shared/safe_mode.c \ ifndef $(NO_USB) |