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

Restructure HAL files (arch) (#820)

Browse Source
This commit is contained in:
Olivier
2017-04-17 20:33:08 +02:00
committed by Henrik Ekblad
parent b4b5eb52e8
commit 26c237adad
16 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MySensors.h
+10 -10
View File
@@ -1,4 +1,4 @@
/* /*
* The MySensors Arduino library handles the wireless radio link and protocol * The MySensors Arduino library handles the wireless radio link and protocol
* between your home built sensors/actuators and HA controller of choice. * between your home built sensors/actuators and HA controller of choice.
* The sensors forms a self healing radio network with optional repeaters. Each * The sensors forms a self healing radio network with optional repeaters. Each
@@ -84,17 +84,17 @@
// HARDWARE // HARDWARE
#if defined(ARDUINO_ARCH_ESP8266) #if defined(ARDUINO_ARCH_ESP8266)
#include "core/MyHwESP8266.cpp" #include "hal/architecture/MyHwESP8266.cpp"
#elif defined(ARDUINO_ARCH_AVR) #elif defined(ARDUINO_ARCH_AVR)
#include "drivers/AVR/DigitalWriteFast/digitalWriteFast.h" #include "drivers/AVR/DigitalWriteFast/digitalWriteFast.h"
#include "core/MyHwAVR.cpp" #include "hal/architecture/MyHwAVR.cpp"
#elif defined(ARDUINO_ARCH_SAMD) #elif defined(ARDUINO_ARCH_SAMD)
#include "drivers/extEEPROM/extEEPROM.cpp" #include "drivers/extEEPROM/extEEPROM.cpp"
#include "core/MyHwSAMD.cpp" #include "hal/architecture/MyHwSAMD.cpp"
#elif defined(ARDUINO_ARCH_STM32F1) #elif defined(ARDUINO_ARCH_STM32F1)
#include "core/MyHwSTM32F1.cpp" #include "hal/architecture/MyHwSTM32F1.cpp"
#elif defined(__linux__) #elif defined(__linux__)
#include "core/MyHwLinuxGeneric.cpp" #include "hal/architecture/MyHwLinuxGeneric.cpp"
#endif #endif
// LEDS // LEDS
@@ -398,13 +398,13 @@ MY_DEFAULT_RX_LED_PIN in your sketch instead to enable LEDs
// HW mains // HW mains
#if !defined(MY_CORE_ONLY) #if !defined(MY_CORE_ONLY)
#if defined(ARDUINO_ARCH_ESP8266) #if defined(ARDUINO_ARCH_ESP8266)
#include "core/MyMainESP8266.cpp" #include "hal/architecture/MyMainESP8266.cpp"
#elif defined(__linux__) #elif defined(__linux__)
#include "core/MyMainLinux.cpp" #include "hal/architecture/MyMainLinux.cpp"
#elif defined(ARDUINO_ARCH_STM32F1) #elif defined(ARDUINO_ARCH_STM32F1)
#include "core/MyMainSTM32F1.cpp" #include "hal/architecture/MyMainSTM32F1.cpp"
#else #else
#include "core/MyMainDefault.cpp" #include "hal/architecture/MyMainDefault.cpp"
#endif #endif
#endif #endif
core/MyHw.h → hal/architecture/MyHw.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* /*
* The MySensors Arduino library handles the wireless radio link and protocol * The MySensors Arduino library handles the wireless radio link and protocol
* between your home built sensors/actuators and HA controller of choice. * between your home built sensors/actuators and HA controller of choice.
* The sensors forms a self healing radio network with optional repeaters. Each * The sensors forms a self healing radio network with optional repeaters. Each
core/MyHwAVR.cpp → hal/architecture/MyHwAVR.cpp
+2 -4
View File
@@ -45,8 +45,7 @@ void wakeUp1()
sleep_disable(); sleep_disable();
detachInterrupt(_wakeUp1Interrupt); detachInterrupt(_wakeUp1Interrupt);
// First interrupt occurred will be reported only // First interrupt occurred will be reported only
if (INVALID_INTERRUPT_NUM == _wokeUpByInterrupt) if (INVALID_INTERRUPT_NUM == _wokeUpByInterrupt) {
{
_wokeUpByInterrupt = _wakeUp1Interrupt; _wokeUpByInterrupt = _wakeUp1Interrupt;
} }
} }
@@ -55,8 +54,7 @@ void wakeUp2()
sleep_disable(); sleep_disable();
detachInterrupt(_wakeUp2Interrupt); detachInterrupt(_wakeUp2Interrupt);
// First interrupt occurred will be reported only // First interrupt occurred will be reported only
if (INVALID_INTERRUPT_NUM == _wokeUpByInterrupt) if (INVALID_INTERRUPT_NUM == _wokeUpByInterrupt) {
{
_wokeUpByInterrupt = _wakeUp2Interrupt; _wokeUpByInterrupt = _wakeUp2Interrupt;
} }
} }
core/MyHwAVR.h → hal/architecture/MyHwAVR.h
+1 -1
View File
@@ -1,4 +1,4 @@
/** /*
* The MySensors Arduino library handles the wireless radio link and protocol * The MySensors Arduino library handles the wireless radio link and protocol
* between your home built sensors/actuators and HA controller of choice. * between your home built sensors/actuators and HA controller of choice.
* The sensors forms a self healing radio network with optional repeaters. Each * The sensors forms a self healing radio network with optional repeaters. Each
core/MyHwESP8266.cpp → hal/architecture/MyHwESP8266.cpp
View File
core/MyHwESP8266.h → hal/architecture/MyHwESP8266.h
+1 -1
View File
@@ -1,4 +1,4 @@
/** /*
* The MySensors Arduino library handles the wireless radio link and protocol * The MySensors Arduino library handles the wireless radio link and protocol
* between your home built sensors/actuators and HA controller of choice. * between your home built sensors/actuators and HA controller of choice.
* The sensors forms a self healing radio network with optional repeaters. Each * The sensors forms a self healing radio network with optional repeaters. Each
core/MyHwLinuxGeneric.cpp → hal/architecture/MyHwLinuxGeneric.cpp
View File
core/MyHwLinuxGeneric.h → hal/architecture/MyHwLinuxGeneric.h
+1 -1
View File
@@ -1,4 +1,4 @@
/** /*
* The MySensors Arduino library handles the wireless radio link and protocol * The MySensors Arduino library handles the wireless radio link and protocol
* between your home built sensors/actuators and HA controller of choice. * between your home built sensors/actuators and HA controller of choice.
* The sensors forms a self healing radio network with optional repeaters. Each * The sensors forms a self healing radio network with optional repeaters. Each
core/MyHwSAMD.cpp → hal/architecture/MyHwSAMD.cpp
View File
core/MyHwSAMD.h → hal/architecture/MyHwSAMD.h
+1 -1
View File
@@ -1,4 +1,4 @@
/** /*
* The MySensors Arduino library handles the wireless radio link and protocol * The MySensors Arduino library handles the wireless radio link and protocol
* between your home built sensors/actuators and HA controller of choice. * between your home built sensors/actuators and HA controller of choice.
* The sensors forms a self healing radio network with optional repeaters. Each * The sensors forms a self healing radio network with optional repeaters. Each
core/MyHwSTM32F1.cpp → hal/architecture/MyHwSTM32F1.cpp
View File
core/MyHwSTM32F1.h → hal/architecture/MyHwSTM32F1.h
+1 -1
View File
@@ -1,4 +1,4 @@
/** /*
* The MySensors Arduino library handles the wireless radio link and protocol * The MySensors Arduino library handles the wireless radio link and protocol
* between your home built sensors/actuators and HA controller of choice. * between your home built sensors/actuators and HA controller of choice.
* The sensors forms a self healing radio network with optional repeaters. Each * The sensors forms a self healing radio network with optional repeaters. Each
core/MyMainDefault.cpp → hal/architecture/MyMainDefault.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
/** /*
* The MySensors Arduino library handles the wireless radio link and protocol * The MySensors Arduino library handles the wireless radio link and protocol
* between your home built sensors/actuators and HA controller of choice. * between your home built sensors/actuators and HA controller of choice.
* The sensors forms a self healing radio network with optional repeaters. Each * The sensors forms a self healing radio network with optional repeaters. Each
core/MyMainESP8266.cpp → hal/architecture/MyMainESP8266.cpp
View File
core/MyMainLinux.cpp → hal/architecture/MyMainLinux.cpp
View File
core/MyMainSTM32F1.cpp → hal/architecture/MyMainSTM32F1.cpp
View File