22// SPDX-License-Identifier: MPL-2.0
33
44#include " Wire.h"
5- #include < vector>
65#include < vl53l4cd_class.h> // from stm32duino
76#include " Arduino_LSM6DSOX.h"
87#include < Arduino_LPS22HB.h>
@@ -141,7 +140,7 @@ class ModulinoButtons : public Module {
141140 return ;
142141 }
143142 virtual uint8_t discover () {
144- for (int i = 0 ; i < match. size ( ); i++) {
143+ for (int i = 0 ; i < sizeof ( match)/ sizeof (match[ 0 ] ); i++) {
145144 if (scan (match[i])) {
146145 return match[i];
147146 }
@@ -151,7 +150,7 @@ class ModulinoButtons : public Module {
151150private:
152151 bool last_status[3 ];
153152protected:
154- std::vector< uint8_t > match = { 0x7C }; // same as fw main.c
153+ uint8_t match[ 1 ] = { 0x7C }; // same as fw main.c
155154};
156155
157156class ModulinoBuzzer : public Module {
@@ -170,15 +169,15 @@ class ModulinoBuzzer : public Module {
170169 write (buf, 8 );
171170 }
172171 virtual uint8_t discover () {
173- for (int i = 0 ; i < match. size ( ); i++) {
172+ for (int i = 0 ; i < sizeof ( match)/ sizeof (match[ 0 ] ); i++) {
174173 if (scan (match[i])) {
175174 return match[i];
176175 }
177176 }
178177 return 0xFF ;
179178 }
180179protected:
181- std::vector< uint8_t > match = { 0x3C }; // same as fw main.c
180+ uint8_t match[ 1 ] = { 0x3C }; // same as fw main.c
182181};
183182
184183class ModulinoColor {
@@ -217,7 +216,7 @@ class ModulinoPixels : public Module {
217216 write ((uint8_t *)data, NUMLEDS * 4 );
218217 }
219218 virtual uint8_t discover () {
220- for (int i = 0 ; i < match. size ( ); i++) {
219+ for (int i = 0 ; i < sizeof ( match)/ sizeof (match[ 0 ] ); i++) {
221220 if (scan (match[i])) {
222221 return match[i];
223222 }
@@ -228,7 +227,7 @@ class ModulinoPixels : public Module {
228227 static const int NUMLEDS = 8 ;
229228 uint32_t data[NUMLEDS];
230229protected:
231- std::vector< uint8_t > match = { 0x6C };
230+ uint8_t match[ 1 ] = { 0x6C };
232231};
233232
234233
@@ -274,7 +273,7 @@ class ModulinoKnob : public Module {
274273 return _pressed;
275274 }
276275 virtual uint8_t discover () {
277- for (int i = 0 ; i < match. size ( ); i++) {
276+ for (int i = 0 ; i < sizeof ( match)/ sizeof (match[ 0 ] ); i++) {
278277 if (scan (match[i])) {
279278 return match[i];
280279 }
@@ -285,7 +284,7 @@ class ModulinoKnob : public Module {
285284 bool _pressed = false ;
286285 bool _bug_on_set = false ;
287286protected:
288- std::vector< uint8_t > match = { 0x74 , 0x76 };
287+ uint8_t match[ 2 ] = { 0x74 , 0x76 };
289288};
290289
291290extern ModulinoColor RED;
0 commit comments