Skip to content

Commit 0cd31e6

Browse files
thomasjballthomasjball
committed
more testing
1 parent 9b011a7 commit 0cd31e6

4 files changed

Lines changed: 181 additions & 193 deletions

File tree

‎assets/strings/en/tooltips.json‎

Lines changed: 176 additions & 181 deletions
Original file line numberDiff line numberDiff line change
@@ -1,182 +1,177 @@
11
{
2-
"tagline": "for micro:bit V2",
3-
"sensors": "when...",
4-
"actuators": "do...",
5-
"when": "when",
6-
"do": "do",
7-
"connect": "connect",
8-
"rule": "rule",
9-
"add_rule": "add rule",
10-
"delete_rule": "delete rule",
11-
"rule_up": "move rule up",
12-
"rule_down": "move rule down",
13-
"disk": "save",
14-
"load": "load",
15-
"settings": "settings",
16-
"run": "run program",
17-
"stop": "stop program",
18-
"SR_LED": "LED {x} {y} {state}",
19-
"SR_NOTE": "note {index} {state}",
20-
"SR_ON": "on",
21-
"SR_OFF": "off",
22-
"C0": "edit",
23-
"C1": "samples",
24-
"N1": "new program",
25-
"N2": "flashing heart",
26-
"N3": "smiley buttons",
27-
"N4": "pet hamster",
28-
"N5": "chuck a duck",
29-
"N6": "reaction time",
30-
"N7": "hot potato",
31-
"N8": "rock paper scissors",
32-
"N9": "head or tail",
33-
"N10": "clap lights",
34-
"N11": "firefly",
35-
"N12": "railroad crossing",
36-
"N13": "7 seconds clap",
37-
"N14": "counter",
38-
"T10": "page start",
39-
"T11": "press",
40-
"T12": "release",
41-
"T13": "move",
42-
"T14": "timer",
43-
"T15": "light (external)",
44-
"T16": "temperature",
45-
"T17": "radio receive",
46-
"T18": "sound",
47-
"T19": "variable X set",
48-
"T20": "variable Y set",
49-
"T21": "variable Z set",
50-
"T22": "magnet",
51-
"T23": "slider",
52-
"T24": "dial",
53-
"T25": "wall",
54-
"T26": "line",
55-
"T27": "light",
56-
"T28": "moisture",
57-
"T29": "distance",
58-
"T30": "reflected light",
59-
"T40": "switch page",
60-
"T41": "play sound",
61-
"T43": "music",
62-
"T44": "show image",
63-
"T45": "radio send",
64-
"T46": "radio set group",
65-
"T47": "LED",
66-
"T48": "set variable X",
67-
"T49": "set variable Y",
68-
"T50": "set variable Z",
69-
"T51": "show number",
70-
"T52": "robot",
71-
"T53": "servo set angle",
72-
"T54": "relay",
73-
"T55": "servo power",
74-
"T70": "touch pin 0",
75-
"T71": "touch pin 1",
76-
"T72": "touch pin 2",
77-
"T73": "button A",
78-
"T74": "button B",
79-
"T75": "key 1",
80-
"T76": "key 2",
81-
"T77": "logo",
82-
"T78": "1",
83-
"T79": "2",
84-
"T80": "3",
85-
"T81": "4",
86-
"T82": "5",
87-
"T83": "1/4 second",
88-
"T84": "1 second",
89-
"T85": "1 random second",
90-
"T86": "5 seconds",
91-
"T87": "loud",
92-
"T88": "quiet",
93-
"T89": "NA1",
94-
"T90": "shake",
95-
"T91": "tilt up",
96-
"T92": "tilt down",
97-
"T93": "tilt left",
98-
"T94": "tilt right",
99-
"T95": "variable X",
100-
"T96": "variable Y",
101-
"T97": "variable Z",
102-
"T98": "turn left",
103-
"T99": "turn right",
104-
"T100": "up",
105-
"T101": "down",
106-
"T103": "right",
107-
"T104": "both",
108-
"T105": "none",
109-
"T106": "lost left",
110-
"T107": "lost right",
111-
"T108": "face up",
112-
"T109": "face down",
113-
"T110": "active",
114-
"T111": "unactive",
115-
"T150": "page 1",
116-
"T151": "page 2",
117-
"T152": "page 3",
118-
"T153": "page 4",
119-
"T154": "page 5",
120-
"T160": "image",
121-
"T161": "NA5",
122-
"T162": "NA6",
123-
"T155": "1",
124-
"T156": "2",
125-
"T157": "3",
126-
"T158": "4",
127-
"T159": "5",
128-
"T163": "giggle",
129-
"T164": "happy",
130-
"T165": "hello",
131-
"T166": "mysterious",
132-
"T167": "sad",
133-
"T168": "slide",
134-
"T169": "soaring",
135-
"T170": "spring",
136-
"T171": "twinkle",
137-
"T172": "yawn",
138-
"T176": "radio value",
139-
"T177": "random number",
140-
"T178": "repeat",
141-
"T179": "melody",
142-
"T180": "temp.",
143-
"T181": "NA2",
144-
"T182": "red",
145-
"T183": "green",
146-
"T184": "blue",
147-
"T185": "purple",
148-
"T186": "yellow",
149-
"T187": "black",
150-
"T188": "rainbow",
151-
"T189": "sparkle",
152-
"T190": "forward",
153-
"T191": "reverse",
154-
"T192": "NA3",
155-
"T193": "NA4",
156-
"T194": "stop",
157-
"T195": "fast forward",
158-
"T196": "spin left",
159-
"T197": "spin right",
160-
"T198": "LED red",
161-
"T199": "LED green",
162-
"T200": "LED blue",
163-
"T201": "LED OFF",
164-
"T202": "arm open",
165-
"T203": "arm close",
166-
"T204": "on",
167-
"T205": "off",
168-
"T206": "light value",
169-
"T207": "magnet value",
170-
"T208": "sound value",
171-
"T210": "add",
172-
"T211": "subtract",
173-
"T212": "multiply",
174-
"T213": "divide",
175-
"T220": "equals",
176-
"T221": "not equals",
177-
"T222": "less than",
178-
"T223": "less than or equals",
179-
"T224": "greater than",
180-
"T225": "greater than or equals",
181-
"T255": "enter number"
182-
}
2+
"tagline": "for micro:bit V2",
3+
"sensors": "when...",
4+
"actuators": "do...",
5+
"when": "when",
6+
"do": "do",
7+
"connect": "connect",
8+
"rule": "rule",
9+
"add_rule": "add rule",
10+
"delete_rule": "delete rule",
11+
"rule_up": "move rule up",
12+
"rule_down": "move rule down",
13+
"disk": "save",
14+
"load": "load",
15+
"settings": "settings",
16+
"run": "run program",
17+
"stop": "stop program",
18+
"SR_LED": "LED {x} {y} {state}",
19+
"SR_NOTE": "note {index} {state}",
20+
"SR_ON": "on",
21+
"SR_OFF": "off",
22+
"C0": "edit",
23+
"C1": "samples",
24+
"N1": "new program",
25+
"N2": "flashing heart",
26+
"N3": "smiley buttons",
27+
"N4": "pet hamster",
28+
"N5": "chuck a duck",
29+
"N6": "reaction time",
30+
"N7": "hot potato",
31+
"N8": "rock paper scissors",
32+
"N9": "head or tail",
33+
"N10": "clap lights",
34+
"N11": "firefly",
35+
"N12": "railroad crossing",
36+
"N13": "7 seconds clap",
37+
"N14": "counter",
38+
"T10": "page start",
39+
"T11": "press",
40+
"T12": "release",
41+
"T13": "move",
42+
"T14": "timer",
43+
"T15": "light (external)",
44+
"T16": "temperature",
45+
"T17": "radio receive",
46+
"T18": "sound",
47+
"T19": "variable X set",
48+
"T20": "variable Y set",
49+
"T21": "variable Z set",
50+
"T22": "magnet",
51+
"T23": "slider",
52+
"T24": "dial",
53+
"T25": "wall",
54+
"T26": "line",
55+
"T27": "light",
56+
"T28": "moisture",
57+
"T29": "distance",
58+
"T30": "reflected light",
59+
"T40": "switch page",
60+
"T41": "play sound",
61+
"T43": "music",
62+
"T44": "show image",
63+
"T45": "radio send",
64+
"T46": "radio set group",
65+
"T47": "LED",
66+
"T48": "set variable X",
67+
"T49": "set variable Y",
68+
"T50": "set variable Z",
69+
"T51": "show number",
70+
"T52": "robot",
71+
"T53": "servo set angle",
72+
"T54": "relay",
73+
"T55": "servo power",
74+
"T70": "touch pin 0",
75+
"T71": "touch pin 1",
76+
"T72": "touch pin 2",
77+
"T73": "button A",
78+
"T74": "button B",
79+
"T75": "key 1",
80+
"T76": "key 2",
81+
"T77": "logo",
82+
"T78": "1",
83+
"T79": "2",
84+
"T80": "3",
85+
"T81": "4",
86+
"T82": "5",
87+
"T83": "1/4 second",
88+
"T84": "1 second",
89+
"T85": "1 random second",
90+
"T86": "5 seconds",
91+
"T87": "loud",
92+
"T88": "quiet",
93+
"T89": "NA1",
94+
"T90": "shake",
95+
"T91": "tilt up",
96+
"T92": "tilt down",
97+
"T93": "tilt left",
98+
"T94": "tilt right",
99+
"T95": "variable X",
100+
"T96": "variable Y",
101+
"T97": "variable Z",
102+
"T98": "turn left",
103+
"T99": "turn right",
104+
"T100": "up",
105+
"T101": "down",
106+
"T103": "right",
107+
"T104": "both",
108+
"T105": "none",
109+
"T106": "lost left",
110+
"T107": "lost right",
111+
"T108": "face up",
112+
"T109": "face down",
113+
"T110": "active",
114+
"T111": "unactive",
115+
"T150": "page 1",
116+
"T151": "page 2",
117+
"T152": "page 3",
118+
"T153": "page 4",
119+
"T154": "page 5",
120+
"T160": "image",
121+
"T161": "NA5",
122+
"T162": "NA6",
123+
"T163": "giggle",
124+
"T164": "happy",
125+
"T165": "hello",
126+
"T166": "mysterious",
127+
"T167": "sad",
128+
"T168": "slide",
129+
"T169": "soaring",
130+
"T170": "spring",
131+
"T171": "twinkle",
132+
"T172": "yawn",
133+
"T176": "radio value",
134+
"T177": "random number",
135+
"T178": "repeat",
136+
"T179": "melody",
137+
"T180": "temp.",
138+
"T181": "NA2",
139+
"T182": "red",
140+
"T183": "green",
141+
"T184": "blue",
142+
"T185": "purple",
143+
"T186": "yellow",
144+
"T187": "black",
145+
"T188": "rainbow",
146+
"T189": "sparkle",
147+
"T190": "forward",
148+
"T191": "reverse",
149+
"T192": "NA3",
150+
"T193": "NA4",
151+
"T194": "stop",
152+
"T195": "fast forward",
153+
"T196": "spin left",
154+
"T197": "spin right",
155+
"T198": "LED red",
156+
"T199": "LED green",
157+
"T200": "LED blue",
158+
"T201": "LED OFF",
159+
"T202": "arm open",
160+
"T203": "arm close",
161+
"T204": "on",
162+
"T205": "off",
163+
"T206": "light value",
164+
"T207": "magnet value",
165+
"T208": "sound value",
166+
"T210": "add",
167+
"T211": "subtract",
168+
"T212": "multiply",
169+
"T213": "divide",
170+
"T220": "equals",
171+
"T221": "not equals",
172+
"T222": "less than",
173+
"T223": "less than or equals",
174+
"T224": "greater than",
175+
"T225": "greater than or equals",
176+
"T255": "enter number"
177+
}

‎home.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ namespace microcode {
4040
x: buttonStart + 40,
4141
y: 30,
4242
onClick: () => {
43+
testSamples()
4344
// this.app.popScene()
4445
this.app.pushScene(new SamplesGallery(this.app))
4546
},

‎mcparser.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,15 @@ namespace microcode {
133133
continue
134134
}
135135
currTile = undefined
136-
if (tok.indexOf("page-") == 0) {
136+
if (tok.indexOf("page_") == 0) {
137137
control.assert(
138138
tok.length == 6,
139-
`expected page-[1-5], got page-`
139+
`expected page_[1-5], got page_`
140140
)
141141
const pageNum = parseInt(tok[5])
142142
control.assert(
143143
pageNum == nextPageNum,
144-
`expected page-${nextPageNum}, got page-${pageNum}`
144+
`expected page_${nextPageNum}, got page_${pageNum}`
145145
)
146146
if (currPage) {
147147
if (currRule) currPage.rules.push(currRule)

0 commit comments

Comments
 (0)