Skip to content

Commit 315fb0a

Browse files
committed
Use getPinLED() for TinyGo example
1 parent 144c581 commit 315fb0a

File tree

7 files changed

+50
-49
lines changed

7 files changed

+50
-49
lines changed

examples/Wasm_Blink/Wasm_Blink.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define NATIVE_STACK_SIZE (32*1024)
1818

1919
// For (most) devices that cannot allocate a 64KiB wasm page
20-
#define WASM_MEMORY_LIMIT 2048
20+
#define WASM_MEMORY_LIMIT 4096
2121

2222
/*
2323
* WebAssembly app

src/m3_config_platforms.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,15 +240,15 @@ typedef int8_t i8;
240240
*/
241241

242242
# ifndef d_m3MaxFunctionStackHeight
243-
# if defined(ESP32) || defined(ARDUINO_AMEBA)
243+
# if defined(ESP8266) || defined(ESP32) || defined(ARDUINO_AMEBA)
244244
# define d_m3MaxFunctionStackHeight 128
245245
# endif
246246
# endif
247247

248248
# ifndef d_m3FixedHeap
249249
# if defined(ARDUINO_AMEBA)
250250
# define d_m3FixedHeap (128*1024)
251-
# elif defined(ESP8266) || defined(BLUE_PILL) || defined(FOMU)
251+
# elif defined(BLUE_PILL) || defined(FOMU)
252252
# define d_m3FixedHeap (12*1024)
253253
# elif defined(ARDUINO_ARCH_ARC32) // Arduino 101
254254
# define d_m3FixedHeap (10*1024)

wasm_apps/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ See `build.sh` for details.
88

99
## Rust app
1010

11-
For Rust, the LED pin is currently hardcoded in the app.
1211
Before building the app, please install the toolchain:
1312
```sh
1413
rustup target add wasm32-unknown-unknown
@@ -25,7 +24,6 @@ To rebuild, use `npm run build`.
2524

2625
## TinyGo app
2726

28-
For TinyGo, the LED pin is currently hardcoded in the app.
2927
To rebuild, use `build.sh`.
3028
When using TinyGo, be sure to change the main function from `_start` to `cwa_main`.
3129

wasm_apps/tinygo/app.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ func getPinLED() uint
3838
* App
3939
*/
4040

41-
const LED uint = 13
42-
//var LED = getPinLED()
41+
var LED = getPinLED()
4342

4443
func setup() {
4544
pinMode(LED, 1)

wasm_apps/tinygo/app.wasm

34 Bytes
Binary file not shown.

wasm_apps/tinygo/app.wasm.h

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,47 @@
11
unsigned char app_wasm[] = {
22
0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x18, 0x05, 0x60,
3-
0x00, 0x00, 0x60, 0x02, 0x7f, 0x7f, 0x00, 0x60, 0x01, 0x7f, 0x00, 0x60,
4-
0x00, 0x01, 0x7f, 0x60, 0x03, 0x7f, 0x7f, 0x7f, 0x01, 0x7f, 0x02, 0x4e,
5-
0x04, 0x03, 0x65, 0x6e, 0x76, 0x0d, 0x69, 0x6f, 0x5f, 0x67, 0x65, 0x74,
6-
0x5f, 0x73, 0x74, 0x64, 0x6f, 0x75, 0x74, 0x00, 0x03, 0x07, 0x61, 0x72,
7-
0x64, 0x75, 0x69, 0x6e, 0x6f, 0x07, 0x70, 0x69, 0x6e, 0x4d, 0x6f, 0x64,
8-
0x65, 0x00, 0x01, 0x07, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x0c,
9-
0x64, 0x69, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x57, 0x72, 0x69, 0x74, 0x65,
10-
0x00, 0x01, 0x07, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x05, 0x64,
11-
0x65, 0x6c, 0x61, 0x79, 0x00, 0x02, 0x03, 0x08, 0x07, 0x00, 0x00, 0x00,
12-
0x00, 0x00, 0x04, 0x00, 0x05, 0x03, 0x01, 0x00, 0x01, 0x06, 0x1c, 0x04,
13-
0x7f, 0x00, 0x41, 0x80, 0x80, 0x04, 0x0b, 0x7f, 0x00, 0x41, 0x80, 0x80,
14-
0x04, 0x0b, 0x7f, 0x00, 0x41, 0x80, 0x80, 0x04, 0x0b, 0x7f, 0x00, 0x41,
15-
0x80, 0x08, 0x0b, 0x07, 0x7e, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x6f, 0x72,
16-
0x79, 0x02, 0x00, 0x11, 0x5f, 0x5f, 0x77, 0x61, 0x73, 0x6d, 0x5f, 0x63,
17-
0x61, 0x6c, 0x6c, 0x5f, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x00, 0x04, 0x06,
18-
0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x00, 0x05, 0x08, 0x63, 0x77, 0x61,
19-
0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x07, 0x0b, 0x5f, 0x5f, 0x68, 0x65,
20-
0x61, 0x70, 0x5f, 0x62, 0x61, 0x73, 0x65, 0x03, 0x00, 0x06, 0x6d, 0x65,
21-
0x6d, 0x73, 0x65, 0x74, 0x00, 0x09, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6d,
22-
0x65, 0x00, 0x0a, 0x0c, 0x5f, 0x5f, 0x64, 0x73, 0x6f, 0x5f, 0x68, 0x61,
23-
0x6e, 0x64, 0x6c, 0x65, 0x03, 0x01, 0x0a, 0x5f, 0x5f, 0x64, 0x61, 0x74,
24-
0x61, 0x5f, 0x65, 0x6e, 0x64, 0x03, 0x02, 0x0d, 0x5f, 0x5f, 0x67, 0x6c,
25-
0x6f, 0x62, 0x61, 0x6c, 0x5f, 0x62, 0x61, 0x73, 0x65, 0x03, 0x03, 0x0a,
26-
0xc1, 0x01, 0x07, 0x03, 0x00, 0x01, 0x0b, 0x04, 0x00, 0x10, 0x06, 0x0b,
27-
0x44, 0x01, 0x02, 0x7f, 0x3f, 0x00, 0x41, 0x10, 0x74, 0x41, 0x80, 0x80,
28-
0x04, 0x6b, 0x41, 0x06, 0x76, 0x21, 0x01, 0x02, 0x40, 0x03, 0x40, 0x20,
29-
0x00, 0x20, 0x01, 0x47, 0x04, 0x40, 0x20, 0x00, 0x41, 0x80, 0x80, 0x7c,
30-
0x46, 0x0d, 0x02, 0x20, 0x00, 0x41, 0x80, 0x80, 0x04, 0x6a, 0x41, 0x00,
31-
0x3a, 0x00, 0x00, 0x20, 0x00, 0x41, 0x01, 0x6a, 0x21, 0x00, 0x0c, 0x01,
32-
0x0b, 0x0b, 0x10, 0x00, 0x1a, 0x0f, 0x0b, 0x00, 0x0b, 0x07, 0x00, 0x10,
33-
0x06, 0x10, 0x08, 0x00, 0x0b, 0x24, 0x00, 0x41, 0x0d, 0x41, 0x01, 0x10,
34-
0x01, 0x03, 0x40, 0x41, 0x0d, 0x41, 0x01, 0x10, 0x02, 0x41, 0xe4, 0x00,
35-
0x10, 0x03, 0x41, 0x0d, 0x41, 0x00, 0x10, 0x02, 0x41, 0x84, 0x07, 0x10,
36-
0x03, 0x0c, 0x00, 0x0b, 0x00, 0x0b, 0x37, 0x01, 0x02, 0x7f, 0x41, 0x00,
37-
0x20, 0x00, 0x6b, 0x21, 0x04, 0x02, 0x40, 0x03, 0x40, 0x20, 0x02, 0x20,
38-
0x03, 0x47, 0x04, 0x40, 0x20, 0x03, 0x20, 0x04, 0x46, 0x0d, 0x02, 0x20,
39-
0x00, 0x20, 0x03, 0x6a, 0x20, 0x01, 0x3a, 0x00, 0x00, 0x20, 0x03, 0x41,
40-
0x01, 0x6a, 0x21, 0x03, 0x0c, 0x01, 0x0b, 0x0b, 0x20, 0x00, 0x0f, 0x0b,
41-
0x00, 0x0b, 0x0c, 0x00, 0x41, 0xf8, 0xff, 0x03, 0x42, 0x00, 0x37, 0x03,
42-
0x00, 0x00, 0x0b
3+
0x00, 0x00, 0x60, 0x02, 0x7f, 0x7f, 0x00, 0x60, 0x00, 0x01, 0x7f, 0x60,
4+
0x01, 0x7f, 0x00, 0x60, 0x03, 0x7f, 0x7f, 0x7f, 0x01, 0x7f, 0x02, 0x62,
5+
0x05, 0x03, 0x65, 0x6e, 0x76, 0x0d, 0x69, 0x6f, 0x5f, 0x67, 0x65, 0x74,
6+
0x5f, 0x73, 0x74, 0x64, 0x6f, 0x75, 0x74, 0x00, 0x02, 0x07, 0x61, 0x72,
7+
0x64, 0x75, 0x69, 0x6e, 0x6f, 0x09, 0x67, 0x65, 0x74, 0x50, 0x69, 0x6e,
8+
0x4c, 0x45, 0x44, 0x00, 0x02, 0x07, 0x61, 0x72, 0x64, 0x75, 0x69, 0x6e,
9+
0x6f, 0x07, 0x70, 0x69, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x00, 0x01, 0x07,
10+
0x61, 0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x0c, 0x64, 0x69, 0x67, 0x69,
11+
0x74, 0x61, 0x6c, 0x57, 0x72, 0x69, 0x74, 0x65, 0x00, 0x01, 0x07, 0x61,
12+
0x72, 0x64, 0x75, 0x69, 0x6e, 0x6f, 0x05, 0x64, 0x65, 0x6c, 0x61, 0x79,
13+
0x00, 0x03, 0x03, 0x08, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,
14+
0x05, 0x04, 0x01, 0x01, 0x01, 0x01, 0x06, 0x19, 0x04, 0x7f, 0x00, 0x41,
15+
0x84, 0x10, 0x0b, 0x7f, 0x00, 0x41, 0x80, 0x10, 0x0b, 0x7f, 0x00, 0x41,
16+
0x84, 0x10, 0x0b, 0x7f, 0x00, 0x41, 0x80, 0x08, 0x0b, 0x07, 0x7e, 0x0a,
17+
0x06, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x02, 0x00, 0x11, 0x5f, 0x5f,
18+
0x77, 0x61, 0x73, 0x6d, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x5f, 0x63, 0x74,
19+
0x6f, 0x72, 0x73, 0x00, 0x05, 0x06, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74,
20+
0x00, 0x06, 0x08, 0x63, 0x77, 0x61, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x00,
21+
0x08, 0x0b, 0x5f, 0x5f, 0x68, 0x65, 0x61, 0x70, 0x5f, 0x62, 0x61, 0x73,
22+
0x65, 0x03, 0x00, 0x06, 0x6d, 0x65, 0x6d, 0x73, 0x65, 0x74, 0x00, 0x0a,
23+
0x06, 0x72, 0x65, 0x73, 0x75, 0x6d, 0x65, 0x00, 0x0b, 0x0c, 0x5f, 0x5f,
24+
0x64, 0x73, 0x6f, 0x5f, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x03, 0x01,
25+
0x0a, 0x5f, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x65, 0x6e, 0x64, 0x03,
26+
0x02, 0x0d, 0x5f, 0x5f, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x5f, 0x62,
27+
0x61, 0x73, 0x65, 0x03, 0x03, 0x0a, 0xd1, 0x01, 0x07, 0x03, 0x00, 0x01,
28+
0x0b, 0x04, 0x00, 0x10, 0x07, 0x0b, 0x49, 0x01, 0x02, 0x7f, 0x3f, 0x00,
29+
0x41, 0x10, 0x74, 0x41, 0x84, 0x10, 0x6b, 0x41, 0x06, 0x76, 0x21, 0x01,
30+
0x02, 0x40, 0x03, 0x40, 0x20, 0x00, 0x20, 0x01, 0x47, 0x04, 0x40, 0x20,
31+
0x00, 0x41, 0xfc, 0x6f, 0x46, 0x0d, 0x02, 0x20, 0x00, 0x41, 0x84, 0x10,
32+
0x6a, 0x41, 0x00, 0x3a, 0x00, 0x00, 0x20, 0x00, 0x41, 0x01, 0x6a, 0x21,
33+
0x00, 0x0c, 0x01, 0x0b, 0x0b, 0x10, 0x00, 0x1a, 0x41, 0x80, 0x10, 0x10,
34+
0x01, 0x36, 0x02, 0x00, 0x0f, 0x0b, 0x00, 0x0b, 0x07, 0x00, 0x10, 0x07,
35+
0x10, 0x09, 0x00, 0x0b, 0x30, 0x00, 0x41, 0x80, 0x10, 0x28, 0x02, 0x00,
36+
0x41, 0x01, 0x10, 0x02, 0x03, 0x40, 0x41, 0x80, 0x10, 0x28, 0x02, 0x00,
37+
0x41, 0x01, 0x10, 0x03, 0x41, 0xe4, 0x00, 0x10, 0x04, 0x41, 0x80, 0x10,
38+
0x28, 0x02, 0x00, 0x41, 0x00, 0x10, 0x03, 0x41, 0x84, 0x07, 0x10, 0x04,
39+
0x0c, 0x00, 0x0b, 0x00, 0x0b, 0x37, 0x01, 0x02, 0x7f, 0x41, 0x00, 0x20,
40+
0x00, 0x6b, 0x21, 0x04, 0x02, 0x40, 0x03, 0x40, 0x20, 0x02, 0x20, 0x03,
41+
0x47, 0x04, 0x40, 0x20, 0x03, 0x20, 0x04, 0x46, 0x0d, 0x02, 0x20, 0x00,
42+
0x20, 0x03, 0x6a, 0x20, 0x01, 0x3a, 0x00, 0x00, 0x20, 0x03, 0x41, 0x01,
43+
0x6a, 0x21, 0x03, 0x0c, 0x01, 0x0b, 0x0b, 0x20, 0x00, 0x0f, 0x0b, 0x00,
44+
0x0b, 0x0b, 0x00, 0x41, 0xf8, 0x0f, 0x42, 0x00, 0x37, 0x03, 0x00, 0x00,
45+
0x0b
4346
};
44-
unsigned int app_wasm_len = 483;
47+
unsigned int app_wasm_len = 517;

wasm_apps/tinygo/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ export GOROOT=/opt/go
55
# Compile
66
tinygo build -target wasm \
77
-panic trap -wasm-abi generic \
8-
-heap-size 2048 \
8+
-ldflags="-z stack-size=2048 --max-memory=65536" \
9+
-heap-size 4096 \
910
-o app.wasm app.go
1011

1112
# Optimize (optional)

0 commit comments

Comments
 (0)