Skip to content

Commit 7622449

Browse files
committed
Update version to 1.0.0-BETA4.
1 parent 0441731 commit 7622449

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

demo/things/sl-02/sl-02.ino

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void flashLed() {
160160
digitalWrite(LED_PIN, LOW);
161161
}
162162

163-
int8_t processFlash(Protocol *protocol) {
163+
int8_t executeFlash(Protocol *protocol) {
164164
if (lastSwitchState != SWITCH_STATE_YELLOW)
165165
return -1;
166166

@@ -180,23 +180,23 @@ int8_t processFlash(Protocol *protocol) {
180180
return 0;
181181
}
182182

183-
int8_t processTurnOn(Protocol *protocol) {
183+
int8_t executeTurnOn(Protocol *protocol) {
184184
if (lastSwitchState != SWITCH_STATE_YELLOW)
185185
return -1;
186186

187187
turnLedOn();
188188
return 0;
189189
}
190190

191-
int8_t processTurnOff(Protocol *protocol) {
191+
int8_t executeTurnOff(Protocol *protocol) {
192192
if (lastSwitchState != SWITCH_STATE_YELLOW)
193193
return -1;
194194

195195
turnLedOff();
196196
return 0;
197197
}
198198

199-
int8_t processResetThing(Protocol *protocol) {
199+
int8_t executeResetThing(Protocol *protocol) {
200200
resetThing();
201201

202202
#ifdef ENABLE_DEBUG
@@ -208,16 +208,16 @@ int8_t processResetThing(Protocol *protocol) {
208208

209209
void configureThingProtocolsImpl() {
210210
ProtocolName pnResetThing = {0xf8, 0x02, 0x09};
211-
registerActionProtocol(pnResetThing, processResetThing, false);
211+
registerExecutionProtocol(pnResetThing, executeResetThing, false);
212212

213213
ProtocolName pnFlash = {0xf7, 0x01, 0x00};
214-
registerActionProtocol(pnFlash, processFlash, false);
214+
registerExecutionProtocol(pnFlash, executeFlash, false);
215215

216216
ProtocolName pnTurnOn = {0xf7, 0x01, 0x02};
217-
registerActionProtocol(pnTurnOn, processTurnOn, false);
217+
registerExecutionProtocol(pnTurnOn, executeTurnOn, false);
218218

219219
ProtocolName pnTurnOff = {0xf7, 0x01, 0x03};
220-
registerActionProtocol(pnTurnOff, processTurnOff, false);
220+
registerExecutionProtocol(pnTurnOff, executeTurnOff, false);
221221
}
222222

223223
void controlLedByLastSwitchState() {

demo/things/str-01/str-01.ino

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ char *loadRegistrationCode() {
3939
return "abcdefghigkl";
4040
}
4141

42-
int8_t processResetThing(Protocol *protocol) {
42+
int8_t executeResetThing(Protocol *protocol) {
4343
resetThing();
4444

4545
#ifdef ENABLE_DEBUG
@@ -49,7 +49,7 @@ int8_t processResetThing(Protocol *protocol) {
4949
return 0;
5050
}
5151

52-
int8_t acquireCelsiusDegree(Protocol *protocol) {
52+
int8_t reportCelsiusDegree(Protocol *protocol) {
5353
temperture.requestTemperatures();
5454
float celsiusDegree = temperture.getTempCByIndex(0);
5555
addFloatAttribute(protocol, 0x01, celsiusDegree);
@@ -59,10 +59,10 @@ int8_t acquireCelsiusDegree(Protocol *protocol) {
5959

6060
void configureThingProtocolsImpl() {
6161
ProtocolName pnResetThing = {0xf8, 0x02, 0x09};
62-
registerActionProtocol(pnResetThing, processResetThing, false);
62+
registerExecutionProtocol(pnResetThing, executeResetThing, false);
6363

6464
ProtocolName pnAquireCelsiusDegree = {0xf7, 0x03, 0x00};
65-
registerDataProtocol(pnAquireCelsiusDegree, acquireCelsiusDegree, 2000);
65+
registerReportProtocol(pnAquireCelsiusDegree, reportCelsiusDegree, 2000);
6666
}
6767

6868
void loop() {

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<basalt.version>1.1.0-RELEASE</basalt.version>
1616
<chalk.version>1.0.2-RELEASE</chalk.version>
17-
<granite.version>1.0.4-RELEASE</granite.version>
18-
<sand.version>1.0.0-BETA3</sand.version>
17+
<granite.version>1.0.5-RELEASE</granite.version>
18+
<sand.version>1.0.0-BETA4</sand.version>
1919
<gem.version>0.2.0-RELEASE</gem.version>
2020
</properties>
2121

0 commit comments

Comments
 (0)