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

atmel-samd: Add message for when auto reset is off. Fixes #112

Browse Source
This commit is contained in:
Scott Shawcroft 2017-03-27 20:12:30 +01:00
parent be1ed7aae4
commit f5caf86870
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atmel-samd/autoreset.c
View File

@ -54,6 +54,10 @@ void autoreset_disable() {
autoreset_enabled = false;
}
inline bool autoreset_is_enabled() {
return autoreset_enabled;
}
void autoreset_start() {
autoreset_delay_ms = AUTORESET_DELAY_MS;
}

1
atmel-samd/autoreset.h
View File

@ -37,5 +37,6 @@ void autoreset_start(void);
void autoreset_stop(void);
void autoreset_enable(void);
void autoreset_disable(void);
bool autoreset_is_enabled(void);
#endif // __MICROPY_INCLUDED_ATMEL_SAMD_AUTORESET_H__

12
atmel-samd/main.c
View File

@ -259,7 +259,7 @@ bool start_mp(void) {
#ifdef AUTORESET_DELAY_MS
if (cdc_enabled_at_start) {
mp_hal_stdout_tx_str("\r\n");
mp_hal_stdout_tx_str("Auto-soft reset is on. Simply save files over USB to run them.\r\n");
mp_hal_stdout_tx_str("Auto-soft reset is on. Simply save files over USB to run them or enter REPL to disable.\r\n");
}
#endif
@ -330,10 +330,14 @@ bool start_mp(void) {
if (!cdc_enabled_before && mp_cdc_enabled) {
if (cdc_enabled_at_start) {
mp_hal_stdout_tx_str("\r\n\r\n");
} else {
mp_hal_stdout_tx_str("Auto-soft reset is on. Simply save files over USB to run them.\r\n");
}
mp_hal_stdout_tx_str("Press any key to enter the REPL and disable auto-reset. Use CTRL-D to soft reset.\r\n");
if (!cdc_enabled_at_start && autoreset_is_enabled()) {
mp_hal_stdout_tx_str("Auto-soft reset is on. Simply save files over USB to run them or enter REPL to disable.\r\n");
} else {
mp_hal_stdout_tx_str("Auto-soft reset is off.\r\n");
}
mp_hal_stdout_tx_str("Press any key to enter the REPL. Use CTRL-D to soft reset.\r\n");
}
if (cdc_enabled_before && !mp_cdc_enabled) {
cdc_enabled_at_start = false;