Skip to content

Commit dabc67b

Browse files
authored
Merge pull request #563 from microbit-foundation/development
v3.3 - Axis selection
2 parents 2f41a14 + 1ca7a6d commit dabc67b

File tree

219 files changed

+15890
-9968
lines changed

Some content is hidden

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

219 files changed

+15890
-9968
lines changed
File renamed without changes.

README.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ You can find the version on the main branch at [main.ML-Machine.org](https://mai
2525

2626
### Running the application locally
2727

28-
Alternatively the application can be run locally on your computer without compromising the capabilities of the software.
28+
#### Using NodeJS
29+
Alternatively the application can be run locally on your computer without compromising the capabilities of the software.c
2930

3031
1. Ensure you have [nodejs](https://nodejs.org/) and the package manager [npm](https://www.npmjs.com/)
3132
2. Download or clone this repository
@@ -35,6 +36,21 @@ Alternatively the application can be run locally on your computer without compro
3536

3637
List of commands can be found below.
3738

39+
#### Using Docker
40+
41+
Either build the dockerfile and run it
42+
```
43+
docker build -t ml-machine .
44+
docker run -d -p 5174:8080 ml-machine
45+
```
46+
47+
Or you can use the docker-compose.yml file we have provided
48+
49+
```
50+
docker compose up -d
51+
```
52+
53+
Access the application from http://localhost:5174/
3854

3955
### ```npm run dev```
4056

features.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@
22
"title": "Learning tool",
33
"knnModel": true,
44
"lossGraph": true,
5-
"makecode": true
5+
"makecode": true,
6+
"liveGraphInputValues": true,
7+
"recordingScrubberValues": true
68
}

package-lock.json

Lines changed: 2909 additions & 2864 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
"@testing-library/svelte": "^4.1.0",
2323
"@tsconfig/svelte": "^5.0.4",
2424
"@types/browser-lang": "^0.1.1",
25-
"@types/d3": "^7.4.1",
25+
"@types/d3": "^7.4.3",
2626
"@types/js-cookie": "^3.0.3",
2727
"@types/node": "^18.16.0",
2828
"@types/three": "^0.152.0",
29-
"@types/w3c-web-usb": "^1.0.6",
29+
"@types/w3c-web-usb": "^1.0.10",
3030
"@types/web-bluetooth": "^0.0.17",
3131
"@typescript-eslint/eslint-plugin": "^5.59.0",
3232
"@typescript-eslint/parser": "^5.59.0",
@@ -44,7 +44,7 @@
4444
"vite": "^5.2.8",
4545
"vite-plugin-environment": "^1.1.3",
4646
"vite-plugin-windicss": "^1.9.3",
47-
"vitest": "^1.5.0"
47+
"vitest": "^2.1.2"
4848
},
4949
"dependencies": {
5050
"@microsoft/applicationinsights-web": "^3.1.2",
@@ -58,11 +58,13 @@
5858
"d3-3d": "^1.0.0",
5959
"dapjs": "^2.3.0",
6060
"js-cookie": "^3.0.5",
61+
"microbyte": "0.13.4",
6162
"postcss": "^8.4.38",
6263
"smoothie": "^1.36.1",
6364
"svelte-i18n": "^4.0.0",
65+
"svelte-range-slider-pips": "^3.1.4",
6466
"svelte-skeleton": "^1.3.1",
6567
"three": "^0.152.2",
6668
"uuid4": "^2.0.3"
6769
}
68-
}
70+
}

public/assets/fonts/helvetiker_regular.typeface.json

Lines changed: 1281 additions & 0 deletions
Large diffs are not rendered by default.

public/imgs/bluetooth.svg

Lines changed: 15 additions & 0 deletions
Loading

public/imgs/microbit_icon_two.png

4.54 KB
Loading

public/imgs/microbit_icon_two.xcf

14 KB
Binary file not shown.

public/imgs/usb.svg

Lines changed: 15 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)