Start big class renaming

Author: facchinm

examples/Modulino_PlugNPlay/Modulino_PlugNPlay.ino

@@ -1,10 +1,11 @@
 #include "Modulino.h"
 
-Buttons buttons;
-Tone buzzer;
-LEDS leds;
-Encoder encoder;
-Distance distance;
+ModulinoButtons buttons;
+ModulinoBuzzer buzzer;
+ModulinoPixels leds;
+ModulinoKnob encoder;
+ModulinoDistance distance;
+ModulinoMovement imu;
 
 void setup() {
 
@@ -20,7 +21,6 @@ void setup() {
   leds.begin();
 
   imu.begin();
-  imu.setContinuousMode();
   barometer.begin();
   //humidity.begin();
 }
@@ -44,13 +44,13 @@ void loop() {
   pitch = encoder.get() + distance.get();
 
   if (Serial.available() && Serial.read() == 's') {
-    imu.readAcceleration(x, y, z);
+    imu.update();
     Serial.print("IMU: x ");
-    Serial.print(x, 3);
+    Serial.print(imu.getX(), 3);
     Serial.print("\ty ");
-    Serial.print(y, 3);
+    Serial.print(imu.getY(), 3);
     Serial.print("\tz ");
-    Serial.println(z, 3);
+    Serial.println(imu.getZ(), 3);
 
     Serial.print("Pressure: " + String(barometer.readPressure()));
     Serial.println("\tTemperature: " + String(barometer.readTemperature()));

src/Modulino.cpp

@@ -1,17 +1,8 @@
 #include "Modulino.h"
 
-/*
-Buttons buttons(62);
-Tone buzzer(30);
-LEDS leds(54);
-Encoder encoder(58);
-*/
-
 // The only singleton that needs to exist
 ModulinoClass Modulino;
 
-BoschSensorClass imu(Wire1);
-VL53L1X tof_sensor;
 APDS9999 color(Wire1);  // TODO: need to change to APDS9999 https://docs.broadcom.com/doc/APDS-9999-DS
 LPS22HBClass barometer(Wire1);
 HS300xClass humidity(Wire1);

src/Modulino.h

@@ -101,9 +101,9 @@ class Module : public Printable {
   char* name;
 };
 
-class Buttons : public Module {
+class ModulinoButtons : public Module {
 public:
-  Buttons(uint8_t address = 0xFF)
+  ModulinoButtons(uint8_t address = 0xFF)
     : Module(address, "BUTTONS") {}
   bool get(bool& a, bool& b, bool& c) {
     uint8_t buf[3];
@@ -138,9 +138,9 @@ class Buttons : public Module {
   std::vector<uint8_t> match = { 0x7C };  // same as fw main.c
 };
 
-class Tone : public Module {
+class ModulinoBuzzer : public Module {
 public:
-  Tone(uint8_t address = 0xFF)
+  ModulinoBuzzer(uint8_t address = 0xFF)
     : Module(address, "BUZZER") {}
   void tone(size_t freq, size_t len_ms) {
     uint8_t buf[8];
@@ -175,9 +175,9 @@ class ModulinoColor {
   uint8_t r, g, b;
 };
 
-class LEDS : public Module {
+class ModulinoPixels : public Module {
 public:
-  LEDS(uint8_t address = 0xFF)
+  ModulinoPixels(uint8_t address = 0xFF)
     : Module(address, "LEDS") {
     memset((uint8_t*)data, 0xE0, NUMLEDS * 4);
   }
@@ -214,9 +214,9 @@ class LEDS : public Module {
 };
 
 
-class Encoder : public Module {
+class ModulinoKnob : public Module {
 public:
-  Encoder(uint8_t address = 0xFF)
+  ModulinoKnob(uint8_t address = 0xFF)
     : Module(address, "ENCODER") {}
   int16_t get() {
     uint8_t buf[3];
@@ -321,22 +321,46 @@ extern ModulinoColor BLUE;
 extern ModulinoColor GREEN;
 extern ModulinoColor VIOLET;
 extern ModulinoColor WHITE;
-
 extern ModulinoClass Modulino;
 
 /*
-extern Buttons buttons;
-extern Tone buzzer;
-extern LEDS leds;
-extern Encoder encoder;
+  TODO: These classes need to be ported to Modulino ecosystem, as per the tof_sensor example
 */
-extern BoschSensorClass imu;
-extern VL53L1X tof_sensor;
 extern APDS9999 color;  // TODO: need to change to APDS9999 https://docs.broadcom.com/doc/APDS-9999-DS
 extern LPS22HBClass barometer;
-extern HS300xClass humidity;
 
-class Distance : public Module {
+class ModulinoMovement : public Module {
+public:
+  bool begin() {
+    imu.begin();
+    imu.setContinuousMode();
+  }
+  int update() {
+    return imu.readAcceleration(x, y, z);
+  }
+  float getX() {
+    return x;
+  }
+  float getY() {
+    return y;
+  }
+  float getZ() {
+    return z;
+  }
+private:
+  BoschSensorClass imu = BoschSensorClass(*((TwoWire*)getWire()));
+  float x,y,z;
+};
+
+class ModulinoAir : public Module {
+
+};
+
+class ModulinoLight : public Module {
+
+};
+
+class ModulinoDistance : public Module {
 public:
   bool begin() {
     tof_sensor.setBus((TwoWire*)getWire());
@@ -348,4 +372,6 @@ class Distance : public Module {
   float get() {
     return tof_sensor.read();
   }
+private:
+  VL53L1X tof_sensor;
 };