Merge pull request #20 from gpstar81/updates

gpstar81 · web-flow · commit 7bc8e9bc5105 · 2025-03-17T16:37:26.000+01:00
serial protocol bug check fix
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
     "name": "GPStar Audio Serial Library",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "description": "A serial communication control library for the GPStar Audio and GPStar Audio XL series of audio boards from GPStar Technologies.",
     "keywords": "audio, serial, music, wav",
     "authors":
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=GPStar Audio Serial Library
-version=1.2.1
+version=1.2.2
 author=Michael Rajotte
 license=GPL-3.0-or-later
 maintainer=Michael Rajotte <michael.rajotte@gpstartechnologies.com>
diff --git a/src/GPStarAudio.cpp b/src/GPStarAudio.cpp
@@ -85,12 +85,14 @@ void gpstarAudio::update(void) {
       }
     }
     else if((rxCount > 2) && (rxCount < rxLen)) {
-      if(dat == SOM1 || dat == SOM2 || dat == EOM) {
-        rxCount = 0; // Bad serial data.
+      rxMessage[rxCount - 3] = dat;
+      rxCount++;
+      
+      if(rxMessage[0] == RSP_GPSTAR_HELLO) {
+	      // Skip the extra check upon the GPStar hello check.
       }
-      else {
-        rxMessage[rxCount - 3] = dat;
-        rxCount++;
+      else if(dat == SOM1 || dat == SOM2 || dat == EOM) {
+        rxCount = 0; // Bad serial data.
       }
     }
     else if(rxCount == rxLen) {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "GPStar Audio Serial Library",`
`3`		`- "version": "1.2.1",`
	`3`	`+ "version": "1.2.2",`
`4`	`4`	`"description": "A serial communication control library for the GPStar Audio and GPStar Audio XL series of audio boards from GPStar Technologies.",`
`5`	`5`	`"keywords": "audio, serial, music, wav",`
`6`	`6`	`"authors":`
Original file line number	Diff line number	Diff line change
`@@ -85,12 +85,14 @@ void gpstarAudio::update(void) {`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`else if((rxCount > 2) && (rxCount < rxLen)) {`
`88`		`- if(dat == SOM1 \|\| dat == SOM2 \|\| dat == EOM) {`
`89`		`- rxCount = 0; // Bad serial data.`
	`88`	`+ rxMessage[rxCount - 3] = dat;`
	`89`	`+ rxCount++;`
	`90`	`+`
	`91`	`+ if(rxMessage[0] == RSP_GPSTAR_HELLO) {`
	`92`	`+ // Skip the extra check upon the GPStar hello check.`
`90`	`93`	`}`
`91`		`- else {`
`92`		`- rxMessage[rxCount - 3] = dat;`
`93`		`- rxCount++;`
	`94`	`+ else if(dat == SOM1 \|\| dat == SOM2 \|\| dat == EOM) {`
	`95`	`+ rxCount = 0; // Bad serial data.`
`94`	`96`	`}`
`95`	`97`	`}`
`96`	`98`	`else if(rxCount == rxLen) {`