From 588507621a48ab015bd1d8de8af461bbb217be1e Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Thu, 4 Feb 2016 17:19:21 +0100 Subject: [PATCH] some arduino refactoring Former-commit-id: f5b74a8a1f10400579ef2267f39a7a03f551ad27 --- .../{Configuration.h => HalConfiguration.h} | 6 +-- .../{Definitions.h => HalDefinitions.h} | 6 +-- arduino/HalMultiSensor/HalInterfaces.h | 40 +++++++++++++++++++ arduino/HalMultiSensor/Protocol.h | 4 -- 4 files changed, 46 insertions(+), 10 deletions(-) rename arduino/HalMultiSensor/{Configuration.h => HalConfiguration.h} (88%) rename arduino/HalMultiSensor/{Definitions.h => HalDefinitions.h} (67%) create mode 100755 arduino/HalMultiSensor/HalInterfaces.h delete mode 100755 arduino/HalMultiSensor/Protocol.h diff --git a/arduino/HalMultiSensor/Configuration.h b/arduino/HalMultiSensor/HalConfiguration.h similarity index 88% rename from arduino/HalMultiSensor/Configuration.h rename to arduino/HalMultiSensor/HalConfiguration.h index b84521d5..88a463f2 100755 --- a/arduino/HalMultiSensor/Configuration.h +++ b/arduino/HalMultiSensor/HalConfiguration.h @@ -1,5 +1,5 @@ -#ifndef CONFIGURATION_H -#define CONFIGURATION_H +#ifndef HALCONFIGURATION_H +#define HALCONFIGURATION_H #include "Definitions.h" @@ -23,4 +23,4 @@ #define LIGHT_POL_MULTIPLE 1 // poling in seconds -#endif //CONFIGURATION_H \ No newline at end of file +#endif // HALCONFIGURATION_H \ No newline at end of file diff --git a/arduino/HalMultiSensor/Definitions.h b/arduino/HalMultiSensor/HalDefinitions.h similarity index 67% rename from arduino/HalMultiSensor/Definitions.h rename to arduino/HalMultiSensor/HalDefinitions.h index 892f5336..926874b8 100755 --- a/arduino/HalMultiSensor/Definitions.h +++ b/arduino/HalMultiSensor/HalDefinitions.h @@ -1,5 +1,5 @@ -#ifndef DEFINITIONS_H -#define DEFINITIONS_H +#ifndef HALDEFINITIONS_H +#define HALDEFINITIONS_H //////// PROTOCOLS #define PROT_NEXA_SELFLEARNING @@ -11,4 +11,4 @@ #define HW_PHOTOCELL -#endif // DEFINITIONS_H \ No newline at end of file +#endif // HALDEFINITIONS_H \ No newline at end of file diff --git a/arduino/HalMultiSensor/HalInterfaces.h b/arduino/HalMultiSensor/HalInterfaces.h new file mode 100755 index 00000000..4a3d104a --- /dev/null +++ b/arduino/HalMultiSensor/HalInterfaces.h @@ -0,0 +1,40 @@ +#ifndef HALINTERFACES_H +#define HALINTERFACES_H + +class HardwarePowerConsumption +{ +public: + virtual void setup() = 0; + virtual int getConsumption() = 0; +} + +class HardwareTemperature +{ +public: + virtual void setup() = 0; + virtual int getTemperature() = 0; + virtual int getHumidity() = 0; +} + +class HardwareLight +{ +public: + virtual void setup() = 0; + virtual int getLuminosity() = 0; +} + +class HardwareInterrupt +{ +public: + virtual void interrupt(bool enable) = 0; +} + + +class Protocol +{ +public: + virtual void setup() = 0; + virtual void send() = 0; +} + +#endif // HALINTERFACES_H \ No newline at end of file diff --git a/arduino/HalMultiSensor/Protocol.h b/arduino/HalMultiSensor/Protocol.h deleted file mode 100755 index c34487f0..00000000 --- a/arduino/HalMultiSensor/Protocol.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef PROTOCL_H -#define PROTOCL_H - -#endif // PROTOCL_H \ No newline at end of file