Buttons & lights & relays providers refactoring

code/espurna/DebounceEvent.cpp

@@ -30,38 +30,27 @@
 #include <functional>
 #include <memory>
 
+#include "compat.h"
 #include "libs/DebounceEvent.h"
 
 namespace debounce_event {
 
-EventEmitter::EventEmitter(types::Pin pin, types::EventHandler callback, const types::Config& config, unsigned long debounce_delay, unsigned long repeat) :
- _pin(pin),
+EventEmitter::EventEmitter(BasePinPtr&& pin, types::EventHandler callback, const types::Config& config, unsigned long debounce_delay, unsigned long repeat) :
+ _pin(std::move(pin)),
  _callback(callback),
  _config(config),
  _is_switch(config.mode == types::Mode::Switch),
  _delay(debounce_delay),
  _repeat(repeat)
 {
- if (!pin) return;
+ if (!_pin) return;
 
  switch (_config.pin_mode) {
  case types::PinMode::InputPullup:
  _pin->pinMode(INPUT_PULLUP);
  break;
  case types::PinMode::InputPulldown:
- // ESP8266 does not have INPUT_PULLDOWN definition, and instead
- // has a GPIO16-specific INPUT_PULLDOWN_16:
- // - https://github.com/esp8266/Arduino/issues/478
- // - https://github.com/esp8266/Arduino/commit/1b3581d55ebf0f8c91e081f9af4cf7433d492ec9
-#ifdef ESP8266
- if (_pin->pin == 16) {
- _pin->pinMode(INPUT_PULLDOWN_16);
- } else {
- _pin->pinMode(INPUT);
- }
-#else
  _pin->pinMode(INPUT_PULLDOWN);
-#endif
  break;
  case types::PinMode::Input:
  _pin->pinMode(INPUT);
@@ -83,19 +72,19 @@ EventEmitter::EventEmitter(types::Pin pin, types::EventHandler callback, const t
  _value = _default_value;
 }
 
-EventEmitter::EventEmitter(types::Pin pin, const types::Config& config, unsigned long delay, unsigned long repeat) :
- EventEmitter(pin, nullptr, config, delay, repeat)
+EventEmitter::EventEmitter(BasePinPtr&& pin, const types::Config& config, unsigned long delay, unsigned long repeat) :
+ EventEmitter(std::move(pin), nullptr, config, delay, repeat)
 {}
 
 bool EventEmitter::isPressed() {
  return (_value != _default_value);
 }
 
-const types::Pin EventEmitter::getPin() const {
+const BasePinPtr& EventEmitter::pin() const {
  return _pin;
 }
 
-const types::Config EventEmitter::getConfig() const {
+const types::Config& EventEmitter::config() const {
  return _config;
 }
 

code/espurna/alexa.cpp

@@ -74,9 +74,7 @@ void _alexaBrokerCallback(const String& topic, unsigned char id, unsigned int va
  }
 
  if (topic.equals(MQTT_TOPIC_RELAY)) {
- #if RELAY_PROVIDER == RELAY_PROVIDER_LIGHT
- if (id > 0) return;
- #endif
+ if (id > 0) return;
  _alexa.setState(id, value, value > 0 ? 255 : 0);
  }
 
@@ -97,13 +95,13 @@ void alexaLoop() {
  alexa_queue_element_t element = _alexa_queue.front();
  DEBUG_MSG_P(PSTR("[ALEXA] Device #%u state: %s value: %d\n"), element.device_id, element.state ? "ON" : "OFF", element.value);
 
- #if RELAY_PROVIDER == RELAY_PROVIDER_LIGHT
+ #if LIGHT_PROVIDER != LIGHT_PROVIDER_NONE
  if (0 == element.device_id) {
- relayStatus(0, element.state);
+ lightState(element.state);
  } else {
  lightState(element.device_id - 1, element.state);
  lightChannel(element.device_id - 1, element.value);
- lightUpdate(true, true);
+ lightUpdate();
  }
  #else
  relayStatus(element.device_id, element.state);
@@ -130,7 +128,7 @@ void alexaSetup() {
  }
 
  // Lights
- #if RELAY_PROVIDER == RELAY_PROVIDER_LIGHT
+ #if LIGHT_PROVIDER != LIGHT_PROVIDER_NONE
 
  // Global switch
  _alexa.addDevice(hostname.c_str());