diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 6b60dd9..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index 7487384..9df25ba 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ build.stm32/ out/ .vs/ .vscode/ -CMakeSettings.json \ No newline at end of file +CMakeSettings.json +.DS_Store \ No newline at end of file diff --git a/source-code/.DS_Store b/source-code/.DS_Store deleted file mode 100644 index fcc63c7..0000000 Binary files a/source-code/.DS_Store and /dev/null differ diff --git a/source-code/individual-tutorials/.DS_Store b/source-code/individual-tutorials/.DS_Store deleted file mode 100644 index 20ccd64..0000000 Binary files a/source-code/individual-tutorials/.DS_Store and /dev/null differ 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 8e70ede..0000000 Binary files a/source-code/individual-tutorials/creating-menus/.DS_Store and /dev/null differ 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 7698eb6..0000000 Binary files a/source-code/individual-tutorials/creating-menus/state-pattern-menu/.DS_Store and /dev/null differ 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 diff --git a/tutorials/.DS_Store b/tutorials/.DS_Store deleted file mode 100644 index e2d9e08..0000000 Binary files a/tutorials/.DS_Store and /dev/null differ 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 9aa2f94..65b283a 100644 --- a/tutorials/quick-start/picosystem-cpp.md +++ b/tutorials/quick-start/picosystem-cpp.md @@ -48,15 +48,15 @@ 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. 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 @@ -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..0e48e8c 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. @@ -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