Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,18 @@ tasks:
app:upload:
desc: "Upload app files to the Arduino Board"
cmds:
- adb push ./python/main.py {{ .ARDUINO_APP_BASE_PATH }}/python/main.py
- adb push ./sketch/sketch.ino {{ .ARDUINO_APP_BASE_PATH }}/sketch/sketch.ino
- adb push ./sketch/sketch.yaml {{ .ARDUINO_APP_BASE_PATH }}/sketch/sketch.yaml
- adb push ./app.yaml {{ .ARDUINO_APP_BASE_PATH }}/app.yaml
- task modulino:patch
- adb push ./sketch/Arduino_Modulino {{ .ARDUINO_APP_BASE_PATH }}/sketch/Arduino_Modulino
- adb push ./app.yaml {{ .ARDUINO_APP_BASE_PATH }}/app.yaml
- adb push ./assets/index.html {{ .ARDUINO_APP_BASE_PATH }}/assets/index.html
- adb push ./assets/gui.js {{ .ARDUINO_APP_BASE_PATH }}/assets/gui.js
- adb push ./sketch {{ .ARDUINO_APP_BASE_PATH }}/
- adb push ./python/ {{ .ARDUINO_APP_BASE_PATH }}/
- adb push ./assets/ {{ .ARDUINO_APP_BASE_PATH }}/

modulino:patch:
desc: "Patch Arduino Modulino and put it in the sketch folder"
cmds:
# See https://github.com/arduino-libraries/Arduino_Modulino/pull/42
# Any Version<0.6.0 the build fails if Both modulino and ArduinoLedMatrix are used in the UnoQ
- mkdir -p sketch/Arduino_Modulino
- rm -rf sketch/Arduino_Modulino && mkdir -p sketch/Arduino_Modulino
- git clone --depth 1 git@github.com:arduino-libraries/Arduino_Modulino.git sketch/Arduino_Modulino
- cd sketch/Arduino_Modulino && git checkout 480e9d183a3b3dede0c68170e469410a6d710bee

Expand Down Expand Up @@ -55,4 +52,6 @@ tasks:
cmds:
- npm run build:dev --workspace @scratch/scratch-gui
- cp build/index.html ../../../assets/index.html
- cp build/gui.js ../../../assets/gui.js
- cp build/gui.js ../../../assets/gui.js
## copy (some) of the static files
- mkdir -p ../../../assets/static/blocks-media && cp -r build/static/blocks-media ../../../assets/static/
2 changes: 1 addition & 1 deletion assets/gui.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const iconURI = '';
*/
// eslint-disable-next-line max-len
const menuIconURI = '';
const wsServerURL = 'http://192.168.1.39:7000';
const wsServerURL = "".concat(window.location.protocol, "//").concat(window.location.hostname, ":7000");
class Scratch3Arduino {
constructor(runtime) {
this.runtime = runtime;
Expand Down
Binary file added assets/static/blocks-media/default/1x1.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/static/blocks-media/default/click.mp3
Binary file not shown.
Binary file added assets/static/blocks-media/default/click.ogg
Binary file not shown.
Binary file added assets/static/blocks-media/default/click.wav
Binary file not shown.
10 changes: 10 additions & 0 deletions assets/static/blocks-media/default/comment-arrow-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions assets/static/blocks-media/default/comment-arrow-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions assets/static/blocks-media/default/delete-x.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/static/blocks-media/default/delete.mp3
Binary file not shown.
Binary file added assets/static/blocks-media/default/delete.ogg
Binary file not shown.
Binary file added assets/static/blocks-media/default/delete.wav
Binary file not shown.
1 change: 1 addition & 0 deletions assets/static/blocks-media/default/dropdown-arrow-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/static/blocks-media/default/dropdown-arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
130 changes: 130 additions & 0 deletions assets/static/blocks-media/default/extensions/microbit-block-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions assets/static/blocks-media/default/extensions/music-block-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions assets/static/blocks-media/default/extensions/pen-block-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading