From ecae80b0fc231d9367af351e82d879f330f98b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Thu, 17 Nov 2016 08:23:47 +0100 Subject: [PATCH] Indentation make-up --- code/src/rf.ino | 92 ++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/code/src/rf.ino b/code/src/rf.ino index f28907dc..b5711e8d 100644 --- a/code/src/rf.ino +++ b/code/src/rf.ino @@ -20,74 +20,74 @@ unsigned long rfCodeOFF = 0; // ----------------------------------------------------------------------------- void rfLoop() { -return; -if (rfCode == 0) return; -DEBUG_MSG("[RF] Received code: %lu\n", rfCode); -if (rfCode == rfCodeON) switchRelayOn(); -if (rfCode == rfCodeOFF) switchRelayOff(); -rfCode = 0; + return; + if (rfCode == 0) return; + DEBUG_MSG("[RF] Received code: %lu\n", rfCode); + if (rfCode == rfCodeON) switchRelayOn(); + if (rfCode == rfCodeOFF) switchRelayOff(); + rfCode = 0; } void rfBuildCodes() { -unsigned long code = 0; + unsigned long code = 0; -// channel -unsigned int channel = getSetting("rfChannel", String(RF_CHANNEL)).toInt(); -for (byte i = 0; i < 5; i++) { - code *= 3; - if (channel & 1) code += 1; - channel >>= 1; -} + // channel + unsigned int channel = getSetting("rfChannel", String(RF_CHANNEL)).toInt(); + for (byte i = 0; i < 5; i++) { + code *= 3; + if (channel & 1) code += 1; + channel >>= 1; + } -// device -unsigned int device = getSetting("rfDevice", String(RF_DEVICE)).toInt(); -for (byte i = 0; i < 5; i++) { - code *= 3; - if (device != i) code += 2; -} + // device + unsigned int device = getSetting("rfDevice", String(RF_DEVICE)).toInt(); + for (byte i = 0; i < 5; i++) { + code *= 3; + if (device != i) code += 2; + } -// status -code *= 9; -rfCodeOFF = code + 2; -rfCodeON = code + 6; + // status + code *= 9; + rfCodeOFF = code + 2; + rfCodeON = code + 6; -DEBUG_MSG("[RF] Code ON : %lu\n", rfCodeON); -DEBUG_MSG("[RF] Code OFF: %lu\n", rfCodeOFF); + DEBUG_MSG("[RF] Code ON : %lu\n", rfCodeON); + DEBUG_MSG("[RF] Code OFF: %lu\n", rfCodeOFF); } void rfCallback(unsigned long code, unsigned int period) { -rfCode = code; + rfCode = code; } void rfSetup() { -pinMode(RF_PIN, INPUT_PULLUP); -rfBuildCodes(); -RemoteReceiver::init(RF_PIN, 3, rfCallback); -RemoteReceiver::disable(); -DEBUG_MSG("[RF] Disabled\n"); - -static WiFiEventHandler e1 = WiFi.onStationModeDisconnected([](const WiFiEventStationModeDisconnected& event) { + pinMode(RF_PIN, INPUT_PULLUP); + rfBuildCodes(); + RemoteReceiver::init(RF_PIN, 3, rfCallback); RemoteReceiver::disable(); DEBUG_MSG("[RF] Disabled\n"); -}); -static WiFiEventHandler e2 = WiFi.onSoftAPModeStationDisconnected([](const WiFiEventSoftAPModeStationDisconnected& event) { - RemoteReceiver::disable(); - DEBUG_MSG("[RF] Disabled\n"); + static WiFiEventHandler e1 = WiFi.onStationModeDisconnected([](const WiFiEventStationModeDisconnected& event) { + RemoteReceiver::disable(); + DEBUG_MSG("[RF] Disabled\n"); }); -static WiFiEventHandler e3 = WiFi.onStationModeConnected([](const WiFiEventStationModeConnected& event) { - RemoteReceiver::enable(); - DEBUG_MSG("[RF] Enabled\n"); -}); + static WiFiEventHandler e2 = WiFi.onSoftAPModeStationDisconnected([](const WiFiEventSoftAPModeStationDisconnected& event) { + RemoteReceiver::disable(); + DEBUG_MSG("[RF] Disabled\n"); + }); + + static WiFiEventHandler e3 = WiFi.onStationModeConnected([](const WiFiEventStationModeConnected& event) { + RemoteReceiver::enable(); + DEBUG_MSG("[RF] Enabled\n"); + }); -static WiFiEventHandler e4 = WiFi.onSoftAPModeStationConnected([](const WiFiEventSoftAPModeStationConnected& event) { - RemoteReceiver::enable(); - DEBUG_MSG("[RF] Enabled\n"); -}); + static WiFiEventHandler e4 = WiFi.onSoftAPModeStationConnected([](const WiFiEventSoftAPModeStationConnected& event) { + RemoteReceiver::enable(); + DEBUG_MSG("[RF] Enabled\n"); + }); }