Skip to content

Commit cda6da0

Browse files
committed
Merge branch 'version-1.9.2'
# Conflicts: # library.json
2 parents ce27607 + c567629 commit cda6da0

4 files changed

Lines changed: 23 additions & 9 deletions

File tree

examples/TestEasyVR/TestEasyVR.ino

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
Details are displayed on the serial monitor window.
3434
3535
**
36-
Example code for the EasyVR library v1.9.1
36+
Example code for the EasyVR library v1.9.2
3737
Written in 2016 by RoboTech srl for VeeaR <http:://www.veear.eu>
3838
3939
To the extent possible under law, the author(s) have dedicated all
@@ -124,9 +124,22 @@ void setup()
124124
delay(1000);
125125
}
126126

127-
easyvr.setPinOutput(EasyVR::IO1, LOW);
127+
if (easyvr.getID() < EasyVR::EASYVR3)
128+
easyvr.setPinOutput(EasyVR::IO1, LOW); // Shield 2.0 LED off
129+
128130
pcSerial.print(F("EasyVR detected, version "));
129-
pcSerial.println(easyvr.getID());
131+
pcSerial.print(easyvr.getID());
132+
133+
if (easyvr.getID() < EasyVR::EASYVR)
134+
pcSerial.print(F(" = VRbot module"));
135+
else if (easyvr.getID() < EasyVR::EASYVR2)
136+
pcSerial.print(F(" = EasyVR module"));
137+
else if (easyvr.getID() < EasyVR::EASYVR3)
138+
pcSerial.print(F(" = EasyVR 2 module"));
139+
else
140+
pcSerial.print(F(" = EasyVR 3 module"));
141+
pcSerial.print(F(", FW Rev."));
142+
pcSerial.println(easyvr.getID() & 7);
130143

131144
easyvr.setDelay(0); // speed-up replies
132145

@@ -494,7 +507,8 @@ bool checkMonitorInput()
494507
pcSerial.print(F("Sleep mode "));
495508
pcSerial.println(mode);
496509
easyvr.stop();
497-
easyvr.setPinOutput(EasyVR::IO1, LOW); // LED off
510+
if (easyvr.getID() < EasyVR::EASYVR3)
511+
easyvr.setPinOutput(EasyVR::IO1, LOW); // Shield 2.0 LED off
498512
isSleeping = easyvr.sleep(mode);
499513
return true;
500514
}
@@ -554,7 +568,7 @@ void loop()
554568
if (!isSleeping && !isBusy)
555569
{
556570
if (easyvr.getID() < EasyVR::EASYVR3)
557-
easyvr.setPinOutput(EasyVR::IO1, HIGH); // LED on (listening)
571+
easyvr.setPinOutput(EasyVR::IO1, HIGH); // Shield 2.0 LED on (listening)
558572

559573
if (useTokens)
560574
{
@@ -586,7 +600,7 @@ void loop()
586600
isBusy = false;
587601

588602
if (easyvr.getID() < EasyVR::EASYVR3)
589-
easyvr.setPinOutput(EasyVR::IO1, LOW); // LED off
603+
easyvr.setPinOutput(EasyVR::IO1, LOW); // Shield 2.0 LED off
590604

591605
if (easyvr.isAwakened())
592606
{

library.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "EasyVR",
3-
"version": "1.9.1",
3+
"version": "1.9.2",
44
"keywords": "speech, recognition, sensor, serial",
55
"description": "A library for the EasyVR line of products",
66
"repository":

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=EasyVR
2-
version=1.9.1
2+
version=1.9.2
33
author=RoboTech-srl <software@robotechsrl.com>
44
maintainer=PPEscher <ppescher@users.noreply.github.com>
55
sentence=A library for the EasyVR line of products.

src/EasyVR.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ bool EasyVR::stop()
156156
{
157157
sendCmd(CMD_BREAK);
158158

159-
uint8_t rx = recv(WAKE_TIMEOUT);
159+
uint8_t rx = recv(STORAGE_TIMEOUT);
160160
if (rx == STS_INTERR || rx == STS_SUCCESS)
161161
return true;
162162
return false;

0 commit comments

Comments
 (0)