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

Merge pull request #427 from tekka007/fixhwabstraction

Browse Source 
fix hw abstraction defs
This commit is contained in:
Olivier
2016-05-06 21:01:09 +02:00
parent f79abe9428 27025cdc1d
commit 0c8acb0bcf
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/core/MyHw.h
+1 -1
View File
@@ -31,7 +31,7 @@
// Implement these as functions or macros // Implement these as functions or macros
/* /*
#define hwDigitalWrite(__pin, __value) #define hwDigitalWrite(__pin, __value)
#define hwInit() Serial.begin(BAUD_RATE) #define hwInit() MY_SERIALDEVICE.begin(BAUD_RATE)
#define hwWatchdogReset() wdt_reset() #define hwWatchdogReset() wdt_reset()
#define hwReboot() wdt_enable(WDTO_15MS); while (1) #define hwReboot() wdt_enable(WDTO_15MS); while (1)
#define hwMillis() millis() #define hwMillis() millis()
libraries/MySensors/core/MyHwATMega328.cpp
+5 -5
View File
@@ -78,7 +78,7 @@ void hwPowerDown(period_t period) {
void hwInternalSleep(unsigned long ms) { void hwInternalSleep(unsigned long ms) {
// Let serial prints finish (debug, log etc) // Let serial prints finish (debug, log etc)
#ifndef MY_DISABLED_SERIAL #ifndef MY_DISABLED_SERIAL
Serial.flush(); MY_SERIALDEVICE.flush();
#endif #endif
// reset interrupt trigger var // reset interrupt trigger var
pinIntTrigger = 0; pinIntTrigger = 0;
@@ -188,7 +188,7 @@ void hwDebugPrint(const char *fmt, ... ) {
#ifdef MY_GATEWAY_FEATURE #ifdef MY_GATEWAY_FEATURE
// prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE) // prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE)
snprintf_P(fmtBuffer, 299, PSTR("0;255;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE); snprintf_P(fmtBuffer, 299, PSTR("0;255;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE);
Serial.print(fmtBuffer); MY_SERIALDEVICE.print(fmtBuffer);
#endif #endif
va_list args; va_list args;
va_start (args, fmt ); va_start (args, fmt );
@@ -202,10 +202,10 @@ void hwDebugPrint(const char *fmt, ... ) {
vsnprintf_P(fmtBuffer, 299, fmt, args); vsnprintf_P(fmtBuffer, 299, fmt, args);
#endif #endif
va_end (args); va_end (args);
Serial.print(fmtBuffer); MY_SERIALDEVICE.print(fmtBuffer);
Serial.flush(); MY_SERIALDEVICE.flush();
//Serial.write(freeRam()); //MY_SERIALDEVICE.write(freeRam());
} }
#endif #endif
libraries/MySensors/core/MyHwATMega328.h
+1 -1
View File
@@ -57,7 +57,7 @@ do { \
// Define these as macros to save valuable space // Define these as macros to save valuable space
#define hwDigitalWrite(__pin, __value) (digitalWrite(__pin, __value)) #define hwDigitalWrite(__pin, __value) (digitalWrite(__pin, __value))
#define hwInit() Serial.begin(MY_BAUD_RATE) #define hwInit() MY_SERIALDEVICE.begin(MY_BAUD_RATE)
#define hwWatchdogReset() wdt_reset() #define hwWatchdogReset() wdt_reset()
#define hwReboot() wdt_enable(WDTO_15MS); while (1) #define hwReboot() wdt_enable(WDTO_15MS); while (1)
#define hwMillis() millis() #define hwMillis() millis()
libraries/MySensors/core/MyHwESP8266.cpp
+4 -4
View File
@@ -132,7 +132,7 @@ void hwDebugPrint(const char *fmt, ... ) {
#ifdef MY_GATEWAY_FEATURE #ifdef MY_GATEWAY_FEATURE
// prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE) // prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE)
snprintf_P(fmtBuffer, 299, PSTR("0;255;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE); snprintf_P(fmtBuffer, 299, PSTR("0;255;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE);
Serial.print(fmtBuffer); MY_SERIALDEVICE.print(fmtBuffer);
#endif #endif
va_list args; va_list args;
va_start (args, fmt ); va_start (args, fmt );
@@ -146,9 +146,9 @@ void hwDebugPrint(const char *fmt, ... ) {
vsnprintf_P(fmtBuffer, 299, fmt, args); vsnprintf_P(fmtBuffer, 299, fmt, args);
#endif #endif
va_end (args); va_end (args);
Serial.print(fmtBuffer); MY_SERIALDEVICE.print(fmtBuffer);
Serial.flush(); MY_SERIALDEVICE.flush();
//Serial.write(freeRam()); //MY_SERIALDEVICE.write(freeRam());
} }
#endif #endif
libraries/MySensors/core/MyHwESP8266.h
+1 -1
View File
@@ -34,7 +34,7 @@
// Define these as macros to save valuable space // Define these as macros to save valuable space
#define hwDigitalWrite(__pin, __value) (digitalWrite(__pin, __value)) #define hwDigitalWrite(__pin, __value) (digitalWrite(__pin, __value))
#define hwInit() Serial.begin(MY_BAUD_RATE); Serial.setDebugOutput(true) #define hwInit() MY_SERIALDEVICE.begin(MY_BAUD_RATE); MY_SERIALDEVICE.setDebugOutput(true)
#define hwWatchdogReset() wdt_reset() #define hwWatchdogReset() wdt_reset()
#define hwReboot() wdt_enable(WDTO_15MS); while (1) #define hwReboot() wdt_enable(WDTO_15MS); while (1)
#define hwMillis() millis() #define hwMillis() millis()
libraries/MySensors/core/MyHwSAMD.cpp
+1 -1
View File
@@ -162,7 +162,7 @@ void hwDebugPrint(const char *fmt, ... ) {
MY_SERIALDEVICE.print(fmtBuffer); MY_SERIALDEVICE.print(fmtBuffer);
// MY_SERIALDEVICE.flush(); // MY_SERIALDEVICE.flush();
//Serial.write(freeRam()); //MY_SERIALDEVICE.write(freeRam());
} }
} }
#endif #endif