From 8d2d167accf0adcc456bb72224fe65ddd76038a7 Mon Sep 17 00:00:00 2001 From: Charlie Birks Date: Fri, 13 Sep 2024 15:13:04 +0100 Subject: [PATCH 1/4] Rename DFU -> bootloader in PicoSystem quick starts DFU is an entirely different thing. Also clarify that you can only load UF2 files with it --- tutorials/quick-start/picosystem-cpp.md | 8 ++++---- tutorials/quick-start/picosystem-micropython.md | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tutorials/quick-start/picosystem-cpp.md b/tutorials/quick-start/picosystem-cpp.md index 9aa2f94..1951fd8 100644 --- a/tutorials/quick-start/picosystem-cpp.md +++ b/tutorials/quick-start/picosystem-cpp.md @@ -48,9 +48,9 @@ git clone https://github.com/pimoroni/picosystem-boilerplate.git ## Things you might not know -### DFU mode +### Bootloader mode -DFU mode allows you to copy files onto your PicoSystem as if it is a standard USB storage device. +Bootloader mode allows you to copy .uf2 files onto your PicoSystem as if it is a standard USB storage device. Make sure it's powered off, plug it into your computer and then press the X button and power button at the same time. It will then appear as a drive, usually named "RPI-RP2", and you can copy a `.uf2` file across to it. @@ -81,7 +81,7 @@ If this doesn't work, make sure that your USB cable is one which supports data t make ``` -4. Each example will be generated in a subdirectory called `examples//`. For example, the "shapes" demo will be called `examples/shapes/shapes.uf2`. You can then copy a game to your PicoSystem via DFU mode. +4. Each example will be generated in a subdirectory called `examples//`. For example, the "shapes" demo will be called `examples/shapes/shapes.uf2`. You can then copy a game to your PicoSystem via bootloader mode. ## Build the boilerplate repository @@ -134,7 +134,7 @@ Please note that although these instructions are similar to the above instructio make ``` -5. The `.uf2` file will be generated in the directory you are currently in, and will be called `my_project.uf2`. You can then copy this game to your PicoSystem via DFU mode. +5. The `.uf2` file will be generated in the directory you are currently in, and will be called `my_project.uf2`. You can then copy this game to your PicoSystem via bootloader mode. ### Final result diff --git a/tutorials/quick-start/picosystem-micropython.md b/tutorials/quick-start/picosystem-micropython.md index 65fe2de..32c4ef9 100644 --- a/tutorials/quick-start/picosystem-micropython.md +++ b/tutorials/quick-start/picosystem-micropython.md @@ -15,7 +15,7 @@ You can get the latest MicroPython build for PicoSystem on the [releases page](h The file is located under the "Assets" section of the release, and will be named something similar to `picosystem-v0.1.3-micropython-v1.19.uf2`. -You can load this onto the PicoSystem (to make it ready to run your MicroPython games) by entering [DFU mode](#dfu-mode) and copying it across to the drive which appears on your computer. +You can load this onto the PicoSystem (to make it ready to run your MicroPython games) by entering [bootloader mode](#bootloader-mode) and copying it across to the drive which appears on your computer. ### ampy @@ -29,9 +29,9 @@ python3 -m pip install adafruit-ampy ## Things you might not know -### DFU mode +### Bootloader mode -DFU mode allows you to copy files onto your PicoSystem as if it is a standard USB storage device. +bootloader mode allows you to copy .uf2 files onto your PicoSystem as if it is a standard USB storage device. Make sure it's powered off, plug it into your computer and then press the X button and power button at the same time. It will appear as a drive named "RPI-RP2", and you can copy a `.uf2` file across to it. From fca47971a55aa33900cec9b24d60221ec9b59d52 Mon Sep 17 00:00:00 2001 From: Charlie Birks Date: Fri, 13 Sep 2024 15:17:12 +0100 Subject: [PATCH 2/4] Capitalise macOS the silly way it's supposed to be --- tutorials/ninja-thief/episode-1.md | 2 +- tutorials/ninja-thief/handle-images-picosystem-micropython.md | 2 +- tutorials/quick-start/32blit-cpp.md | 4 ++-- tutorials/quick-start/picosystem-cpp.md | 2 +- tutorials/quick-start/picosystem-micropython.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tutorials/ninja-thief/episode-1.md b/tutorials/ninja-thief/episode-1.md index f457599..254f004 100644 --- a/tutorials/ninja-thief/episode-1.md +++ b/tutorials/ninja-thief/episode-1.md @@ -12,7 +12,7 @@ This mini-series is primarily aimed at people who have some experience coding in ## What do I need? -These tutorials are designed for owners of a 32blit or PicoSystem, but if you don't have either, you can still follow along, as the 32blit SDK supports building executables for Linux, Windows and MacOS. Who knows, maybe you'll decide to get yourself a 32blit or PicoSystem, to try your creations out in real life! +These tutorials are designed for owners of a 32blit or PicoSystem, but if you don't have either, you can still follow along, as the 32blit SDK supports building executables for Linux, Windows and macOS. Who knows, maybe you'll decide to get yourself a 32blit or PicoSystem, to try your creations out in real life! All the code examples will have versions for the 32blit SDK (C++) and the PicoSystem SDK (C++ and MicroPython). diff --git a/tutorials/ninja-thief/handle-images-picosystem-micropython.md b/tutorials/ninja-thief/handle-images-picosystem-micropython.md index 7f26733..9d36cf5 100644 --- a/tutorials/ninja-thief/handle-images-picosystem-micropython.md +++ b/tutorials/ninja-thief/handle-images-picosystem-micropython.md @@ -22,7 +22,7 @@ python3 convert-image.py spritesheet.png > If you get an error message saying that Python was not found, try using `python` instead of `python3`, and ensure that Python 3 is installed. -If you are using Linux or MacOS, you can also use: +If you are using Linux or macOS, you can also use: ``` cd assets diff --git a/tutorials/quick-start/32blit-cpp.md b/tutorials/quick-start/32blit-cpp.md index 54de8f1..3a74fff 100644 --- a/tutorials/quick-start/32blit-cpp.md +++ b/tutorials/quick-start/32blit-cpp.md @@ -68,7 +68,7 @@ If this doesn't work, make sure that your USB cable is one which supports data t Alternatively, you can click the drop-down next to the "Select Startup Item..." button (as seen in the previous image), and select a filename with a `.exe` suffix to run that example. -### Linux/MacOS (command line) +### Linux/macOS (command line) 1. Navigate to the 32blit-sdk directory and create the build directory: @@ -156,7 +156,7 @@ Once the boilerplate code is built and run, the window should look similar to th ![](cmake-settings-json.png) -### Linux/MacOS (command line) +### Linux/macOS (command line) 1. Navigate to the `32blit-boilerplate` directory and create the build directory: diff --git a/tutorials/quick-start/picosystem-cpp.md b/tutorials/quick-start/picosystem-cpp.md index 1951fd8..65b283a 100644 --- a/tutorials/quick-start/picosystem-cpp.md +++ b/tutorials/quick-start/picosystem-cpp.md @@ -56,7 +56,7 @@ Make sure it's powered off, plug it into your computer and then press the X butt If this doesn't work, make sure that your USB cable is one which supports data transfer (some very cheap cables only support power). - + ## Build the repository and examples diff --git a/tutorials/quick-start/picosystem-micropython.md b/tutorials/quick-start/picosystem-micropython.md index 32c4ef9..0e48e8c 100644 --- a/tutorials/quick-start/picosystem-micropython.md +++ b/tutorials/quick-start/picosystem-micropython.md @@ -64,7 +64,7 @@ When running files with `ampy`, any errors or messages which occur will be displ Some examples of terminal programs which support serial are: * Windows: `PuTTY` (download from [putty.org](https://www.putty.org/) or from the [Windows Store](https://apps.microsoft.com/store/detail/putty/XPFNZKSKLBP7RJ)) -* Linux/MacOS: `screen` (built-in) +* Linux/macOS: `screen` (built-in) ## Run the examples From 2e40eada9543839409cca89c6ef4181ec8005d52 Mon Sep 17 00:00:00 2001 From: Charlie Birks Date: Sat, 14 Sep 2024 12:12:18 +0100 Subject: [PATCH 3/4] Clean up .DS_Store files --- .DS_Store | Bin 6148 -> 0 bytes .gitignore | 3 ++- source-code/.DS_Store | Bin 6148 -> 0 bytes source-code/individual-tutorials/.DS_Store | Bin 6148 -> 0 bytes .../creating-menus/.DS_Store | Bin 6148 -> 0 bytes .../creating-menus/state-pattern-menu/.DS_Store | Bin 6148 -> 0 bytes tutorials/.DS_Store | Bin 6148 -> 0 bytes 7 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 .DS_Store delete mode 100644 source-code/.DS_Store delete mode 100644 source-code/individual-tutorials/.DS_Store delete mode 100644 source-code/individual-tutorials/creating-menus/.DS_Store delete mode 100644 source-code/individual-tutorials/creating-menus/state-pattern-menu/.DS_Store delete mode 100644 tutorials/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 6b60dd914bb75a758c6895926c421c4057265c7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~%}T>S5XWcxVN;8cgM!``yjD!LP>Poj>kAmsgGx=Bpuw0e`LKsl$X#E^7x8(V z{U}n~-bAGA!0vyuJCiWKvb!AsAWji<089WduyL(zW4FTiI&Vu>Q8RT^BHl5A5RPC3 z41y(ZJ)sF`0{@Kw-@7fyaK{#q;?Divzo9?L#(vCv^!V_{ag^nj^+_t#T79cwG>n#U z?>@1Kn|pbYIbM3ppRO2-{rTAQucL4>G9&^(wQk92l+Vb2BQlaohp@t^L`MX#e+$|zHy||Jc!f5NGHV607EX%<1|u}t{SIN zrgMGcaB5DiU*Dci+pgP?P4{5dkkjUVtJ9F}PHQ%+Ih#9shbR5J(b`vu9c|Q rs3a6u7<@~?j=qX9magJ0R4r(i)Iszt76#FR!XE;f25y*vA7$Vby2VyN diff --git a/source-code/individual-tutorials/.DS_Store b/source-code/individual-tutorials/.DS_Store deleted file mode 100644 index 20ccd64233d2b94e020e37d8c6b6efa3e29bd21e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKQA@)x5WZ~Fbqr+>3i=lCbz-N2h%aT%KVU^4RA%eSEY?QW&OMAl-}MjqNBlkB zC7C#;z6c`Y4ldv2a+i=VCD#CeXb*cWfCd0KsDz~&HeU#hlg>%WdI*J{BZnAL=)*QV z%tf=~KQcgPw+go~fCvKke0~w0ze_m z=G3~4&GGoab(^x~?oFC<+}hngY|4Yf{mG=}tZ(fcop$e&hg3ZqW(9tPT2?Gh;RTH! zH~Hib(nO_wjGN9e&1GZ;m;q*B0U5AYol{@Hz44Zq0cPNL4AA``Q3*YZg+YCFU_-x; zG+rSjL7UzZgwmpCu`q}uD8i&7np9z*7{a8ZU)ng&VqwsvgU~DEJa%PaUnoMaj((}b zL3jqaWd@jmSq93c+o1Y?^8NdNHi>)805h;q42Vj{@3e7Cwzke~j%uw$y+I|RxWeE^ k3L3f;V=R^84OA`Ymt-J%77K&uLE#?(O#?T~z@IYk4nK)d#Q*>R diff --git a/source-code/individual-tutorials/creating-menus/.DS_Store b/source-code/individual-tutorials/creating-menus/.DS_Store deleted file mode 100644 index 8e70ededa334c088b6ba9abd0867575de2dbebcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK!Ab)$5S`R&w}?Wo zBo#{)JcwYKDU&yu%p}Z9Nj3l=+JkNjpaB3LDq*FL%@;!Bq%%@+9ztQ}NMIX!5J7=I zmjA#2?cFNmxL>qupZ70;J}BJJNAxNf#KXK7XFA6C*SMFZdExtSqOwq3T&j6BZ`r#E z@AWV&qGFJ@qy823&b7|si5K-%h=Ie>B6?8xL%`6$4Kwhk47>y2q*LSo diff --git a/source-code/individual-tutorials/creating-menus/state-pattern-menu/.DS_Store b/source-code/individual-tutorials/creating-menus/state-pattern-menu/.DS_Store deleted file mode 100644 index 7698eb6fede17544850b056809e9d66fcd502105..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~%}xR_5XYy0vPeugXri|!UNJ5o2_arKh%ew8J*Yueh;CfB1Qt0ElD+E-`651# zGi@;v@ZiNnnIY3(+v#l6|B`kK0HQVSRRBr=;Gh#T1uRw=#mSc}V|$1~KO=+$4&e?4 z_+$GE3edaTf*MpIfC#?4zhE*N1d$3b{uT_PaFn?2yU1j78=HA2?-ZRI|3OXsq??RK zt?uxOTIWhd!MxrLF2eq#Q`$LEancRr{!k}`y*>`Pz6|4@nzYn7?u~S=ZvsxiDRfHv z(`mzX%d+CuW@S08RO`*MY&7e$S;5&oI66M-JVsBkdNB$M{PStsww&V?D=QcG><{Be z#rGJW=gxDOtN<&(3ao(wcI$JBYp_;cA}hcO{7eDbA0#@_vrG;3)`10mK2khKB*Qx0 zC5Y0}vrG*!f+kEV(xeJ|#SkVP`=uS{S*C_29fY14pJQhh_J$(#?AR~$a1fp$m#hFQ zu&6-RG)r{;pMHP;Urgc_E5Hi;D+NTZ?YCRFBzv|lEsoAwiGGVtM&nY$&lIfaqZr51 eQM`w)4f`ckke+2~h&^chA)sa8f))5x1wH^b*i3o= diff --git a/tutorials/.DS_Store b/tutorials/.DS_Store deleted file mode 100644 index e2d9e0897eb9a696d18d45ed20d68901bc86761f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKyG{c^3>-s>NNG}1?hjD#2dgN20YAVaAV5)45c;e5u6$a?4T`1gECI~vj`;F0HGl3tv5U$WkhlTbF0dnGhxZZx zW%Kd0ecbQ2=ZVTn0VyB_q<|EV0>4tgdoOLiNK}*pQa}oPE8yRUMtAImLt=b77-9q< z&X^A4I%WxC^8~RM4vEarEUCn#T8$W%bmm*t^}-=B>986;tWLI?P%KX8`&*R5dZMBf zkOE@`E_1u|{(npVVg4VJw37l-;9n_Vv-RD2#Vb{Bom|d)ZKL1Qz2-=F<2on|(T<7H ij=Ax6d=*7m*L=LhjI`cs%>Sw@pkx7BSR^SA!uoZ9s From cf2a892420565d17be9b37095d7adb171869b447 Mon Sep 17 00:00:00 2001 From: Charlie Birks Date: Sat, 14 Sep 2024 12:15:32 +0100 Subject: [PATCH 4/4] Update repo url in metadata --- source-code/ninja-thief/episode-1/32blit-cpp/metadata.yml | 2 +- source-code/ninja-thief/episode-2/32blit-cpp/metadata.yml | 2 +- source-code/ninja-thief/episode-3/32blit-cpp/metadata.yml | 2 +- source-code/ninja-thief/episode-4/32blit-cpp/metadata.yml | 2 +- source-code/ninja-thief/episode-5/32blit-cpp/metadata.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source-code/ninja-thief/episode-1/32blit-cpp/metadata.yml b/source-code/ninja-thief/episode-1/32blit-cpp/metadata.yml index d76339d..694b369 100644 --- a/source-code/ninja-thief/episode-1/32blit-cpp/metadata.yml +++ b/source-code/ninja-thief/episode-1/32blit-cpp/metadata.yml @@ -7,4 +7,4 @@ icon: file: assets/icon.png version: v1.0.0 category: game -url: https://github.com/ThePythonator/Pimoroni-Tutorials \ No newline at end of file +url: https://github.com/32blit/32blit-tutorials-contrib \ No newline at end of file diff --git a/source-code/ninja-thief/episode-2/32blit-cpp/metadata.yml b/source-code/ninja-thief/episode-2/32blit-cpp/metadata.yml index d76339d..694b369 100644 --- a/source-code/ninja-thief/episode-2/32blit-cpp/metadata.yml +++ b/source-code/ninja-thief/episode-2/32blit-cpp/metadata.yml @@ -7,4 +7,4 @@ icon: file: assets/icon.png version: v1.0.0 category: game -url: https://github.com/ThePythonator/Pimoroni-Tutorials \ No newline at end of file +url: https://github.com/32blit/32blit-tutorials-contrib \ No newline at end of file diff --git a/source-code/ninja-thief/episode-3/32blit-cpp/metadata.yml b/source-code/ninja-thief/episode-3/32blit-cpp/metadata.yml index d76339d..694b369 100644 --- a/source-code/ninja-thief/episode-3/32blit-cpp/metadata.yml +++ b/source-code/ninja-thief/episode-3/32blit-cpp/metadata.yml @@ -7,4 +7,4 @@ icon: file: assets/icon.png version: v1.0.0 category: game -url: https://github.com/ThePythonator/Pimoroni-Tutorials \ No newline at end of file +url: https://github.com/32blit/32blit-tutorials-contrib \ No newline at end of file diff --git a/source-code/ninja-thief/episode-4/32blit-cpp/metadata.yml b/source-code/ninja-thief/episode-4/32blit-cpp/metadata.yml index d76339d..694b369 100644 --- a/source-code/ninja-thief/episode-4/32blit-cpp/metadata.yml +++ b/source-code/ninja-thief/episode-4/32blit-cpp/metadata.yml @@ -7,4 +7,4 @@ icon: file: assets/icon.png version: v1.0.0 category: game -url: https://github.com/ThePythonator/Pimoroni-Tutorials \ No newline at end of file +url: https://github.com/32blit/32blit-tutorials-contrib \ No newline at end of file diff --git a/source-code/ninja-thief/episode-5/32blit-cpp/metadata.yml b/source-code/ninja-thief/episode-5/32blit-cpp/metadata.yml index d76339d..694b369 100644 --- a/source-code/ninja-thief/episode-5/32blit-cpp/metadata.yml +++ b/source-code/ninja-thief/episode-5/32blit-cpp/metadata.yml @@ -7,4 +7,4 @@ icon: file: assets/icon.png version: v1.0.0 category: game -url: https://github.com/ThePythonator/Pimoroni-Tutorials \ No newline at end of file +url: https://github.com/32blit/32blit-tutorials-contrib \ No newline at end of file