Skip to content

Commit eceec43

Browse files
committed
Update for new ThingML Syntax
1 parent a7b3ff8 commit eceec43

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

1.Basics/1_HelloWorld/HelloWorld.thingml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ thing HelloWorld {
33

44
statechart HelloWorld init Greetings {
55

6-
on entry 'Serial.begin(9600);'
6+
on entry `Serial.begin(9600);`
77

88
state Greetings {
9-
on entry 'Serial.println("Hello World!");'
9+
on entry `Serial.println("Hello World!");`
1010
}
1111
}
1212
}

1.Basics/2_Blink/Blink1.thingml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ thing Blink1 {
88

99
statechart Blink1 init OFF {
1010

11-
on entry 'pinMode(12, OUTPUT);'
11+
on entry `pinMode(12, OUTPUT);`
1212

1313
state OFF {
14-
on entry 'digitalWrite(12, LOW);'
14+
on entry `digitalWrite(12, LOW);`
1515
transition -> ON event clock?tic
1616
}
1717

1818
state ON {
19-
on entry 'digitalWrite(12, HIGH);'
19+
on entry `digitalWrite(12, HIGH);`
2020
transition -> OFF event clock?tic
2121
}
2222
}

1.Basics/AdafruitI2CLCDShield.thingml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ uint8_t backlight = WHITE;"
7171

7272

7373
function bstate() : UInt8 do
74-
return 'lcd.readButtons()'
74+
return `lcd.readButtons()`
7575
end
7676

7777
statechart RGBLCDShieldSM init Empty @debug "false" {
@@ -82,13 +82,13 @@ uint8_t backlight = WHITE;"
8282

8383
state Setup {
8484
on entry do
85-
'lcd.begin(16, 2); // initialize display colums and rows
85+
`lcd.begin(16, 2); // initialize display colums and rows
8686
lcd.setBacklight(WHITE); // Set to OFF if you do not want backlight on boot
8787
lcd.setCursor(0,0);
8888
lcd.print(" ");
8989
lcd.setCursor(0,1);
9090
lcd.print(" ");
91-
lcd.setCursor(0,0);'
91+
lcd.setCursor(0,0);`
9292
end
9393
transition -> Idle action do
9494
//arduino!serial_print_str("[LCD shield] Ready\n")
@@ -98,16 +98,16 @@ uint8_t backlight = WHITE;"
9898

9999
state Idle {
100100

101-
internal event e : lcd?print_simple_click action 'lcd.setCursor(0,0);lcd.print("Simple Click");'
102-
internal event e : lcd?print_double_click action 'lcd.setCursor(0,0);lcd.print("Double Click");'
103-
internal event e : lcd?print_long_click action 'lcd.setCursor(0,0);lcd.print("Long Click");'
104-
internal event e : lcd?print_num action 'lcd.print('&e.num&');'
105-
internal event e : lcd?print_dec action 'lcd.print('&e.num&');'
106-
internal event e : lcd?clear action 'lcd.setCursor(0,0);
101+
internal event e : lcd?print_simple_click action `lcd.setCursor(0,0);lcd.print("Simple Click");`
102+
internal event e : lcd?print_double_click action `lcd.setCursor(0,0);lcd.print("Double Click");`
103+
internal event e : lcd?print_long_click action `lcd.setCursor(0,0);lcd.print("Long Click");`
104+
internal event e : lcd?print_num action `lcd.print(`&e.num&`);`
105+
internal event e : lcd?print_dec action `lcd.print(`&e.num&`);`
106+
internal event e : lcd?clear action `lcd.setCursor(0,0);
107107
lcd.print(" ");
108108
lcd.setCursor(0,1);
109109
lcd.print(" ");
110-
lcd.setCursor(0,0);'
110+
lcd.setCursor(0,0);`
111111
internal event e : clock?ms25_tic action buttonAccess!buttons_state(bstate())
112112

113113
}
@@ -168,7 +168,7 @@ thing UPbutton includes ButtonWrapperMsg, I2CShieldButtonMsg, TimerMsgs
168168
property data : UInt8 = 0
169169

170170
function is_pressed() : Boolean do
171-
return ''&data&'& BUTTON_UP'
171+
return ``&data&`& BUTTON_UP`
172172
end
173173

174174

@@ -211,7 +211,7 @@ thing DOWNbutton includes ButtonWrapperMsg, I2CShieldButtonMsg, TimerMsgs
211211
property data : UInt8 = 0
212212

213213
function is_pressed() : Boolean do
214-
return ''&data&'& BUTTON_DOWN'
214+
return ``&data&`& BUTTON_DOWN`
215215
end
216216

217217

@@ -255,7 +255,7 @@ thing RIGHTbutton includes ButtonWrapperMsg, I2CShieldButtonMsg, TimerMsgs
255255
property data : UInt8 = 0
256256

257257
function is_pressed() : Boolean do
258-
return ''&data&'& BUTTON_RIGHT'
258+
return ``&data&`& BUTTON_RIGHT`
259259
end
260260

261261

@@ -300,7 +300,7 @@ thing LEFTbutton includes ButtonWrapperMsg, I2CShieldButtonMsg, TimerMsgs
300300
property data : UInt8 = 0
301301

302302
function is_pressed() : Boolean do
303-
return ''&data&'& BUTTON_LEFT'
303+
return ``&data&`& BUTTON_LEFT`
304304
end
305305

306306

@@ -345,7 +345,7 @@ thing SELECTbutton includes ButtonWrapperMsg, I2CShieldButtonMsg, TimerMsgs
345345
property data : UInt8 = 0
346346

347347
function is_pressed() : Boolean do
348-
return ''&data&'& BUTTON_SELECT'
348+
return ``&data&`& BUTTON_SELECT`
349349
end
350350

351351

1.Basics/BUTTON.thingml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ thing Button includes ButtonMsgs, TimerMsgs
2121
property PIN: UInt8 = 8
2222

2323
function is_pressed() : Boolean do
24-
return 'digitalRead('&PIN&')'
24+
return `digitalRead('&PIN&')`
2525
end
2626

2727
statechart Button init RELEASED {

1.Basics/LED.thingml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ thing LED includes LEDMsgs {
1414
}
1515

1616
function setDigitalOutput(pin: UInt8) do
17-
'pinMode('&pin&', OUTPUT);'
17+
`pinMode(`&pin&`, OUTPUT);`
1818
end
1919

2020
function digitalWrite(pin: UInt8, value : DigitalState) do
21-
'digitalWrite('&pin&', '&value&');'
21+
`digitalWrite(`&pin&`, `&value&`);`
2222
end
2323

2424
statechart LED init READY {
2525
on entry setDigitalOutput(PIN)
2626
state READY {
27-
internal event ctrl?led_ON action digitalWrite(PIN, 1)
28-
internal event ctrl?led_OFF action digitalWrite(PIN, 0)
27+
internal event ctrl?led_ON action digitalWrite(PIN, DigitalState:HIGH)
28+
internal event ctrl?led_OFF action digitalWrite(PIN, DigitalState:LOW)
2929
}
3030
}
3131
}

0 commit comments

Comments
 (0)