all: Change PYB message prefix to MPY.

Replaces "PYB: soft reboot" with "MPY: soft reboot", etc.

Having a consistent prefix across ports reduces the difference between
ports, which is a general goal.  And this change won't break pyboard.py
because that tool only looks for "soft reboot".
This commit is contained in:
Mike Causer 2017-12-03 22:42:50 +11:00 committed by Damien George
parent d976e4f5e8
commit 812969d615
10 changed files with 16 additions and 16 deletions

View File

@ -96,8 +96,8 @@ If something goes wrong, you can reset the board in two ways. The first is to pr
at the MicroPython prompt, which performs a soft reset. You will see a message something like ::
>>>
PYB: sync filesystems
PYB: soft reboot
MPY: sync filesystems
MPY: soft reboot
Micro Python v1.0 on 2014-05-03; PYBv1.0 with STM32F405RG
Type "help()" for more information.
>>>

View File

@ -174,8 +174,8 @@ variables no longer exist:
.. code-block:: python
PYB: sync filesystems
PYB: soft reboot
MPY: sync filesystems
MPY: soft reboot
MicroPython v1.5-51-g6f70283-dirty on 2015-10-30; PYBv1.0 with STM32F405RG
Type "help()" for more information.
>>> dir()

View File

@ -120,7 +120,7 @@ If something goes wrong, you can reset the board in two ways. The first is to pr
at the MicroPython prompt, which performs a soft reset. You will see a message something like::
>>>
PYB: soft reboot
MPY: soft reboot
MicroPython v1.4.6-146-g1d8b5e5 on 2015-10-21; WiPy with CC3200
Type "help()" for more information.
>>>

View File

@ -450,7 +450,7 @@ friendly_repl_reset:
// do the user a favor and reenable interrupts.
if (query_irq() == IRQ_STATE_DISABLED) {
enable_irq(IRQ_STATE_ENABLED);
mp_hal_stdout_tx_str("PYB: enabling IRQs\r\n");
mp_hal_stdout_tx_str("MPY: enabling IRQs\r\n");
}
}
#endif

View File

@ -234,7 +234,7 @@ soft_reset_exit:
// soft reset
pyb_sleep_signal_soft_reset();
mp_printf(&mp_plat_print, "PYB: soft reboot\n");
mp_printf(&mp_plat_print, "MPY: soft reboot\n");
// disable all callbacks to avoid undefined behaviour
// when coming out of a soft reset

View File

@ -138,7 +138,7 @@ soft_reset:
gc_sweep_all();
mp_hal_stdout_tx_str("PYB: soft reboot\r\n");
mp_hal_stdout_tx_str("MPY: soft reboot\r\n");
// deinitialise peripherals
machine_pins_deinit();

View File

@ -86,7 +86,7 @@ STATIC void mp_reset(void) {
void soft_reset(void) {
gc_sweep_all();
mp_hal_stdout_tx_str("PYB: soft reboot\r\n");
mp_hal_stdout_tx_str("MPY: soft reboot\r\n");
mp_hal_delay_us(10000); // allow UART to flush output
mp_reset();
#if MICROPY_REPL_EVENT_DRIVEN

View File

@ -87,7 +87,7 @@ soft_reset:
}
}
printf("PYB: soft reboot\n");
printf("MPY: soft reboot\n");
mp_deinit();
goto soft_reset;
}

View File

@ -203,7 +203,7 @@ MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
if (res == FR_OK) {
// success creating fresh LFS
} else {
printf("PYB: can't create flash filesystem\n");
printf("MPY: can't create flash filesystem\n");
return false;
}
@ -235,7 +235,7 @@ MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
// mount sucessful
} else {
fail:
printf("PYB: can't mount flash\n");
printf("MPY: can't mount flash\n");
return false;
}
@ -349,7 +349,7 @@ STATIC bool init_sdcard_fs(void) {
}
if (first_part) {
printf("PYB: can't mount SD card\n");
printf("MPY: can't mount SD card\n");
return false;
} else {
return true;
@ -763,11 +763,11 @@ soft_reset_exit:
// soft reset
#if MICROPY_HW_ENABLE_STORAGE
printf("PYB: sync filesystems\n");
printf("MPY: sync filesystems\n");
storage_flush();
#endif
printf("PYB: soft reboot\n");
printf("MPY: soft reboot\n");
#if MICROPY_PY_NETWORK
mod_network_deinit();
#endif

View File

@ -343,7 +343,7 @@ soft_reset:
}
}
printf("PYB: soft reboot\n");
printf("MPY: soft reboot\n");
// first_soft_reset = false;
goto soft_reset;