Skip to content

Commit 485e3d2

Browse files
authored
Merge pull request #13 from maidnl/removing_warnings
Modulino:removed compilation warnings
2 parents a61a491 + 47828b2 commit 485e3d2

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/Modulino.h

+9-8
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ extern ModulinoClass Modulino;
4646

4747
class Module : public Printable {
4848
public:
49-
Module(uint8_t address = 0xFF, char* name = "")
50-
: address(address), name(name) {}
49+
Module(uint8_t address = 0xFF, const char* name = "")
50+
: address(address), name((char *)name) {}
51+
virtual ~Module() {}
5152
bool begin() {
5253
if (address == 0xFF) {
5354
address = discover() / 2; // divide by 2 to match address in fw main.c
@@ -141,7 +142,7 @@ class ModulinoButtons : public Module {
141142
return;
142143
}
143144
virtual uint8_t discover() {
144-
for (int i = 0; i < sizeof(match)/sizeof(match[0]); i++) {
145+
for (unsigned int i = 0; i < sizeof(match)/sizeof(match[0]); i++) {
145146
if (scan(match[i])) {
146147
return match[i];
147148
}
@@ -170,7 +171,7 @@ class ModulinoBuzzer : public Module {
170171
write(buf, 8);
171172
}
172173
virtual uint8_t discover() {
173-
for (int i = 0; i < sizeof(match)/sizeof(match[0]); i++) {
174+
for (unsigned int i = 0; i < sizeof(match)/sizeof(match[0]); i++) {
174175
if (scan(match[i])) {
175176
return match[i];
176177
}
@@ -217,7 +218,7 @@ class ModulinoPixels : public Module {
217218
write((uint8_t*)data, NUMLEDS * 4);
218219
}
219220
virtual uint8_t discover() {
220-
for (int i = 0; i < sizeof(match)/sizeof(match[0]); i++) {
221+
for (unsigned int i = 0; i < sizeof(match)/sizeof(match[0]); i++) {
221222
if (scan(match[i])) {
222223
return match[i];
223224
}
@@ -274,7 +275,7 @@ class ModulinoKnob : public Module {
274275
return _pressed;
275276
}
276277
virtual uint8_t discover() {
277-
for (int i = 0; i < sizeof(match)/sizeof(match[0]); i++) {
278+
for (unsigned int i = 0; i < sizeof(match)/sizeof(match[0]); i++) {
278279
if (scan(match[i])) {
279280
return match[i];
280281
}
@@ -480,7 +481,7 @@ class ModulinoDistance : public Module {
480481
if (api == nullptr) {
481482
return false;
482483
}
483-
float ret = internal;
484+
484485
uint8_t NewDataReady = 0;
485486
api->checkForDataReady(&NewDataReady);
486487
if (NewDataReady) {
@@ -504,4 +505,4 @@ class ModulinoDistance : public Module {
504505
//VL53L4ED_ResultsData_t results;
505506
float internal = NAN;
506507
_distance_api* api = nullptr;
507-
};
508+
};

0 commit comments

Comments
 (0)