Code cleanup (#787)

* Cleanup Core

* SAMD adjustments
This commit is contained in:
Olivier
2017-03-15 19:05:17 +01:00
committed by Henrik Ekblad
parent 481bd367f3
commit 61a415c422
44 changed files with 163 additions and 149 deletions
+20 -14
View File
@@ -6,7 +6,7 @@
* network topology allowing messages to be routed to nodes.
*
* Created by Henrik Ekblad <henrik.ekblad@mysensors.org>
* Copyright (C) 2013-2015 Sensnology AB
* Copyright (C) 2013-2017 Sensnology AB
* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors
*
* Documentation: http://www.mysensors.org
@@ -67,22 +67,29 @@ void hwWriteConfig(int adr, uint8_t value)
(void)eep.update(adr, value);
}
void hwInit()
bool hwInit(void)
{
MY_SERIALDEVICE.begin(MY_BAUD_RATE);
#if defined(MY_GATEWAY_SERIAL)
while (!MY_SERIALDEVICE) {}
#endif
// ext. EEPROM on sensebender GW
eep.begin(MY_EXT_EEPROM_TWI_CLOCK);
const uint8_t eepInit = eep.begin(MY_EXT_EEPROM_TWI_CLOCK);
#if defined(SENSEBENDER_GW_SAMD_V1)
// check connection to external EEPROM - only sensebender GW
return eepInit==0;
#else
(void)eepInit;
return true;
#endif
}
void hwWatchdogReset()
void hwWatchdogReset(void)
{
// TODO: Not supported!
}
void hwReboot()
void hwReboot(void)
{
NVIC_SystemReset();
while (true);
@@ -123,7 +130,6 @@ bool hwUniqueID(unique_id_t *uniqueID)
return true;
}
#if defined(MY_DEBUG) || defined(MY_SPECIAL_DEBUG)
uint16_t hwCPUVoltage()
{
@@ -170,19 +176,22 @@ uint16_t hwCPUFrequency()
uint16_t hwFreeMem()
{
// TODO: Not supported!
return 0;
return FUNCTION_NOT_SUPPORTED;
}
#endif
#ifdef MY_DEBUG
void hwDebugPrint(const char *fmt, ... )
{
if (MY_SERIALDEVICE) {
char fmtBuffer[MY_SERIAL_OUTPUT_SIZE];
#ifdef MY_GATEWAY_FEATURE
// prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE)
snprintf(fmtBuffer, sizeof(fmtBuffer), PSTR("0;255;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE);
snprintf(fmtBuffer, sizeof(fmtBuffer), PSTR("0;255;%d;0;%d;%lu "), C_INTERNAL, I_LOG_MESSAGE,
hwMillis());
MY_SERIALDEVICE.print(fmtBuffer);
#else
// prepend timestamp
MY_SERIALDEVICE.print(hwMillis());
MY_SERIALDEVICE.print(" ");
#endif
va_list args;
va_start (args, fmt );
@@ -197,8 +206,5 @@ void hwDebugPrint(const char *fmt, ... )
va_end (args);
MY_SERIALDEVICE.print(fmtBuffer);
// MY_SERIALDEVICE.flush();
//MY_SERIALDEVICE.write(freeRam());
}
}
#endif