MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove SPI.h and EEPROM.h includes (#555)

Browse Source 
* Remove duplicate includes

* Reorder SPI.h include
This commit is contained in:
Olivier
2016-08-14 14:46:05 +02:00
committed by Embedded Innovation
parent f9c36c9b74
commit 0a8fbe5816
40 changed files with 1 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/RF24/RF24.h
+1 -1
View File
@@ -34,10 +34,10 @@
#define MY_RF24_SPI_DATA_MODE SPI_MODE0 #define MY_RF24_SPI_DATA_MODE SPI_MODE0
#if defined (ARDUINO) && !defined (__arm__) && !defined (_SPI) #if defined (ARDUINO) && !defined (__arm__) && !defined (_SPI)
#include <SPI.h>
#if defined(MY_SOFTSPI) #if defined(MY_SOFTSPI)
SoftSPI<MY_SOFT_SPI_MISO_PIN, MY_SOFT_SPI_MOSI_PIN, MY_SOFT_SPI_SCK_PIN, MY_RF24_SPI_DATA_MODE> _SPI; SoftSPI<MY_SOFT_SPI_MISO_PIN, MY_SOFT_SPI_MOSI_PIN, MY_SOFT_SPI_SCK_PIN, MY_RF24_SPI_DATA_MODE> _SPI;
#else #else
#include <SPI.h>
#define _SPI SPI #define _SPI SPI
#endif #endif
#else #else
examples/AirQualitySensor/AirQualitySensor.ino
-1
View File
@@ -41,7 +41,6 @@
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
#define CHILD_ID_MQ 0 #define CHILD_ID_MQ 0
examples/BatteryPoweredSensor/BatteryPoweredSensor.ino
-1
View File
@@ -35,7 +35,6 @@
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
int BATTERY_SENSE_PIN = A0; // select the input pin for the battery sense point int BATTERY_SENSE_PIN = A0; // select the input pin for the battery sense point
examples/BinarySwitchSleepSensor/BinarySwitchSleepSensor.ino
-1
View File
@@ -37,7 +37,6 @@
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
#define SKETCH_NAME "Binary Sensor" #define SKETCH_NAME "Binary Sensor"
examples/CO2Sensor/CO2Sensor.ino
-1
View File
@@ -45,7 +45,6 @@
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
#define CHILD_ID_AIQ 0 #define CHILD_ID_AIQ 0
examples/ClearEepromConfig/ClearEepromConfig.ino
-1
View File
@@ -26,7 +26,6 @@
// load core modules only // load core modules only
#define MY_CORE_ONLY #define MY_CORE_ONLY
#include <EEPROM.h>
#include <MySensors.h> #include <MySensors.h>
void setup() void setup()
examples/DimmableLEDActuator/DimmableLEDActuator.ino
-1
View File
@@ -42,7 +42,6 @@
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
#define SN "DimmableLED" #define SN "DimmableLED"
examples/DimmableLight/DimmableLight.ino
-1
View File
@@ -36,7 +36,6 @@
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
#define CHILD_ID_LIGHT 1 #define CHILD_ID_LIGHT 1
examples/DustSensor/DustSensor.ino
-1
View File
@@ -45,7 +45,6 @@
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
#define CHILD_ID_DUST 0 #define CHILD_ID_DUST 0
examples/DustSensorDSM/DustSensorDSM.ino
-1
View File
@@ -37,7 +37,6 @@
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
#define CHILD_ID_DUST_PM10 0 #define CHILD_ID_DUST_PM10 0
examples/EnergyMeterPulseSensor/EnergyMeterPulseSensor.ino
-1
View File
@@ -41,7 +41,6 @@
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
#define DIGITAL_INPUT_SENSOR 3 // The digital input you attached your light sensor. (Only 2 and 3 generates interrupt!) #define DIGITAL_INPUT_SENSOR 3 // The digital input you attached your light sensor. (Only 2 and 3 generates interrupt!)
examples/GatewayESP8266/GatewayESP8266.ino
-2
View File
@@ -65,8 +65,6 @@
* Make sure to fill in your ssid and WiFi password below for ssid & pass. * Make sure to fill in your ssid and WiFi password below for ssid & pass.
*/ */
#include <EEPROM.h>
#include <SPI.h>
// Enable debug prints to serial monitor // Enable debug prints to serial monitor
#define MY_DEBUG #define MY_DEBUG
examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino
-2
View File
@@ -57,8 +57,6 @@
* Make sure to fill in your ssid and WiFi password below for ssid & pass. * Make sure to fill in your ssid and WiFi password below for ssid & pass.
*/ */
#include <EEPROM.h>
#include <SPI.h>
// Enable debug prints to serial monitor // Enable debug prints to serial monitor
#define MY_DEBUG #define MY_DEBUG
examples/GatewayESP8266OTA/GatewayESP8266OTA.ino
-2
View File
@@ -66,8 +66,6 @@
* Make sure to fill in your ssid and WiFi password below for ssid & pass. * Make sure to fill in your ssid and WiFi password below for ssid & pass.
*/ */
#include <EEPROM.h>
#include <SPI.h>
#include <ArduinoOTA.h> #include <ArduinoOTA.h>
// Enable debug prints to serial monitor // Enable debug prints to serial monitor
examples/GatewaySerial/GatewaySerial.ino
-1
View File
@@ -82,7 +82,6 @@
//#define MY_DEFAULT_RX_LED_PIN 6 // Receive led pin //#define MY_DEFAULT_RX_LED_PIN 6 // Receive led pin
//#define MY_DEFAULT_TX_LED_PIN 5 // the PCB, on board LED //#define MY_DEFAULT_TX_LED_PIN 5 // the PCB, on board LED
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
void setup() { void setup() {
examples/GatewaySerialRS485/GatewaySerialRS485.ino
-1
View File
@@ -82,7 +82,6 @@
#define MY_DEFAULT_RX_LED_PIN 5 // Receive led pin #define MY_DEFAULT_RX_LED_PIN 5 // Receive led pin
#define MY_DEFAULT_TX_LED_PIN 6 // the PCB, on board LED #define MY_DEFAULT_TX_LED_PIN 6 // the PCB, on board LED
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
void setup() { void setup() {
examples/GatewayW5100/GatewayW5100.ino
-1
View File
@@ -109,7 +109,6 @@
//#define MY_DEFAULT_RX_LED_PIN 8 // Receive led pin //#define MY_DEFAULT_RX_LED_PIN 8 // Receive led pin
//#define MY_DEFAULT_TX_LED_PIN 9 // the PCB, on board LED //#define MY_DEFAULT_TX_LED_PIN 9 // the PCB, on board LED
#include <SPI.h>
#if defined(MY_USE_UDP) #if defined(MY_USE_UDP)
#include <EthernetUdp.h> #include <EthernetUdp.h>
examples/GatewayW5100MQTTClient/GatewayW5100MQTTClient.ino
-1
View File
@@ -57,7 +57,6 @@
* Make sure to fill in your ssid and WiFi password below for ssid & pass. * Make sure to fill in your ssid and WiFi password below for ssid & pass.
*/ */
#include <SPI.h>
// Enable debug prints to serial monitor // Enable debug prints to serial monitor
#define MY_DEBUG #define MY_DEBUG
examples/LightSensor/LightSensor.ino
-1
View File
@@ -33,7 +33,6 @@
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
#define CHILD_ID_LIGHT 0 #define CHILD_ID_LIGHT 0
examples/MockMySensors/MockMySensors.ino
-1
View File
@@ -15,7 +15,6 @@
#define MY_NODE_ID 254 #define MY_NODE_ID 254
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
#define RADIO_ERROR_LED_PIN 4 // Error led pin #define RADIO_ERROR_LED_PIN 4 // Error led pin
examples/MotionSensor/MotionSensor.ino
-1
View File
@@ -34,7 +34,6 @@
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
unsigned long SLEEP_TIME = 120000; // Sleep time between reports (in milliseconds) unsigned long SLEEP_TIME = 120000; // Sleep time between reports (in milliseconds)
examples/MotionSensorRS485/MotionSensorRS485.ino
-1
View File
@@ -53,7 +53,6 @@
// Set RS485 baud rate to use // Set RS485 baud rate to use
#define MY_RS485_BAUD_RATE 9600 #define MY_RS485_BAUD_RATE 9600
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
unsigned long SLEEP_TIME = 120000; // Sleep time between reports (in milliseconds) unsigned long SLEEP_TIME = 120000; // Sleep time between reports (in milliseconds)
examples/PHSensor/PHSensor.ino
-1
View File
@@ -29,7 +29,6 @@
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
#define COMPARE_PH 1 // Send PH only if changed? 1 = Yes 0 = No #define COMPARE_PH 1 // Send PH only if changed? 1 = Yes 0 = No
examples/PingPongSensor/PingPongSensor.ino
-1
View File
@@ -15,7 +15,6 @@
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
#include "MYSLog.h" #include "MYSLog.h"
examples/RelayActuator/RelayActuator.ino
-1
View File
@@ -37,7 +37,6 @@
// Enable repeater functionality for this node // Enable repeater functionality for this node
#define MY_REPEATER_FEATURE #define MY_REPEATER_FEATURE
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
#define RELAY_1 3 // Arduino Digital I/O pin number for first relay (second on pin+1 etc) #define RELAY_1 3 // Arduino Digital I/O pin number for first relay (second on pin+1 etc)
examples/RepeaterNode/RepeaterNode.ino
-1
View File
@@ -38,7 +38,6 @@
// Enabled repeater feature for this node // Enabled repeater feature for this node
#define MY_REPEATER_FEATURE #define MY_REPEATER_FEATURE
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
void setup() { void setup() {
examples/SecretKnockSensor/SecretKnockSensor.ino
-1
View File
@@ -58,7 +58,6 @@
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
examples/SecureActuator/SecureActuator.ino
-1
View File
@@ -65,7 +65,6 @@
// SETTINGS FOR MY_SIGNING_ATSHA204 // SETTINGS FOR MY_SIGNING_ATSHA204
#define MY_SIGNING_ATSHA204_PIN 17 //!< A3 - pin where ATSHA204 is attached #define MY_SIGNING_ATSHA204_PIN 17 //!< A3 - pin where ATSHA204 is attached
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
examples/SensebenderGatewaySerial/SensebenderGatewaySerial.ino
-1
View File
@@ -82,7 +82,6 @@
//#define MY_DEFAULT_RX_LED_PIN 6 // Receive led pin //#define MY_DEFAULT_RX_LED_PIN 6 // Receive led pin
//#define MY_DEFAULT_TX_LED_PIN 5 // the PCB, on board LED //#define MY_DEFAULT_TX_LED_PIN 5 // the PCB, on board LED
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
#include <SD.h> #include <SD.h>
#include <drivers/ATSHA204/ATSHA204.cpp> #include <drivers/ATSHA204/ATSHA204.cpp>
examples/SoilMoistSensor/SoilMoistSensor.ino
-1
View File
@@ -68,7 +68,6 @@
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <math.h> // Conversion equation from resistance to % #include <math.h> // Conversion equation from resistance to %
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
// Setting up format for reading 3 soil sensors // Setting up format for reading 3 soil sensors
examples/UVSensor/UVSensor.ino
-1
View File
@@ -43,7 +43,6 @@
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
#define UV_SENSOR_ANALOG_PIN 0 #define UV_SENSOR_ANALOG_PIN 0
examples/VibrationSensor/VibrationSensor.ino
-1
View File
@@ -39,7 +39,6 @@
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
#include <Wire.h> #include <Wire.h>
examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino
-1
View File
@@ -41,7 +41,6 @@
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
#define DIGITAL_INPUT_SENSOR 3 // The digital input you attached your sensor. (Only 2 and 3 generates interrupt!) #define DIGITAL_INPUT_SENSOR 3 // The digital input you attached your sensor. (Only 2 and 3 generates interrupt!)
tests/Arduino/sketches/hard_signing_no_whitelisting_full_debug/hard_signing_no_whitelisting_full_debug.ino
-1
View File
@@ -34,5 +34,4 @@
#define MY_SIGNING_ATSHA204_PIN 17 #define MY_SIGNING_ATSHA204_PIN 17
#endif #endif
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
tests/Arduino/sketches/hard_signing_whitelisting_full_debug/hard_signing_whitelisting_full_debug.ino
-1
View File
@@ -34,5 +34,4 @@
#define MY_SIGNING_ATSHA204_PIN 17 #define MY_SIGNING_ATSHA204_PIN 17
#endif #endif
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
tests/Arduino/sketches/hard_signing_whitelisting_full_debug_nodelock/hard_signing_whitelisting_full_debug_nodelock.ino
-1
View File
@@ -35,5 +35,4 @@
#endif #endif
#define MY_NODE_LOCK_FEATURE #define MY_NODE_LOCK_FEATURE
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
tests/Arduino/sketches/hard_signing_whitelisting_full_debug_nrf24_rsa/hard_signing_whitelisting_full_debug_nrf24_rsa.ino
-1
View File
@@ -35,5 +35,4 @@
#endif #endif
#define MY_RF24_ENABLE_ENCRYPTION #define MY_RF24_ENABLE_ENCRYPTION
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
tests/Arduino/sketches/hard_signing_whitelisting_full_debug_rfm69_rsa/hard_signing_whitelisting_full_debug_rfm69_rsa.ino
-1
View File
@@ -35,5 +35,4 @@
#endif #endif
#define MY_RFM69_ENABLE_ENCRYPTION #define MY_RFM69_ENABLE_ENCRYPTION
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
tests/Arduino/sketches/soft_signing_no_whitelisting_full_debug/soft_signing_no_whitelisting_full_debug.ino
-1
View File
@@ -34,5 +34,4 @@
#define MY_SIGNING_ATSHA204_PIN 17 #define MY_SIGNING_ATSHA204_PIN 17
#endif #endif
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>
tests/Arduino/sketches/soft_signing_whitelisting_full_debug/soft_signing_whitelisting_full_debug.ino
-1
View File
@@ -34,5 +34,4 @@
#define MY_SIGNING_ATSHA204_PIN 17 #define MY_SIGNING_ATSHA204_PIN 17
#endif #endif
#include <SPI.h>
#include <MySensors.h> #include <MySensors.h>