From dec6b6ac1d7d773f5ed0e7f5ccdd836a2a64aa29 Mon Sep 17 00:00:00 2001 From: Paul Cutler Date: Thu, 28 Jul 2022 13:15:09 -0500 Subject: [PATCH 1/3] Update serial paragraph to remove Adafruit mention and replace with ESP and MicroPython --- en/tutorials/1.1/esp.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en/tutorials/1.1/esp.md b/en/tutorials/1.1/esp.md index 3d76255..5af7b25 100644 --- a/en/tutorials/1.1/esp.md +++ b/en/tutorials/1.1/esp.md @@ -31,10 +31,10 @@ buttons:
-The "Serial" button opens a serial data connection to the Adafruit board you +The "Serial" button opens a serial data connection to the ESP board you may have connected to your computer. This will result in a new pane between the text editor and Mu's footer. Any serial data emitted from the device will -appear here. If you need to drop into the CircuitPython REPL you should make +appear here. If you need to drop into the MicroPython REPL you should make sure the pane has keyboard focus (just click it!) and then type CTRL-C, as shown below: From 1272dcea63ae07888418216562825c65cc5168e3 Mon Sep 17 00:00:00 2001 From: Paul Cutler Date: Fri, 29 Jul 2022 06:52:44 -0500 Subject: [PATCH 2/3] Fix issue 1340 and add language about multiple Mu installations to install_windows.md --- en/howto/1.1/install_windows.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/en/howto/1.1/install_windows.md b/en/howto/1.1/install_windows.md index fe4c061..67e2279 100644 --- a/en/howto/1.1/install_windows.md +++ b/en/howto/1.1/install_windows.md @@ -12,8 +12,9 @@ Mu works on 64 bit versions of Windows. It's a good idea to make sure your syste If you are in an educational setting you may need to get your system administrator to run the installer for you. -**If you have an older version of Mu already installed, we recommend that you -uninstall it first.** +**If you have a version of Mu older than version 1.1 already installed, we recommend that you +uninstall it first. If you do not uninstall first, you will have two installations of Mu due to +packaging changes with Mu versions 1.1 and newer.** ## Step 1 - Download Mu Installer From 35ade39327358b09456f923c14ec711c1970a1ce Mon Sep 17 00:00:00 2001 From: Paul Cutler Date: Fri, 29 Jul 2022 06:58:17 -0500 Subject: [PATCH 3/3] Revert "Update serial paragraph to remove Adafruit mention and replace with ESP and MicroPython" This reverts commit dec6b6ac1d7d773f5ed0e7f5ccdd836a2a64aa29. --- en/tutorials/1.1/esp.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en/tutorials/1.1/esp.md b/en/tutorials/1.1/esp.md index 5af7b25..3d76255 100644 --- a/en/tutorials/1.1/esp.md +++ b/en/tutorials/1.1/esp.md @@ -31,10 +31,10 @@ buttons:
-The "Serial" button opens a serial data connection to the ESP board you +The "Serial" button opens a serial data connection to the Adafruit board you may have connected to your computer. This will result in a new pane between the text editor and Mu's footer. Any serial data emitted from the device will -appear here. If you need to drop into the MicroPython REPL you should make +appear here. If you need to drop into the CircuitPython REPL you should make sure the pane has keyboard focus (just click it!) and then type CTRL-C, as shown below: