Restructure HAL files (arch) (#820)

2017-04-17 20:33:08 +02:00
parent b4b5eb52e8
commit 26c237adad
16 changed files with 26 additions and 28 deletions
@@ -1,4 +1,4 @@
-/*
+/*
 * The MySensors Arduino library handles the wireless radio link and protocol
 * between your home built sensors/actuators and HA controller of choice.
 * The sensors forms a self healing radio network with optional repeaters. Each
@@ -84,17 +84,17 @@

 // HARDWARE
 #if defined(ARDUINO_ARCH_ESP8266)
-#include "core/MyHwESP8266.cpp"
+#include "hal/architecture/MyHwESP8266.cpp"
 #elif defined(ARDUINO_ARCH_AVR)
 #include "drivers/AVR/DigitalWriteFast/digitalWriteFast.h"
-#include "core/MyHwAVR.cpp"
+#include "hal/architecture/MyHwAVR.cpp"
 #elif defined(ARDUINO_ARCH_SAMD)
 #include "drivers/extEEPROM/extEEPROM.cpp"
-#include "core/MyHwSAMD.cpp"
+#include "hal/architecture/MyHwSAMD.cpp"
 #elif defined(ARDUINO_ARCH_STM32F1)
-#include "core/MyHwSTM32F1.cpp"
+#include "hal/architecture/MyHwSTM32F1.cpp"
 #elif defined(__linux__)
-#include "core/MyHwLinuxGeneric.cpp"
+#include "hal/architecture/MyHwLinuxGeneric.cpp"
 #endif

 // LEDS
@@ -398,13 +398,13 @@ MY_DEFAULT_RX_LED_PIN in your sketch instead to enable LEDs
 // HW mains
 #if !defined(MY_CORE_ONLY)
 #if defined(ARDUINO_ARCH_ESP8266)
-#include "core/MyMainESP8266.cpp"
+#include "hal/architecture/MyMainESP8266.cpp"
 #elif defined(__linux__)
-#include "core/MyMainLinux.cpp"
+#include "hal/architecture/MyMainLinux.cpp"
 #elif defined(ARDUINO_ARCH_STM32F1)
-#include "core/MyMainSTM32F1.cpp"
+#include "hal/architecture/MyMainSTM32F1.cpp"
 #else
-#include "core/MyMainDefault.cpp"
+#include "hal/architecture/MyMainDefault.cpp"
 #endif
 #endif

@@ -1,4 +1,4 @@
-/*
+/*
 * The MySensors Arduino library handles the wireless radio link and protocol
 * between your home built sensors/actuators and HA controller of choice.
 * The sensors forms a self healing radio network with optional repeaters. Each
@@ -45,8 +45,7 @@ void wakeUp1()
 	sleep_disable();
 	detachInterrupt(_wakeUp1Interrupt);
 	// First interrupt occurred will be reported only
-	if (INVALID_INTERRUPT_NUM == _wokeUpByInterrupt)
-	{
+	if (INVALID_INTERRUPT_NUM == _wokeUpByInterrupt) {
 		_wokeUpByInterrupt = _wakeUp1Interrupt;
 	}
 }
@@ -55,8 +54,7 @@ void wakeUp2()
 	sleep_disable();
 	detachInterrupt(_wakeUp2Interrupt);
 	// First interrupt occurred will be reported only
-	if (INVALID_INTERRUPT_NUM == _wokeUpByInterrupt)
-	{
+	if (INVALID_INTERRUPT_NUM == _wokeUpByInterrupt) {
 		_wokeUpByInterrupt = _wakeUp2Interrupt;
 	}
 }
@@ -128,7 +126,7 @@ void hwInternalSleep(unsigned long ms)
 	ms += 15u;

 	while (!interruptWakeUp() && ms >= 16) {
-		for (uint8_t period = 9u; ;--period) {
+		for (uint8_t period = 9u; ; --period) {
 			const uint16_t comparatorMS = 1 << (period + 4);
 			if ( ms >= comparatorMS) {
 				hwPowerDown(period); // 8192ms => 9, 16ms => 0
@@ -1,4 +1,4 @@
-/**
+/*
 * The MySensors Arduino library handles the wireless radio link and protocol
 * between your home built sensors/actuators and HA controller of choice.
 * The sensors forms a self healing radio network with optional repeaters. Each
@@ -1,4 +1,4 @@
-/**
+/*
 * The MySensors Arduino library handles the wireless radio link and protocol
 * between your home built sensors/actuators and HA controller of choice.
 * The sensors forms a self healing radio network with optional repeaters. Each
@@ -1,4 +1,4 @@
-/**
+/*
 * The MySensors Arduino library handles the wireless radio link and protocol
 * between your home built sensors/actuators and HA controller of choice.
 * The sensors forms a self healing radio network with optional repeaters. Each
@@ -1,4 +1,4 @@
-/**
+/*
 * The MySensors Arduino library handles the wireless radio link and protocol
 * between your home built sensors/actuators and HA controller of choice.
 * The sensors forms a self healing radio network with optional repeaters. Each
@@ -1,4 +1,4 @@
-/**
+/*
 * The MySensors Arduino library handles the wireless radio link and protocol
 * between your home built sensors/actuators and HA controller of choice.
 * The sensors forms a self healing radio network with optional repeaters. Each
@@ -1,4 +1,4 @@
-/**
+/*
 * The MySensors Arduino library handles the wireless radio link and protocol
 * between your home built sensors/actuators and HA controller of choice.
 * The sensors forms a self healing radio network with optional repeaters. Each