Skip to content

Commit f4ce482

Browse files
authored
Ass assets (#6)
1 parent 065fcf8 commit f4ce482

File tree

144 files changed

+947
-10
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+947
-10
lines changed

Taskfile.yaml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,18 @@ tasks:
77
app:upload:
88
desc: "Upload app files to the Arduino Board"
99
cmds:
10-
- adb push ./python/main.py {{ .ARDUINO_APP_BASE_PATH }}/python/main.py
11-
- adb push ./sketch/sketch.ino {{ .ARDUINO_APP_BASE_PATH }}/sketch/sketch.ino
12-
- adb push ./sketch/sketch.yaml {{ .ARDUINO_APP_BASE_PATH }}/sketch/sketch.yaml
10+
- adb push ./app.yaml {{ .ARDUINO_APP_BASE_PATH }}/app.yaml
1311
- task modulino:patch
14-
- adb push ./sketch/Arduino_Modulino {{ .ARDUINO_APP_BASE_PATH }}/sketch/Arduino_Modulino
15-
- adb push ./app.yaml {{ .ARDUINO_APP_BASE_PATH }}/app.yaml
16-
- adb push ./assets/index.html {{ .ARDUINO_APP_BASE_PATH }}/assets/index.html
17-
- adb push ./assets/gui.js {{ .ARDUINO_APP_BASE_PATH }}/assets/gui.js
12+
- adb push ./sketch {{ .ARDUINO_APP_BASE_PATH }}/
13+
- adb push ./python/ {{ .ARDUINO_APP_BASE_PATH }}/
14+
- adb push ./assets/ {{ .ARDUINO_APP_BASE_PATH }}/
1815

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

@@ -55,4 +52,6 @@ tasks:
5552
cmds:
5653
- npm run build:dev --workspace @scratch/scratch-gui
5754
- cp build/index.html ../../../assets/index.html
58-
- cp build/gui.js ../../../assets/gui.js
55+
- cp build/gui.js ../../../assets/gui.js
56+
## copy (some) of the static files
57+
- mkdir -p ../../../assets/static/blocks-media && cp -r build/static/blocks-media ../../../assets/static/

assets/gui.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const iconURI = '';
3535
*/
3636
// eslint-disable-next-line max-len
3737
const menuIconURI = '';
38-
const wsServerURL = 'http://192.168.1.39:7000';
38+
const wsServerURL = "".concat(window.location.protocol, "//").concat(window.location.hostname, ":7000");
3939
class Scratch3Arduino {
4040
constructor(runtime) {
4141
this.runtime = runtime;
43 Bytes
Loading
7.94 KB
Binary file not shown.
5.32 KB
Binary file not shown.
3.12 KB
Binary file not shown.
Lines changed: 10 additions & 0 deletions
Loading
Lines changed: 10 additions & 0 deletions
Loading
Lines changed: 10 additions & 0 deletions
Loading
9.57 KB
Binary file not shown.

0 commit comments

Comments
 (0)