Skip to content

Commit 812969d

Browse files
mcauserdpgeorge
authored andcommitted
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".
1 parent d976e4f commit 812969d

File tree

10 files changed

+16
-16
lines changed

10 files changed

+16
-16
lines changed

docs/pyboard/tutorial/repl.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ If something goes wrong, you can reset the board in two ways. The first is to pr
9696
at the MicroPython prompt, which performs a soft reset. You will see a message something like ::
9797

9898
>>>
99-
PYB: sync filesystems
100-
PYB: soft reboot
99+
MPY: sync filesystems
100+
MPY: soft reboot
101101
Micro Python v1.0 on 2014-05-03; PYBv1.0 with STM32F405RG
102102
Type "help()" for more information.
103103
>>>

docs/reference/repl.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ variables no longer exist:
174174

175175
.. code-block:: python
176176
177-
PYB: sync filesystems
178-
PYB: soft reboot
177+
MPY: sync filesystems
178+
MPY: soft reboot
179179
MicroPython v1.5-51-g6f70283-dirty on 2015-10-30; PYBv1.0 with STM32F405RG
180180
Type "help()" for more information.
181181
>>> dir()

docs/wipy/tutorial/repl.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ If something goes wrong, you can reset the board in two ways. The first is to pr
120120
at the MicroPython prompt, which performs a soft reset. You will see a message something like::
121121

122122
>>>
123-
PYB: soft reboot
123+
MPY: soft reboot
124124
MicroPython v1.4.6-146-g1d8b5e5 on 2015-10-21; WiPy with CC3200
125125
Type "help()" for more information.
126126
>>>

lib/utils/pyexec.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ int pyexec_friendly_repl(void) {
450450
// do the user a favor and reenable interrupts.
451451
if (query_irq() == IRQ_STATE_DISABLED) {
452452
enable_irq(IRQ_STATE_ENABLED);
453-
mp_hal_stdout_tx_str("PYB: enabling IRQs\r\n");
453+
mp_hal_stdout_tx_str("MPY: enabling IRQs\r\n");
454454
}
455455
}
456456
#endif

ports/cc3200/mptask.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ void TASK_MicroPython (void *pvParameters) {
234234

235235
// soft reset
236236
pyb_sleep_signal_soft_reset();
237-
mp_printf(&mp_plat_print, "PYB: soft reboot\n");
237+
mp_printf(&mp_plat_print, "MPY: soft reboot\n");
238238

239239
// disable all callbacks to avoid undefined behaviour
240240
// when coming out of a soft reset

ports/esp32/main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ void mp_task(void *pvParameter) {
138138

139139
gc_sweep_all();
140140

141-
mp_hal_stdout_tx_str("PYB: soft reboot\r\n");
141+
mp_hal_stdout_tx_str("MPY: soft reboot\r\n");
142142

143143
// deinitialise peripherals
144144
machine_pins_deinit();

ports/esp8266/main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ STATIC void mp_reset(void) {
8686

8787
void soft_reset(void) {
8888
gc_sweep_all();
89-
mp_hal_stdout_tx_str("PYB: soft reboot\r\n");
89+
mp_hal_stdout_tx_str("MPY: soft reboot\r\n");
9090
mp_hal_delay_us(10000); // allow UART to flush output
9191
mp_reset();
9292
#if MICROPY_REPL_EVENT_DRIVEN

ports/pic16bit/main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ int main(int argc, char **argv) {
8787
}
8888
}
8989

90-
printf("PYB: soft reboot\n");
90+
printf("MPY: soft reboot\n");
9191
mp_deinit();
9292
goto soft_reset;
9393
}

ports/stm32/main.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
203203
if (res == FR_OK) {
204204
// success creating fresh LFS
205205
} else {
206-
printf("PYB: can't create flash filesystem\n");
206+
printf("MPY: can't create flash filesystem\n");
207207
return false;
208208
}
209209

@@ -235,7 +235,7 @@ MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
235235
// mount sucessful
236236
} else {
237237
fail:
238-
printf("PYB: can't mount flash\n");
238+
printf("MPY: can't mount flash\n");
239239
return false;
240240
}
241241

@@ -349,7 +349,7 @@ STATIC bool init_sdcard_fs(void) {
349349
}
350350

351351
if (first_part) {
352-
printf("PYB: can't mount SD card\n");
352+
printf("MPY: can't mount SD card\n");
353353
return false;
354354
} else {
355355
return true;
@@ -763,11 +763,11 @@ void stm32_main(uint32_t reset_mode) {
763763
// soft reset
764764

765765
#if MICROPY_HW_ENABLE_STORAGE
766-
printf("PYB: sync filesystems\n");
766+
printf("MPY: sync filesystems\n");
767767
storage_flush();
768768
#endif
769769

770-
printf("PYB: soft reboot\n");
770+
printf("MPY: soft reboot\n");
771771
#if MICROPY_PY_NETWORK
772772
mod_network_deinit();
773773
#endif

ports/teensy/main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ int main(void) {
343343
}
344344
}
345345

346-
printf("PYB: soft reboot\n");
346+
printf("MPY: soft reboot\n");
347347

348348
// first_soft_reset = false;
349349
goto soft_reset;

0 commit comments

Comments
 (0)