diff --git a/.ci/butler.sh b/.ci/butler.sh index 3fdce171..bdf7db29 100755 --- a/.ci/butler.sh +++ b/.ci/butler.sh @@ -81,7 +81,7 @@ fi astyle --options=.mystools/astyle/config/style.cfg -nq --recursive "*.h" "*.c" "*.cpp" git diff > restyling.patch if [ -s restyling.patch ]; then - echo "I am afraid your coding style is not entirely in line with the MySensors preffered style.
A mail with a patch has been sent to you that, if applied to your PR, will make it follow the MySensors coding standards.
" >> butler.html + echo "I am afraid your coding style is not entirely in line with the MySensors prefered style.
A mail with a patch has been sent to you that, if applied to your PR, will make it follow the MySensors coding standards.
" >> butler.html echo "You can apply the patch using:
" >> butler.html echo "git apply restyling.patch
" >> butler.html echo "
" >> butler.html diff --git a/Documentation/mainpage.dox b/Documentation/mainpage.dox index 7d16379e..9cc8d297 100644 --- a/Documentation/mainpage.dox +++ b/Documentation/mainpage.dox @@ -7,7 +7,7 @@ Are you a core/library developer, see @ref internals @copyright (C) 2013-2018 Sensnology AB -Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors */ /* diff --git a/Documentation/styles/html/footerFile.html b/Documentation/styles/html/footerFile.html index 4a2a680e..6413607a 100644 --- a/Documentation/styles/html/footerFile.html +++ b/Documentation/styles/html/footerFile.html @@ -12,7 +12,7 @@
-Copyright (C) 2013-2017 Sensnology AB. $generatedby doxygen +Copyright (C) 2013-2018 Sensnology AB. $generatedby doxygen $doxygenversion
diff --git a/MyASM.S b/MyASM.S index a87b93d9..0189e0ef 100644 --- a/MyASM.S +++ b/MyASM.S @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/MyConfig.h b/MyConfig.h index 9d11af50..b118efc4 100644 --- a/MyConfig.h +++ b/MyConfig.h @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -16,6 +16,7 @@ * modify it under the terms of the GNU General Public License * version 2 as published by the Free Software Foundation. */ + /** * @file MyConfig.h * @ingroup MyConfigGrp @@ -35,6 +36,7 @@ * @brief These options control serial and debugging features and functionalities in the library. * @{ */ + /** * @def MY_DEBUG * @brief Define MY_DEBUG to show debug prints. @@ -46,6 +48,7 @@ * the flag in your sketch. */ //#define MY_DEBUG + /** * @def MY_DEBUGDEVICE * @brief Define MY_DEBUGDEVICE to redirect debug prints. @@ -61,6 +64,7 @@ * hardware serial device or a software serial device. */ //#define MY_DEBUGDEVICE + /** * @def MY_DEBUG_OTA * @brief Define MY_DEBUG_OTA to redirect debug prints to given node ID @@ -268,9 +272,16 @@ * | Silicon Labs(?) | SI24R1 * @{ */ -// legacy + +// legacy - remove for 3.0.0 +/** +* @def MY_RADIO_NRF24 +* @brief Define this to use a RF24-based radio transport for sensor network communication. +* @deprecated This flag is deprecated and replaced by @ref MY_RADIO_RF24 +*/ #ifdef MY_RADIO_NRF24 -//MY_RADIO_NRF24 is deprecated +#warning MY_RADIO_NRF24 is deprecated, use MY_RADIO_RF24 instead. +#undef MY_RADIO_NRF24 #define MY_RADIO_RF24 #endif @@ -332,7 +343,7 @@ /** * @def MY_RF24_POWER_PIN - * @brief Define this to use the NRF24 power pin (optional). + * @brief Define this to use the RF24 power pin (optional). */ //#define MY_RF24_POWER_PIN (3) @@ -1118,7 +1129,7 @@ * @brief Timeout in ms until transport is ready during startup, set to 0 for no timeout */ #ifndef MY_TRANSPORT_WAIT_READY_MS -#define MY_TRANSPORT_WAIT_READY_MS (0ul) +#define MY_TRANSPORT_WAIT_READY_MS (0) #endif /** @@ -2098,9 +2109,8 @@ #endif // temp. workaround for nRF5 verifier: redirect RF24 to NRF_ESB -#if defined(ARDUINO_ARCH_NRF5) && (defined(MY_RADIO_RF24) || defined(MY_RADIO_NRF24) ) +#if defined(ARDUINO_ARCH_NRF5) && (defined(MY_RADIO_RF24) ) #undef MY_RADIO_RF24 -#undef MY_RADIO_NRF24 #define MY_RADIO_NRF5_ESB #endif @@ -2269,6 +2279,7 @@ * @brief Supplied by your cell carrier / mobile operator. If not required, leave undefined. */ #define MY_GSM_USR + // LED #define MY_DEFAULT_ERR_LED_PIN #define MY_DEFAULT_TX_LED_PIN @@ -2293,6 +2304,7 @@ #define MY_RS485_HWSERIAL // RF24 #define MY_RADIO_RF24 +#define MY_RADIO_NRF24 //deprecated #define MY_DEBUG_VERBOSE_RF24 #define MY_RF24_POWER_PIN #define MY_RF24_IRQ_PIN diff --git a/MySensors.h b/MySensors.h index 734efea2..b1722a01 100644 --- a/MySensors.h +++ b/MySensors.h @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -22,8 +22,6 @@ * @ingroup publics * @{ * @brief The primary public API declaration for the MySensors library - * - * */ /** @@ -41,11 +39,6 @@ #include #endif -// general macros -#if !defined(_BV) -#define _BV(x) (1<<(x)) //!< _BV -#endif - #include "MyConfig.h" #include "core/MySplashScreen.h" #include "core/MySensorsCore.h" @@ -90,6 +83,27 @@ #error Hardware abstraction not defined (unsupported platform) #endif +// commonly used macros, sometimes missing in arch definitions +#if !defined(_BV) +#define _BV(x) (1<<(x)) //!< _BV +#endif + +#if !defined(min) && !defined(__linux__) +#define min(a,b) ((a)<(b)?(a):(b)) //!< min +#endif + +#if !defined(max) && !defined(__linux__) +#define max(a,b) ((a)>(b)?(a):(b)) //!< max +#endif + +#if !defined(MIN) +#define MIN min //!< MIN +#endif + +#if !defined(MAX) +#define MAX max //!< MAX +#endif + // OTA Debug second part, depends on HAL #if defined(MY_OTA_LOG_SENDER_FEATURE) || defined(MY_OTA_LOG_RECEIVER_FEATURE) #include "core/MyOTALogging.cpp" @@ -135,7 +149,6 @@ MY_DEFAULT_RX_LED_PIN in your sketch instead to enable LEDs #endif #endif - // FLASH #if defined(MY_OTA_FIRMWARE_FEATURE) #ifndef MCUBOOT_PRESENT diff --git a/README.md b/README.md index c5647217..5a7726bb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -MySensors Library v2.3.1-alpha +MySensors Library v2.3.1-beta Please visit www.mysensors.org for more information diff --git a/configure b/configure index a0fa4765..65b47573 100755 --- a/configure +++ b/configure @@ -62,14 +62,14 @@ MySensors options: MQTT publish topic prefix. --my-mqtt-subscribe-topic-prefix= MQTT subscribe topic prefix. - --my-transport=[none|nrf24|rs485|rfm95|rfm69] - Set the transport to be used to communicate with other nodes. [nrf24] + --my-transport=[none|rf24|rs485|rfm95|rfm69] + Set the transport to be used to communicate with other nodes. [rf24] --my-rf24-channel=<0-125> RF channel for the sensor net. [76] --my-rf24-pa-level=[RF24_PA_MAX|RF24_PA_LOW] RF24 PA level. [RF24_PA_MAX] --my-rf24-ce-pin= Pin number to use for rf24 Chip-Enable. --my-rf24-cs-pin= Pin number to use for rf24 Chip-Select. - --my-rf24-irq-pin= Pin number connected to nRF24L01 IRQ pin. + --my-rf24-irq-pin= Pin number connected to nRF24L01P IRQ pin. --my-rf24-encryption-enabled Enables RF24 encryption. All nodes and gateway must have this enabled, and all must be @@ -285,7 +285,7 @@ function gcc_cpu_flags { # Default values debug=enable gateway_type=ethernet -transport_type=nrf24 +transport_type=rf24 signing=none signing_request_signatures=false encryption=false @@ -621,8 +621,8 @@ printf " ${OK} Type: ${gateway_type}.\n" if [[ ${transport_type} == "none" ]]; then # Transport disabled : -elif [[ ${transport_type} == "nrf24" ]]; then - CPPFLAGS="-DMY_RADIO_NRF24 $CPPFLAGS" +elif [[ ${transport_type} == "rf24" ]]; then + CPPFLAGS="-DMY_RADIO_RF24 $CPPFLAGS" elif [[ ${transport_type} == "rfm69" ]]; then CPPFLAGS="-DMY_RADIO_RFM69 -DMY_RFM69_NEW_DRIVER $CPPFLAGS" elif [[ ${transport_type} == "rs485" ]]; then diff --git a/core/MyCapabilities.h b/core/MyCapabilities.h index 629ea6b6..3be1c5f4 100644 --- a/core/MyCapabilities.h +++ b/core/MyCapabilities.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyEepromAddresses.h b/core/MyEepromAddresses.h index 7bb39d6f..cdc7fef1 100644 --- a/core/MyEepromAddresses.h +++ b/core/MyEepromAddresses.h @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyGatewayTransport.cpp b/core/MyGatewayTransport.cpp index b37bb6b5..064221b0 100644 --- a/core/MyGatewayTransport.cpp +++ b/core/MyGatewayTransport.cpp @@ -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 @@ -7,7 +7,7 @@ * * Created by Tomas Hozza * Copyright (C) 2015 Tomas Hozza - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyGatewayTransport.h b/core/MyGatewayTransport.h index 9ddee8c9..7fcd9bef 100644 --- a/core/MyGatewayTransport.h +++ b/core/MyGatewayTransport.h @@ -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 @@ -7,7 +7,7 @@ * * Created by Tomas Hozza * Copyright (C) 2015 Tomas Hozza - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyGatewayTransportEthernet.cpp b/core/MyGatewayTransportEthernet.cpp index 6d1f576a..7ba46500 100644 --- a/core/MyGatewayTransportEthernet.cpp +++ b/core/MyGatewayTransportEthernet.cpp @@ -7,7 +7,7 @@ * * Created by Tomas Hozza * Copyright (C) 2015 Tomas Hozza - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyGatewayTransportMQTTClient.cpp b/core/MyGatewayTransportMQTTClient.cpp index 1c96dab9..ad9a9293 100644 --- a/core/MyGatewayTransportMQTTClient.cpp +++ b/core/MyGatewayTransportMQTTClient.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad -* Copyright (C) 2013-2017 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Copyright (C) 2013-2018 Sensnology AB +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyGatewayTransportSerial.cpp b/core/MyGatewayTransportSerial.cpp index a092cfdb..9bab20e0 100644 --- a/core/MyGatewayTransportSerial.cpp +++ b/core/MyGatewayTransportSerial.cpp @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyInclusionMode.cpp b/core/MyInclusionMode.cpp index 0b50621b..94a1f275 100644 --- a/core/MyInclusionMode.cpp +++ b/core/MyInclusionMode.cpp @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyInclusionMode.h b/core/MyInclusionMode.h index d1296d32..8f2ed0e1 100644 --- a/core/MyInclusionMode.h +++ b/core/MyInclusionMode.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyIndication.cpp b/core/MyIndication.cpp index 473da5ec..47f753bb 100644 --- a/core/MyIndication.cpp +++ b/core/MyIndication.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyIndication.h b/core/MyIndication.h index 7c446b08..310d1557 100644 --- a/core/MyIndication.h +++ b/core/MyIndication.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyLeds.cpp b/core/MyLeds.cpp index 322fce38..739c8ea3 100644 --- a/core/MyLeds.cpp +++ b/core/MyLeds.cpp @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyLeds.h b/core/MyLeds.h index b7ea8523..1b318e95 100644 --- a/core/MyLeds.h +++ b/core/MyLeds.h @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyMessage.cpp b/core/MyMessage.cpp index 83827258..b749b182 100644 --- a/core/MyMessage.cpp +++ b/core/MyMessage.cpp @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -23,19 +23,19 @@ #include #include -MyMessage::MyMessage() +MyMessage::MyMessage(void) { clear(); } -MyMessage::MyMessage(uint8_t _sensor, uint8_t _type) +MyMessage::MyMessage(const uint8_t _sensor, const uint8_t _type) { clear(); sensor = _sensor; type = _type; } -void MyMessage::clear() +void MyMessage::clear(void) { last = 0u; sender = 0u; @@ -50,23 +50,23 @@ void MyMessage::clear() miSetVersion(PROTOCOL_VERSION); } -bool MyMessage::isAck() const +bool MyMessage::isAck(void) const { return miGetAck(); } -uint8_t MyMessage::getCommand() const +uint8_t MyMessage::getCommand(void) const { return miGetCommand(); } /* Getters for payload converted to desired form */ -void* MyMessage::getCustom() const +void* MyMessage::getCustom(void) const { return (void *)data; } -const char* MyMessage::getString() const +const char* MyMessage::getString(void) const { uint8_t payloadType = miGetPayloadType(); if (payloadType == P_STRING) { @@ -76,7 +76,7 @@ const char* MyMessage::getString() const } } -char MyMessage::i2h(uint8_t i) const +char MyMessage::i2h(const uint8_t i) const { uint8_t k = i & 0x0F; if (k <= 9) { @@ -111,20 +111,20 @@ char* MyMessage::getString(char *buffer) const uint8_t payloadType = miGetPayloadType(); if (buffer != NULL) { if (payloadType == P_STRING) { - strncpy(buffer, data, miGetLength()); + (void)strncpy(buffer, data, miGetLength()); buffer[miGetLength()] = 0; } else if (payloadType == P_BYTE) { - itoa(bValue, buffer, 10); + (void)itoa(bValue, buffer, 10); } else if (payloadType == P_INT16) { - itoa(iValue, buffer, 10); + (void)itoa(iValue, buffer, 10); } else if (payloadType == P_UINT16) { - utoa(uiValue, buffer, 10); + (void)utoa(uiValue, buffer, 10); } else if (payloadType == P_LONG32) { - ltoa(lValue, buffer, 10); + (void)ltoa(lValue, buffer, 10); } else if (payloadType == P_ULONG32) { - ultoa(ulValue, buffer, 10); + (void)ultoa(ulValue, buffer, 10); } else if (payloadType == P_FLOAT32) { - dtostrf(fValue,2,min(fPrecision, (uint8_t)8),buffer); + (void)dtostrf(fValue, 2, min(fPrecision, (uint8_t)8), buffer); } else if (payloadType == P_CUSTOM) { return getCustomString(buffer); } @@ -134,12 +134,12 @@ char* MyMessage::getString(char *buffer) const } } -bool MyMessage::getBool() const +bool MyMessage::getBool(void) const { return getByte(); } -uint8_t MyMessage::getByte() const +uint8_t MyMessage::getByte(void) const { if (miGetPayloadType() == P_BYTE) { return data[0]; @@ -151,7 +151,7 @@ uint8_t MyMessage::getByte() const } -float MyMessage::getFloat() const +float MyMessage::getFloat(void) const { if (miGetPayloadType() == P_FLOAT32) { return fValue; @@ -162,7 +162,7 @@ float MyMessage::getFloat() const } } -int32_t MyMessage::getLong() const +int32_t MyMessage::getLong(void) const { if (miGetPayloadType() == P_LONG32) { return lValue; @@ -173,7 +173,7 @@ int32_t MyMessage::getLong() const } } -uint32_t MyMessage::getULong() const +uint32_t MyMessage::getULong(void) const { if (miGetPayloadType() == P_ULONG32) { return ulValue; @@ -184,7 +184,7 @@ uint32_t MyMessage::getULong() const } } -int16_t MyMessage::getInt() const +int16_t MyMessage::getInt(void) const { if (miGetPayloadType() == P_INT16) { return iValue; @@ -195,7 +195,7 @@ int16_t MyMessage::getInt() const } } -uint16_t MyMessage::getUInt() const +uint16_t MyMessage::getUInt(void) const { if (miGetPayloadType() == P_UINT16) { return uiValue; @@ -207,26 +207,26 @@ uint16_t MyMessage::getUInt() const } -MyMessage& MyMessage::setType(uint8_t _type) +MyMessage& MyMessage::setType(const uint8_t _type) { type = _type; return *this; } -MyMessage& MyMessage::setSensor(uint8_t _sensor) +MyMessage& MyMessage::setSensor(const uint8_t _sensor) { sensor = _sensor; return *this; } -MyMessage& MyMessage::setDestination(uint8_t _destination) +MyMessage& MyMessage::setDestination(const uint8_t _destination) { destination = _destination; return *this; } // Set payload -MyMessage& MyMessage::set(void* value, uint8_t length) +MyMessage& MyMessage::set(const void* value, const uint8_t length) { uint8_t payloadLength = value == NULL ? 0 : min(length, (uint8_t)MAX_PAYLOAD); miSetLength(payloadLength); @@ -265,7 +265,7 @@ MyMessage& MyMessage::set(const __FlashStringHelper* value) #endif -MyMessage& MyMessage::set(bool value) +MyMessage& MyMessage::set(const bool value) { miSetLength(1); miSetPayloadType(P_BYTE); @@ -273,7 +273,7 @@ MyMessage& MyMessage::set(bool value) return *this; } -MyMessage& MyMessage::set(uint8_t value) +MyMessage& MyMessage::set(const uint8_t value) { miSetLength(1); miSetPayloadType(P_BYTE); @@ -281,7 +281,7 @@ MyMessage& MyMessage::set(uint8_t value) return *this; } -MyMessage& MyMessage::set(float value, uint8_t decimals) +MyMessage& MyMessage::set(const float value, const uint8_t decimals) { miSetLength(5); // 32 bit float + persi miSetPayloadType(P_FLOAT32); @@ -290,7 +290,7 @@ MyMessage& MyMessage::set(float value, uint8_t decimals) return *this; } -MyMessage& MyMessage::set(uint32_t value) +MyMessage& MyMessage::set(const uint32_t value) { miSetPayloadType(P_ULONG32); miSetLength(4); @@ -298,7 +298,7 @@ MyMessage& MyMessage::set(uint32_t value) return *this; } -MyMessage& MyMessage::set(int32_t value) +MyMessage& MyMessage::set(const int32_t value) { miSetPayloadType(P_LONG32); miSetLength(4); @@ -306,7 +306,7 @@ MyMessage& MyMessage::set(int32_t value) return *this; } -MyMessage& MyMessage::set(uint16_t value) +MyMessage& MyMessage::set(const uint16_t value) { miSetPayloadType(P_UINT16); miSetLength(2); @@ -314,7 +314,7 @@ MyMessage& MyMessage::set(uint16_t value) return *this; } -MyMessage& MyMessage::set(int16_t value) +MyMessage& MyMessage::set(const int16_t value) { miSetPayloadType(P_INT16); miSetLength(2); diff --git a/core/MyMessage.h b/core/MyMessage.h index bdd46542..312cbd8e 100644 --- a/core/MyMessage.h +++ b/core/MyMessage.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -43,12 +43,12 @@ /// @brief The command field (message-type) defines the overall properties of a message typedef enum { - C_PRESENTATION = 0, //!< Sent by a node when they present attached sensors. This is usually done in presentation() at startup. - C_SET = 1, //!< This message is sent from or to a sensor when a sensor value should be updated. - C_REQ = 2, //!< Requests a variable value (usually from an actuator destined for controller). - C_INTERNAL = 3, //!< Internal MySensors messages (also include common messages provided/generated by the library). - C_STREAM = 4 //!< For firmware and other larger chunks of data that need to be divided into pieces. -} mysensor_command; + C_PRESENTATION = 0, //!< Sent by a node when they present attached sensors. This is usually done in presentation() at startup. + C_SET = 1, //!< This message is sent from or to a sensor when a sensor value should be updated. + C_REQ = 2, //!< Requests a variable value (usually from an actuator destined for controller). + C_INTERNAL = 3, //!< Internal MySensors messages (also include common messages provided/generated by the library). + C_STREAM = 4 //!< For firmware and other larger chunks of data that need to be divided into pieces. +} mysensors_command_t; #if !DOXYGEN // Hide until we migrate /// @brief Type of sensor (used when presenting sensors) @@ -94,7 +94,7 @@ typedef enum { S_GAS = 37, //!< Gas meter, V_FLOW, V_VOLUME S_GPS = 38, //!< GPS Sensor, V_POSITION S_WATER_QUALITY = 39 //!< V_TEMP, V_PH, V_ORP, V_EC, V_STATUS -} mysensor_sensor; +} mysensors_sensor_t; /// @brief Type of sensor data (for set/req/ack messages) typedef enum { @@ -158,7 +158,7 @@ typedef enum { V_VAR = 54, //!< S_POWER, Reactive power: volt-ampere reactive (var) V_VA = 55, //!< S_POWER, Apparent power: volt-ampere (VA) V_POWER_FACTOR = 56, //!< S_POWER, Ratio of real power to apparent power: floating point value in the range [-1,..,1] -} mysensor_data; +} mysensors_data_t; #endif @@ -198,7 +198,7 @@ typedef enum { I_SIGNAL_REPORT_RESPONSE = 31, //!< Device signal strength response (RSSI) I_PRE_SLEEP_NOTIFICATION = 32, //!< Message sent before node is going to sleep I_POST_SLEEP_NOTIFICATION = 33 //!< Message sent after node woke up (if enabled) -} mysensor_internal; +} mysensors_internal_t; /// @brief Type of data stream (for streamed message) @@ -211,7 +211,7 @@ typedef enum { ST_IMAGE = 5, //!< Image ST_FIRMWARE_CONFIRM = 6, //!< Mark running firmware as valid (MyOTAFirmwareUpdateNVM + mcuboot) ST_FIRMWARE_RESPONSE_RLE = 7, //!< Response FW block with run length encoded data -} mysensor_stream; +} mysensors_stream_t; /// @brief Type of payload typedef enum { @@ -223,7 +223,7 @@ typedef enum { P_ULONG32 = 5, //!< Payload type is UINT32 P_CUSTOM = 6, //!< Payload type is binary P_FLOAT32 = 7 //!< Payload type is float32 -} mysensor_payload; +} mysensors_payload_t; @@ -292,26 +292,26 @@ public: /** * Default constructor */ - MyMessage(); + MyMessage(void); /** * Constructor * @param sensor id of the child sensor for this message * @param type see http://korturl.nu/stupidurl */ - MyMessage(uint8_t sensor, uint8_t type); + MyMessage(const uint8_t sensor, const uint8_t type); /** * Single character hex (0 - 15) conversion * @param i byte (only lower 4 bits will be considered) * @return single char with the hex representation (0 to F) of the parameter */ - char i2h(uint8_t i) const; + char i2h(const uint8_t i) const; /** * @brief Clear message contents. */ - void clear(); + void clear(void); /** * If payload is something else than P_STRING you can have the payload value converted @@ -330,90 +330,92 @@ public: * @brief Get payload as string * @return pointer to a char array storing the string */ - const char* getString() const; + const char* getString(void) const; /** * @brief Get custom payload * @return pointer to the raw payload */ - void* getCustom() const; + void* getCustom(void) const; /** * @brief Get bool payload * @return a bool with the value of the payload (true/false) */ - bool getBool() const; + bool getBool(void) const; /** * @brief Get unsigned 8-bit integer payload * @return the value of the payload, 0 to 255 */ - uint8_t getByte() const; + uint8_t getByte(void) const; /** * @brief Get float payload * @return the floating-point value of the payload */ - float getFloat() const; + float getFloat(void) const; /** * @brief Get signed 16-bit integer payload * @return the value of the payload, –32768 to 32767 */ - int16_t getInt() const; + int16_t getInt(void) const; /** * @brief Get unsigned 16-bit integer payload * @return the value of the payload, 0 to 65535 */ - uint16_t getUInt() const; + uint16_t getUInt(void) const; /** * @brief Get signed 32-bit integer payload * @return the value of the payload, –2147483648 to 2147483647 */ - int32_t getLong() const; + int32_t getLong(void) const; /** * @brief Get unsigned 32-bit integer payload * @return the value of the payload, 0 to 4294967295 */ - uint32_t getULong() const; + uint32_t getULong(void) const; /** * @brief Getter for command type - * @return #mysensor_command + * @return #mysensors_command_t */ - uint8_t getCommand() const; + uint8_t getCommand(void) const; /** * @brief Getter for ack-flag. * @return true if this is an ack message */ - bool isAck() const; + bool isAck(void) const; /** * @brief Set message type * @param type see http://korturl.nu/stupidurl */ - MyMessage& setType(uint8_t type); + MyMessage& setType(const uint8_t type); /** * @brief Set which child sensor this message belongs to + * @param sensor */ - MyMessage& setSensor(uint8_t sensor); + MyMessage& setSensor(const uint8_t sensor); /** * @brief Set final destination node id for this message + * @param destination */ - MyMessage& setDestination(uint8_t destination); + MyMessage& setDestination(const uint8_t destination); /** * @brief Set entire payload * @param payload pointer to the buffer where the payload is stored * @param length of the payload */ - MyMessage& set(void* payload, uint8_t length); + MyMessage& set(const void* payload, const uint8_t length); /** * @brief Set payload to character array @@ -433,43 +435,43 @@ public: * @param value float * @param decimals number of decimals to include */ - MyMessage& set(float value, uint8_t decimals); + MyMessage& set(const float value, const uint8_t decimals); /** * @brief Set payload to bool value * @param value true or false */ - MyMessage& set(bool value); + MyMessage& set(const bool value); /** * @brief Set payload to unsigned 8-bit integer value * @param value (0 to 255) */ - MyMessage& set(uint8_t value); + MyMessage& set(const uint8_t value); /** * @brief Set payload to unsigned 32-bit integer value * @param value (0 to 4294967295) */ - MyMessage& set(uint32_t value); + MyMessage& set(const uint32_t value); /** * @brief Set payload to signed 32-bit integer value * @param value (–2147483648 to 2147483647) */ - MyMessage& set(int32_t value); + MyMessage& set(const int32_t value); /** * @brief Set payload to unsigned 16-bit integer value * @param value (0 to 65535) */ - MyMessage& set(uint16_t value); + MyMessage& set(const uint16_t value); /** * @brief Set payload to signed 16-bit integer value * @param value (–32768 to 32767) */ - MyMessage& set(int16_t value); + MyMessage& set(const int16_t value); #else diff --git a/core/MyOTAFirmwareUpdate.cpp b/core/MyOTAFirmwareUpdate.cpp index 35e3ce7c..25bdbd75 100644 --- a/core/MyOTAFirmwareUpdate.cpp +++ b/core/MyOTAFirmwareUpdate.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyOTAFirmwareUpdate.h b/core/MyOTAFirmwareUpdate.h index 321ffd34..9295766c 100644 --- a/core/MyOTAFirmwareUpdate.h +++ b/core/MyOTAFirmwareUpdate.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyOTALogging.cpp b/core/MyOTALogging.cpp index 693290f8..7e027543 100644 --- a/core/MyOTALogging.cpp +++ b/core/MyOTALogging.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyOTALogging.h b/core/MyOTALogging.h index d2d1035f..16862890 100644 --- a/core/MyOTALogging.h +++ b/core/MyOTALogging.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyPrivateConfig.h.sample b/core/MyPrivateConfig.h.sample index 8311d39f..3d77bd6d 100644 --- a/core/MyPrivateConfig.h.sample +++ b/core/MyPrivateConfig.h.sample @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -44,7 +44,7 @@ //#define MY_SIGNING_NODE_WHITELISTING {{.nodeId = GATEWAY_ADDRESS,.serial = {0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01}}} /********************************** -* NRF24L01 Driver Defaults +* nRF24L01 Driver Defaults ***********************************/ // Enables RF24 encryption (all nodes and gateway must have this enabled) //#define MY_RF24_ENABLE_ENCRYPTION diff --git a/core/MyProtocol.h b/core/MyProtocol.h index e453260d..cf127cb8 100644 --- a/core/MyProtocol.h +++ b/core/MyProtocol.h @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyProtocolMySensors.cpp b/core/MyProtocolMySensors.cpp index def4b971..c874504b 100755 --- a/core/MyProtocolMySensors.cpp +++ b/core/MyProtocolMySensors.cpp @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MySensorsCore.cpp b/core/MySensorsCore.cpp index eb1f1aba..fba4bc21 100644 --- a/core/MySensorsCore.cpp +++ b/core/MySensorsCore.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MySensorsCore.h b/core/MySensorsCore.h index 721cbdea..8a56da07 100644 --- a/core/MySensorsCore.h +++ b/core/MySensorsCore.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -38,7 +38,7 @@ * MySensorsCore debug log messages: * * |E| SYS | SUB | Message | Comment -* |-|-----|-----|---------------------------------------------|---------------------------------------------------------------------------- +* |-|-----|-----|---------------------------------------------|-------------------------------------------------------------------------------------------------- * |!| MCO | BGN | HW ERR | Error HW initialization (e.g. ext. EEPROM) * | | MCO | BGN | INIT %%s,CP=%%s,VER=%%s | Core initialization, capabilities (CP), library version (VER) * | | MCO | BGN | BFR | Callback before() @@ -461,7 +461,6 @@ static inline MyMessage& buildGw(MyMessage &msg, const uint8_t type) return msg; } - #endif /** @}*/ diff --git a/core/MySigning.cpp b/core/MySigning.cpp index f74b3e95..75da2f67 100644 --- a/core/MySigning.cpp +++ b/core/MySigning.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MySigning.h b/core/MySigning.h index 0f64b308..e305b0ec 100644 --- a/core/MySigning.h +++ b/core/MySigning.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MySigningAtsha204.cpp b/core/MySigningAtsha204.cpp index d6ab75ec..73fd36e5 100644 --- a/core/MySigningAtsha204.cpp +++ b/core/MySigningAtsha204.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MySigningAtsha204Soft.cpp b/core/MySigningAtsha204Soft.cpp index 880aa73f..2bc5ea44 100644 --- a/core/MySigningAtsha204Soft.cpp +++ b/core/MySigningAtsha204Soft.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MySplashScreen.cpp b/core/MySplashScreen.cpp index 9c5f7fb2..97771387 100644 --- a/core/MySplashScreen.cpp +++ b/core/MySplashScreen.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad -* Copyright (C) 2013-2017 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Copyright (C) 2013-2018 Sensnology AB +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MySplashScreen.h b/core/MySplashScreen.h index cc29dc3c..4e42e919 100644 --- a/core/MySplashScreen.h +++ b/core/MySplashScreen.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad -* Copyright (C) 2013-2017 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Copyright (C) 2013-2018 Sensnology AB +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/core/MyTransport.cpp b/core/MyTransport.cpp index ed7e114d..9d22bae3 100644 --- a/core/MyTransport.cpp +++ b/core/MyTransport.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -67,7 +67,7 @@ static uint32_t _lastSanityCheck; //!< last sanity check // regular network discovery, sends I_DISCOVER_REQUESTS to update routing table // sufficient to have GW triggering requests to also update repeater nodes #if defined(MY_GATEWAY_FEATURE) -static uint32_t _lastNetworkDiscovery; //! last network discovery +static uint32_t _lastNetworkDiscovery; //!< last network discovery #endif // stInit: initialise transport HW @@ -77,13 +77,13 @@ void stInitTransition(void) // initialise status variables _transportSM.pingActive = false; _transportSM.transportActive = false; - _transportSM.lastUplinkCheck = 0ul; + _transportSM.lastUplinkCheck = 0; #if defined(MY_TRANSPORT_SANITY_CHECK) _lastSanityCheck = hwMillis(); #endif #if defined(MY_GATEWAY_FEATURE) - _lastNetworkDiscovery = 0ul; + _lastNetworkDiscovery = 0; #endif #if defined(MY_RAM_ROUTING_TABLE_ENABLED) _lastRoutingTableSave = hwMillis(); @@ -675,7 +675,7 @@ void transportProcessMessage(void) // Reject payloads with incorrect length if (payloadLength != expectedMessageLength) { setIndication(INDICATION_ERR_LENGTH); - TRANSPORT_DEBUG(PSTR("!TSF:MSG:LEN,%" PRIu8 "!=%" PRIu8 "\n"), payloadLength, + TRANSPORT_DEBUG(PSTR("!TSF:MSG:LEN=%" PRIu8 ",EXP=%" PRIu8 "\n"), payloadLength, expectedMessageLength); // invalid payload length return; } diff --git a/core/MyTransport.h b/core/MyTransport.h index 30af141f..08fd0e42 100644 --- a/core/MyTransport.h +++ b/core/MyTransport.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -105,7 +105,7 @@ * | | TSF | MSG | FWD BC MSG | Controlled broadcast message forwarding * | | TSF | MSG | REL MSG | Relay message * | | TSF | MSG | REL PxNG,HP=%%d | Relay PING/PONG message, increment hop counter (HP) -* |!| TSF | MSG | LEN,%%d!=%%d | Invalid message length, (actual!=expected) +* |!| TSF | MSG | LEN=%%d,EXP=%%d | Invalid message length (LEN), exptected length (EXP) * |!| TSF | MSG | PVER,%%d!=%%d | Message protocol version mismatch (actual!=expected) * |!| TSF | MSG | SIGN VERIFY FAIL | Signing verification failed * |!| TSF | MSG | REL MSG,NORP | Node received a message for relaying, but node is not a repeater, message skipped @@ -209,21 +209,6 @@ #define isValidDistance(_distance) (bool)(_distance!=DISTANCE_INVALID) //!< returns true if distance is valid #define isValidParent(_parent) (bool)(_parent != AUTO) //!< returns true if parent is valid -// RX queue ==> shift to HAL -#if defined(MY_RX_MESSAGE_BUFFER_FEATURE) -#if defined(MY_RADIO_RFM69) -#error Receive message buffering not supported for RFM69! -#endif -#if defined(MY_RS485) -#error Receive message buffering not supported for RS485! -#endif -#if defined(MY_RADIO_NRF5_ESB) -#error Receive message buffering not supported for NRF5 radio! Please define MY_NRF5_RX_BUFFER_SIZE -#endif -#elif !defined(MY_RX_MESSAGE_BUFFER_FEATURE) && defined(MY_RX_MESSAGE_BUFFER_SIZE) -#error Receive message buffering requires message buffering feature enabled! -#endif - /** * @brief Callback type */ @@ -249,10 +234,10 @@ typedef struct { */ typedef struct { void(*Transition)(void); //!< state transition function - void(*Update)(void); //!< state update function + void(*Update)(void); //!< state update function } transportState_t; /** -* @brief +* @brief Datatype for internal RSSI storage */ typedef int16_t transportRSSI_t; //!< Datatype for internal RSSI storage diff --git a/core/Version.h b/core/Version.h index 323ddf89..f279c7ab 100644 --- a/core/Version.h +++ b/core/Version.h @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -49,8 +49,8 @@ #define MYSENSORS_LIBRARY_VERSION_MAJOR 2 //!< Major release version #define MYSENSORS_LIBRARY_VERSION_MINOR 3 //!< Minor release version #define MYSENSORS_LIBRARY_VERSION_PATCH 1 //!< Patch version -#define MYSENSORS_LIBRARY_VERSION_PRERELEASE "alpha" //!< Pre-release suffix, i.e. alpha, beta, rc.1, etc -#define MYSENSORS_LIBRARY_VERSION_PRERELEASE_NUMBER 0x00 //!< incremental counter, starting at 0x00. 0xFF for final release +#define MYSENSORS_LIBRARY_VERSION_PRERELEASE "beta" //!< Pre-release suffix, i.e. alpha, beta, rc.1, etc +#define MYSENSORS_LIBRARY_VERSION_PRERELEASE_NUMBER 0x01 //!< incremental counter, starting at 0x00. 0xFF for final release #if (MYSENSORS_LIBRARY_VERSION_PRERELEASE_NUMBER != 0xFF) diff --git a/drivers/BCM/BCM.cpp b/drivers/BCM/BCM.cpp index cb9acd94..3f09c993 100644 --- a/drivers/BCM/BCM.cpp +++ b/drivers/BCM/BCM.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/BCM/BCM.h b/drivers/BCM/BCM.h index c5919684..c40e17cd 100644 --- a/drivers/BCM/BCM.h +++ b/drivers/BCM/BCM.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/BCM/RPi.cpp b/drivers/BCM/RPi.cpp index 10449e9b..4d47082f 100644 --- a/drivers/BCM/RPi.cpp +++ b/drivers/BCM/RPi.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/BCM/RPi.h b/drivers/BCM/RPi.h index 0a8eea0d..fb84b328 100644 --- a/drivers/BCM/RPi.h +++ b/drivers/BCM/RPi.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/BCM/SPIBCM.cpp b/drivers/BCM/SPIBCM.cpp index cc0180c8..6a29783c 100644 --- a/drivers/BCM/SPIBCM.cpp +++ b/drivers/BCM/SPIBCM.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/BCM/SPIBCM.h b/drivers/BCM/SPIBCM.h index 1d353ada..0d95f23b 100644 --- a/drivers/BCM/SPIBCM.h +++ b/drivers/BCM/SPIBCM.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/Arduino.h b/drivers/Linux/Arduino.h index eb9ee384..8656379c 100644 --- a/drivers/Linux/Arduino.h +++ b/drivers/Linux/Arduino.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/EthernetClient.cpp b/drivers/Linux/EthernetClient.cpp index 446e7177..83128419 100644 --- a/drivers/Linux/EthernetClient.cpp +++ b/drivers/Linux/EthernetClient.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/EthernetClient.h b/drivers/Linux/EthernetClient.h index 710f8ddf..1f65609b 100644 --- a/drivers/Linux/EthernetClient.h +++ b/drivers/Linux/EthernetClient.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/EthernetServer.cpp b/drivers/Linux/EthernetServer.cpp index 58d0b5c0..8a4a1615 100644 --- a/drivers/Linux/EthernetServer.cpp +++ b/drivers/Linux/EthernetServer.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/EthernetServer.h b/drivers/Linux/EthernetServer.h index 8e5c240a..4c98817d 100644 --- a/drivers/Linux/EthernetServer.h +++ b/drivers/Linux/EthernetServer.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/GPIO.cpp b/drivers/Linux/GPIO.cpp index c8e44c7d..84e9f454 100644 --- a/drivers/Linux/GPIO.cpp +++ b/drivers/Linux/GPIO.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/GPIO.h b/drivers/Linux/GPIO.h index 1a962d1a..3fc238ec 100644 --- a/drivers/Linux/GPIO.h +++ b/drivers/Linux/GPIO.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/SPI.h b/drivers/Linux/SPI.h index 8efbcc34..b7d37329 100644 --- a/drivers/Linux/SPI.h +++ b/drivers/Linux/SPI.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/SPIDEV.cpp b/drivers/Linux/SPIDEV.cpp index 5e773036..0c65e24f 100644 --- a/drivers/Linux/SPIDEV.cpp +++ b/drivers/Linux/SPIDEV.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/SPIDEV.h b/drivers/Linux/SPIDEV.h index ba45dea1..adc69a9f 100644 --- a/drivers/Linux/SPIDEV.h +++ b/drivers/Linux/SPIDEV.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/SerialPort.cpp b/drivers/Linux/SerialPort.cpp index 71af9461..0f96eb84 100644 --- a/drivers/Linux/SerialPort.cpp +++ b/drivers/Linux/SerialPort.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/SerialPort.h b/drivers/Linux/SerialPort.h index edd30167..a6e9cef9 100644 --- a/drivers/Linux/SerialPort.h +++ b/drivers/Linux/SerialPort.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/SoftEeprom.cpp b/drivers/Linux/SoftEeprom.cpp index f7980c29..f8e3241e 100644 --- a/drivers/Linux/SoftEeprom.cpp +++ b/drivers/Linux/SoftEeprom.cpp @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/SoftEeprom.h b/drivers/Linux/SoftEeprom.h index 806bb0a7..6630255d 100644 --- a/drivers/Linux/SoftEeprom.h +++ b/drivers/Linux/SoftEeprom.h @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/StdInOutStream.cpp b/drivers/Linux/StdInOutStream.cpp index d9867d15..0a8c7a87 100644 --- a/drivers/Linux/StdInOutStream.cpp +++ b/drivers/Linux/StdInOutStream.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/StdInOutStream.h b/drivers/Linux/StdInOutStream.h index 2f0356ee..f991181c 100644 --- a/drivers/Linux/StdInOutStream.h +++ b/drivers/Linux/StdInOutStream.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/compatibility.cpp b/drivers/Linux/compatibility.cpp index bfd3545c..d15acec2 100644 --- a/drivers/Linux/compatibility.cpp +++ b/drivers/Linux/compatibility.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/config.c b/drivers/Linux/config.c index 79252edf..6e50205c 100644 --- a/drivers/Linux/config.c +++ b/drivers/Linux/config.c @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/config.h b/drivers/Linux/config.h index 988cfbae..027993a2 100644 --- a/drivers/Linux/config.h +++ b/drivers/Linux/config.h @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/interrupt.cpp b/drivers/Linux/interrupt.cpp index e85f2426..395c2175 100644 --- a/drivers/Linux/interrupt.cpp +++ b/drivers/Linux/interrupt.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/interrupt.h b/drivers/Linux/interrupt.h index 4e5c3fd9..13050e4c 100644 --- a/drivers/Linux/interrupt.h +++ b/drivers/Linux/interrupt.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/log.c b/drivers/Linux/log.c index a88bb2df..6834ccad 100644 --- a/drivers/Linux/log.c +++ b/drivers/Linux/log.c @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/Linux/log.h b/drivers/Linux/log.h index 0cecfc42..9498b14c 100644 --- a/drivers/Linux/log.h +++ b/drivers/Linux/log.h @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/NRF5/Radio.h b/drivers/NRF5/Radio.h index 3bd69f10..c91b9fd0 100644 --- a/drivers/NRF5/Radio.h +++ b/drivers/NRF5/Radio.h @@ -1,5 +1,5 @@  -/** +/* * 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 @@ -10,7 +10,7 @@ * Created by Frank Holtz * Copyright (C) 2017 Frank Holtz * Full contributor list: - * https://github.com/mysensors/Arduino/graphs/contributors + * https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/NRF5/Radio_ESB.cpp b/drivers/NRF5/Radio_ESB.cpp index 3b0a929e..f927a815 100644 --- a/drivers/NRF5/Radio_ESB.cpp +++ b/drivers/NRF5/Radio_ESB.cpp @@ -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 formrs a self healing radio network with optional repeaters. Each @@ -9,7 +9,7 @@ * Created by Frank Holtz * Copyright (C) 2017 Frank Holtz * Full contributor list: - * https://github.com/mysensors/Arduino/graphs/contributors + * https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -142,7 +142,7 @@ static bool NRF5_ESB_initialize() // Enable listening on Node and BC address NRF_RADIO->RXADDRESSES = (1 << NRF5_ESB_NODE_ADDR) | (1 << NRF5_ESB_BC_ADDR); - // Packet configuration for NRF24 compatibility + // Packet configuration for nRF24 compatibility NRF_RADIO->PCNF0 = (6 << RADIO_PCNF0_LFLEN_Pos) | // 6 Bits length field (0 << RADIO_PCNF0_S0LEN_Pos) | // No S0 #ifdef RADIO_PCNF0_S1INCL_Pos @@ -159,7 +159,7 @@ static bool NRF5_ESB_initialize() (RADIO_PCNF1_WHITEEN_Disabled << RADIO_PCNF1_WHITEEN_Pos); // Disable whitening // HINT: Fast ramp up can enabled here. Needs more code on other lines - // Fast ramp up isn't supported by NRF24 and NRF51 series. + // Fast ramp up isn't supported by nRF24 and NRF51 series. // Set bitcounter to trigger interrupt after ACK bit NRF_RADIO->BCC = NRF5_ESB_BITCOUNTER; @@ -571,7 +571,7 @@ extern "C" { // In RX mode -> prepare ACK or RX if (NRF_RADIO->STATE == RADIO_STATE_STATE_Rx) { - // Send ACK only for node address, don't care about the ACK bit to handle bad NRF24 clones + // Send ACK only for node address, don't care about the ACK bit to handle bad nRF24 clones if (NRF_RADIO->RXMATCH == NRF5_ESB_NODE_ADDR) { // Send ACK after END, an empty packet is provided in READY event NRF_RADIO->SHORTS = NRF5_ESB_SHORTS_RX_TX; diff --git a/drivers/NRF5/Radio_ESB.h b/drivers/NRF5/Radio_ESB.h index 6e716d40..8380eb2c 100644 --- a/drivers/NRF5/Radio_ESB.h +++ b/drivers/NRF5/Radio_ESB.h @@ -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 @@ -9,7 +9,7 @@ * Created by Frank Holtz * Copyright (C) 2017 Frank Holtz * Full contributor list: - * https://github.com/mysensors/Arduino/graphs/contributors + * https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -38,7 +38,7 @@ /** Wait for start of an ACK packet in us * Calculation: ramp up time + packet header (57 Bit): round to 9 Byte * If you don't receive ACK packages, you have to increase this value. - * My measured (Aurduino Uno+NRF24L01P) minimal timeouts: + * My measured (Arduino Uno + nRF24L01P) minimal timeouts: * 250kbit 411us -> 182 us to ACK start * 1MBit 205us -> 147 us * 2MBit 173us -> 143 us diff --git a/drivers/RF24/RF24.cpp b/drivers/RF24/RF24.cpp index 29d04f9c..b87168a4 100644 --- a/drivers/RF24/RF24.cpp +++ b/drivers/RF24/RF24.cpp @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/RF24/RF24.h b/drivers/RF24/RF24.h index 56f6ce57..763a6ff7 100644 --- a/drivers/RF24/RF24.h +++ b/drivers/RF24/RF24.h @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -19,7 +19,7 @@ * Based on maniacbug's RF24 library, copyright (C) 2011 J. Coliz * RF24 driver refactored and optimized for speed and size, copyright (C) 2017 Olivier Mauti * -* Definitions for Nordic NRF24L01+ radios: +* Definitions for Nordic nRF24L01+ radios: * https://www.nordicsemi.com/eng/Products/2.4GHz-RF/nRF24L01P * */ diff --git a/drivers/RF24/RF24registers.h b/drivers/RF24/RF24registers.h index 83b2298c..fa13235c 100644 --- a/drivers/RF24/RF24registers.h +++ b/drivers/RF24/RF24registers.h @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/RFM69/new/RFM69_new.cpp b/drivers/RFM69/new/RFM69_new.cpp index c1a065a1..26641b7f 100644 --- a/drivers/RFM69/new/RFM69_new.cpp +++ b/drivers/RFM69/new/RFM69_new.cpp @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/RFM69/new/RFM69_new.h b/drivers/RFM69/new/RFM69_new.h index 45974228..fee55b82 100644 --- a/drivers/RFM69/new/RFM69_new.h +++ b/drivers/RFM69/new/RFM69_new.h @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -176,7 +176,7 @@ extern HardwareSPI SPI; //!< SPI // available frequency bands, non trivial values to avoid misconfiguration #define RFM69_315MHZ (315000000ul) //!< RFM69_315MHZ -#define RFM69_433MHZ (433920000ul) //!< RFM69_433MHZ, center frequencz 433.92 MHz +#define RFM69_433MHZ (433920000ul) //!< RFM69_433MHZ, center frequency 433.92 MHz #define RFM69_865MHZ (865500000ul) //!< RFM69_865MHZ, center frequency 865.5 MHz #define RFM69_868MHZ (868000000ul) //!< RFM69_868MHZ #define RFM69_915MHZ (915000000ul) //!< RFM69_915MHZ diff --git a/drivers/RFM69/new/RFM69registers_new.h b/drivers/RFM69/new/RFM69registers_new.h index 2c2dade7..bd1a349f 100644 --- a/drivers/RFM69/new/RFM69registers_new.h +++ b/drivers/RFM69/new/RFM69registers_new.h @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/RFM95/RFM95.cpp b/drivers/RFM95/RFM95.cpp index a8e7deee..de3d325b 100644 --- a/drivers/RFM95/RFM95.cpp +++ b/drivers/RFM95/RFM95.cpp @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/RFM95/RFM95.h b/drivers/RFM95/RFM95.h index 4db4a5a5..fb9164ae 100644 --- a/drivers/RFM95/RFM95.h +++ b/drivers/RFM95/RFM95.h @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/drivers/RFM95/RFM95registers.h b/drivers/RFM95/RFM95registers.h index 33d25628..dafd7e53 100644 --- a/drivers/RFM95/RFM95registers.h +++ b/drivers/RFM95/RFM95registers.h @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/examples/AirQualitySensor/AirQualitySensor.ino b/examples/AirQualitySensor/AirQualitySensor.ino index ca3a59d9..3fa4bf5c 100644 --- a/examples/AirQualitySensor/AirQualitySensor.ino +++ b/examples/AirQualitySensor/AirQualitySensor.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -38,7 +38,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/BatteryPoweredSensor/BatteryPoweredSensor.ino b/examples/BatteryPoweredSensor/BatteryPoweredSensor.ino index 1b582699..7c5b6d31 100644 --- a/examples/BatteryPoweredSensor/BatteryPoweredSensor.ino +++ b/examples/BatteryPoweredSensor/BatteryPoweredSensor.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -32,7 +32,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/BinarySwitchSleepSensor/BinarySwitchSleepSensor.ino b/examples/BinarySwitchSleepSensor/BinarySwitchSleepSensor.ino index c02262a8..73f54517 100644 --- a/examples/BinarySwitchSleepSensor/BinarySwitchSleepSensor.ino +++ b/examples/BinarySwitchSleepSensor/BinarySwitchSleepSensor.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -34,7 +34,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/CO2Sensor/CO2Sensor.ino b/examples/CO2Sensor/CO2Sensor.ino index f19940a3..5f088fa2 100644 --- a/examples/CO2Sensor/CO2Sensor.ino +++ b/examples/CO2Sensor/CO2Sensor.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -42,7 +42,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/ClearEepromConfig/ClearEepromConfig.ino b/examples/ClearEepromConfig/ClearEepromConfig.ino index e6131363..30299116 100644 --- a/examples/ClearEepromConfig/ClearEepromConfig.ino +++ b/examples/ClearEepromConfig/ClearEepromConfig.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/examples/DimmableLEDActuator/DimmableLEDActuator.ino b/examples/DimmableLEDActuator/DimmableLEDActuator.ino index 167be9da..411cc3b9 100644 --- a/examples/DimmableLEDActuator/DimmableLEDActuator.ino +++ b/examples/DimmableLEDActuator/DimmableLEDActuator.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -39,7 +39,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/DimmableLight/DimmableLight.ino b/examples/DimmableLight/DimmableLight.ino index c67b6a9b..8fde150e 100644 --- a/examples/DimmableLight/DimmableLight.ino +++ b/examples/DimmableLight/DimmableLight.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -33,7 +33,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/DustSensor/DustSensor.ino b/examples/DustSensor/DustSensor.ino index eb250ac4..9452768e 100644 --- a/examples/DustSensor/DustSensor.ino +++ b/examples/DustSensor/DustSensor.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -42,7 +42,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/DustSensorDSM/DustSensorDSM.ino b/examples/DustSensorDSM/DustSensorDSM.ino index 418c7ae2..33734657 100644 --- a/examples/DustSensorDSM/DustSensorDSM.ino +++ b/examples/DustSensorDSM/DustSensorDSM.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -34,7 +34,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/EnergyMeterPulseSensor/EnergyMeterPulseSensor.ino b/examples/EnergyMeterPulseSensor/EnergyMeterPulseSensor.ino index 94862608..d2a08cfe 100644 --- a/examples/EnergyMeterPulseSensor/EnergyMeterPulseSensor.ino +++ b/examples/EnergyMeterPulseSensor/EnergyMeterPulseSensor.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -38,7 +38,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/GatewayESP32/GatewayESP32.ino b/examples/GatewayESP32/GatewayESP32.ino index c2d1f995..dfc4f00b 100644 --- a/examples/GatewayESP32/GatewayESP32.ino +++ b/examples/GatewayESP32/GatewayESP32.ino @@ -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 @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/examples/GatewayESP32MQTTClient/GatewayESP32MQTTClient.ino b/examples/GatewayESP32MQTTClient/GatewayESP32MQTTClient.ino index 9783ddd2..a448e1ab 100644 --- a/examples/GatewayESP32MQTTClient/GatewayESP32MQTTClient.ino +++ b/examples/GatewayESP32MQTTClient/GatewayESP32MQTTClient.ino @@ -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 @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/examples/GatewayESP8266/GatewayESP8266.ino b/examples/GatewayESP8266/GatewayESP8266.ino index 32bbf332..30c20086 100644 --- a/examples/GatewayESP8266/GatewayESP8266.ino +++ b/examples/GatewayESP8266/GatewayESP8266.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -58,7 +58,7 @@ #define MY_BAUD_RATE 9600 // Enables and select radio type (if attached) -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino b/examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino index f517cb5a..a036c210 100644 --- a/examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino +++ b/examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -51,7 +51,7 @@ #define MY_BAUD_RATE 9600 // Enables and select radio type (if attached) -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/GatewayESP8266OTA/GatewayESP8266OTA.ino b/examples/GatewayESP8266OTA/GatewayESP8266OTA.ino index f83fe52e..5d46594d 100644 --- a/examples/GatewayESP8266OTA/GatewayESP8266OTA.ino +++ b/examples/GatewayESP8266OTA/GatewayESP8266OTA.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -59,7 +59,7 @@ #define MY_BAUD_RATE 9600 // Enables and select radio type (if attached) -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/GatewayGSMMQTTClient/GatewayGSMMQTTClient.ino b/examples/GatewayGSMMQTTClient/GatewayGSMMQTTClient.ino index c9b57284..5bfd2cc2 100644 --- a/examples/GatewayGSMMQTTClient/GatewayGSMMQTTClient.ino +++ b/examples/GatewayGSMMQTTClient/GatewayGSMMQTTClient.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -37,7 +37,7 @@ #define MY_DEBUG // Enables and select radio type (if attached) -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 @@ -122,16 +122,16 @@ void setup() { - // Setup locally attached sensors + // Setup locally attached sensors } void presentation() { - // Present locally attached sensors here + // Present locally attached sensors here } void loop() { - // Send locally attached sensors data here + // Send locally attached sensors data here } diff --git a/examples/GatewaySerial/GatewaySerial.ino b/examples/GatewaySerial/GatewaySerial.ino index 3913bc2b..c2c8bb43 100644 --- a/examples/GatewaySerial/GatewaySerial.ino +++ b/examples/GatewaySerial/GatewaySerial.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad -* Copyright (C) 2013-2015 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Copyright (C) 2013-2018 Sensnology AB +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -41,7 +41,7 @@ // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/GatewaySerialRS485/GatewaySerialRS485.ino b/examples/GatewaySerialRS485/GatewaySerialRS485.ino index 36750ebb..381fe2ab 100644 --- a/examples/GatewaySerialRS485/GatewaySerialRS485.ino +++ b/examples/GatewaySerialRS485/GatewaySerialRS485.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad -* Copyright (C) 2013-2015 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Copyright (C) 2013-2018 Sensnology AB +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/examples/GatewayW5100/GatewayW5100.ino b/examples/GatewayW5100/GatewayW5100.ino index 6d7a488c..ded710db 100644 --- a/examples/GatewayW5100/GatewayW5100.ino +++ b/examples/GatewayW5100/GatewayW5100.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -45,7 +45,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/GatewayW5100MQTTClient/GatewayW5100MQTTClient.ino b/examples/GatewayW5100MQTTClient/GatewayW5100MQTTClient.ino index 3f1cad08..8a179bcf 100644 --- a/examples/GatewayW5100MQTTClient/GatewayW5100MQTTClient.ino +++ b/examples/GatewayW5100MQTTClient/GatewayW5100MQTTClient.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -62,7 +62,7 @@ #define MY_DEBUG // Enables and select radio type (if attached) -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/LightSensor/LightSensor.ino b/examples/LightSensor/LightSensor.ino index 3716ffd3..377a79c8 100644 --- a/examples/LightSensor/LightSensor.ino +++ b/examples/LightSensor/LightSensor.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -30,7 +30,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/LogOTAGateway/LogOTAGateway.ino b/examples/LogOTAGateway/LogOTAGateway.ino index c1e62d75..c8f51f5d 100644 --- a/examples/LogOTAGateway/LogOTAGateway.ino +++ b/examples/LogOTAGateway/LogOTAGateway.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad -* Copyright (C) 2013-2015 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Copyright (C) 2013-2018 Sensnology AB +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -47,7 +47,7 @@ #define MY_OTA_LOG_RECEIVER_FEATURE // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/LogOTANode/LogOTANode.ino b/examples/LogOTANode/LogOTANode.ino index aaf1384d..96a3209b 100644 --- a/examples/LogOTANode/LogOTANode.ino +++ b/examples/LogOTANode/LogOTANode.ino @@ -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 @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -37,7 +37,7 @@ //#define MY_DEBUG_OTA_DISABLE_ACK // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/MockMySensors/MockMySensors.ino b/examples/MockMySensors/MockMySensors.ino index 1eeeafa9..3498cd2c 100644 --- a/examples/MockMySensors/MockMySensors.ino +++ b/examples/MockMySensors/MockMySensors.ino @@ -1,16 +1,36 @@ /* -* MockMySensors -* -* This skecth is intended to crate fake sensors which register and respond to the controller -* *** -* Barduino 2015, GizMoCuz 2015 -*/ + * 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 + * repeater and gateway builds a routing tables in EEPROM which keeps track of the + * network topology allowing messages to be routed to nodes. + * + * Created by Henrik Ekblad + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors + * + * Documentation: http://www.mysensors.org + * Support Forum: http://forum.mysensors.org + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + ******************************* + * + * REVISION HISTORY + * Version 1.0 - Barduino 2015, GizMoCuz 2015 + * + * DESCRIPTION + * This sketch is intended to create fake sensors which register and respond to the controller + * + */ // Enable debug prints to serial monitor #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/MotionSensor/MotionSensor.ino b/examples/MotionSensor/MotionSensor.ino index bc1133a1..b4ee0a05 100644 --- a/examples/MotionSensor/MotionSensor.ino +++ b/examples/MotionSensor/MotionSensor.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -31,7 +31,7 @@ // #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/MotionSensorRS485/MotionSensorRS485.ino b/examples/MotionSensorRS485/MotionSensorRS485.ino index a1713fa5..4e9790d6 100644 --- a/examples/MotionSensorRS485/MotionSensorRS485.ino +++ b/examples/MotionSensorRS485/MotionSensorRS485.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/examples/Node2Node/Node2Node.ino b/examples/Node2Node/Node2Node.ino index 0033e615..17381648 100644 --- a/examples/Node2Node/Node2Node.ino +++ b/examples/Node2Node/Node2Node.ino @@ -1,23 +1,31 @@ /* - 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 - repeater and gateway builds a routing tables in EEPROM which keeps track of the - network topology allowing messages to be routed to nodes. - - Created by Henrik Ekblad - Copyright (C) 2013-2018 Sensnology AB - Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors - - Documentation: http://www.mysensors.org - Support Forum: http://forum.mysensors.org - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - version 2 as published by the Free Software Foundation. - -*/ - + * 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 + * repeater and gateway builds a routing tables in EEPROM which keeps track of the + * network topology allowing messages to be routed to nodes. + * + * Created by Henrik Ekblad + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors + * + * Documentation: http://www.mysensors.org + * Support Forum: http://forum.mysensors.org + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + ******************************* + * + * REVISION HISTORY + * Version 1.0 - tekka 2018 + * + * DESCRIPTION + * Node to node communication example, destination node id = ACTUATOR_ID + * Use SIGNING_ENABLED to enable soft/hard signing + * + */ #define MY_DEBUG #define MY_RADIO_RF24 #define CHILD_SENSOR_ID 0 diff --git a/examples/PHSensor/PHSensor.ino b/examples/PHSensor/PHSensor.ino index 1a9cb30b..21b02d1f 100644 --- a/examples/PHSensor/PHSensor.ino +++ b/examples/PHSensor/PHSensor.ino @@ -1,32 +1,35 @@ -/** - 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 - repeater and gateway builds a routing tables in EEPROM which keeps track of the - network topology allowing messages to be routed to nodes. - - Created by mboyer85 - Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors - - Documentation: http://www.mysensors.org - Support Forum: http://forum.mysensors.org - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - version 2 as published by the Free Software Foundation. - +/* + * 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 + * repeater and gateway builds a routing tables in EEPROM which keeps track of the + * network topology allowing messages to be routed to nodes. + * + * Created by Henrik Ekblad + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors + * + * Documentation: http://www.mysensors.org + * Support Forum: http://forum.mysensors.org + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * ******************************* - - DESCRIPTION - - Example sketch showing how to send PH readings back to the controller -*/ + * + * REVISION HISTORY + * Version 1.0 - mboyer85 + * + * DESCRIPTION + * Example sketch showing how to send PH readings back to the controller + */ // Enable debug prints to serial monitor //#define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/PassiveNode/PassiveNode.ino b/examples/PassiveNode/PassiveNode.ino index 7ff1ca76..8910902c 100644 --- a/examples/PassiveNode/PassiveNode.ino +++ b/examples/PassiveNode/PassiveNode.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -36,7 +36,7 @@ #define MY_NODE_ID 100 // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/PingPongSensor/MYSLog.h b/examples/PingPongSensor/MYSLog.h index dbf7e8fe..e90f3e55 100644 --- a/examples/PingPongSensor/MYSLog.h +++ b/examples/PingPongSensor/MYSLog.h @@ -1,4 +1,23 @@ -/**** +/* + * 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 + * repeater and gateway builds a routing tables in EEPROM which keeps track of the + * network topology allowing messages to be routed to nodes. + * + * Created by Henrik Ekblad + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors + * + * Documentation: http://www.mysensors.org + * Support Forum: http://forum.mysensors.org + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + ******************************* + * * Formatted logging to the Serial console. * Compiled in by setting LOGDEBUG * diff --git a/examples/PingPongSensor/PingPongSensor.ino b/examples/PingPongSensor/PingPongSensor.ino index 0fd8461d..d29f755a 100644 --- a/examples/PingPongSensor/PingPongSensor.ino +++ b/examples/PingPongSensor/PingPongSensor.ino @@ -1,4 +1,23 @@ -/*** +/* + * 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 + * repeater and gateway builds a routing tables in EEPROM which keeps track of the + * network topology allowing messages to be routed to nodes. + * + * Created by Henrik Ekblad + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors + * + * Documentation: http://www.mysensors.org + * Support Forum: http://forum.mysensors.org + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + ******************************* + * * This is a simple sketch used to demonstrate and test node-to-node MySensors communication. * To use this sketch, assemble MySensors nodes - they need nothing more than a radio * 1. Flash each node with the same sketch, open the console and type either 0 or 1 to the respective nodes to set their ID @@ -12,7 +31,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 @@ -70,7 +89,7 @@ void loop() void receive(const MyMessage &message) { - LOG(F("Received %s from %s\n"), msgTypeAsCharRepresentation((mysensor_data)message.type), + LOG(F("Received %s from %s\n"), msgTypeAsCharRepresentation((mysensors_data_t)message.type), nodeTypeAsCharRepresentation(message.sender)); delay(250); @@ -82,7 +101,7 @@ void sendPingOrPongResponse( MyMessage msg ) MyMessage response = (msg.type == V_VAR1 ? mPong : mPing); - LOG(F("Sending %s to %s\n"), msgTypeAsCharRepresentation( (mysensor_data)response.type ), + LOG(F("Sending %s to %s\n"), msgTypeAsCharRepresentation( (mysensors_data_t)response.type ), nodeTypeAsCharRepresentation(msg.sender)); // Set payload to current time in millis to ensure each message is unique @@ -97,7 +116,7 @@ void setNodeId(byte nodeID) hwWriteConfig(EEPROM_NODE_ID_ADDRESS, (byte)nodeID); } -const char * msgTypeAsCharRepresentation( mysensor_data mType ) +const char * msgTypeAsCharRepresentation( mysensors_data_t mType ) { return mType == V_VAR1 ? "Ping" : "Pong"; } @@ -105,4 +124,4 @@ const char * msgTypeAsCharRepresentation( mysensor_data mType ) const char * nodeTypeAsCharRepresentation( uint8_t node ) { return node == YING ? "Ying Node" : "Yang Node"; -} +} \ No newline at end of file diff --git a/examples/RFM69_RFM95_ATC_SignalReport/RFM69_RFM95_ATC_SignalReport.ino b/examples/RFM69_RFM95_ATC_SignalReport/RFM69_RFM95_ATC_SignalReport.ino index 852f3031..08ffd5e3 100644 --- a/examples/RFM69_RFM95_ATC_SignalReport/RFM69_RFM95_ATC_SignalReport.ino +++ b/examples/RFM69_RFM95_ATC_SignalReport/RFM69_RFM95_ATC_SignalReport.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/examples/RelayActuator/RelayActuator.ino b/examples/RelayActuator/RelayActuator.ino index 3e17066e..ad57b82b 100644 --- a/examples/RelayActuator/RelayActuator.ino +++ b/examples/RelayActuator/RelayActuator.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -31,7 +31,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/RepeaterNode/RepeaterNode.ino b/examples/RepeaterNode/RepeaterNode.ino index 768b5553..2829c8c5 100644 --- a/examples/RepeaterNode/RepeaterNode.ino +++ b/examples/RepeaterNode/RepeaterNode.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -32,7 +32,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/SecretKnockSensor/SecretKnockSensor.ino b/examples/SecretKnockSensor/SecretKnockSensor.ino index d626b7f6..ffe641e6 100644 --- a/examples/SecretKnockSensor/SecretKnockSensor.ino +++ b/examples/SecretKnockSensor/SecretKnockSensor.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -55,7 +55,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/SecureActuator/SecureActuator.ino b/examples/SecureActuator/SecureActuator.ino index 38b80faa..a8932f8f 100644 --- a/examples/SecureActuator/SecureActuator.ino +++ b/examples/SecureActuator/SecureActuator.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -46,8 +46,8 @@ #define MY_NODE_LOCK_FEATURE //!< Enable lockdown of node if suspicious activity is detected // Enable and select radio type attached -#define MY_RADIO_NRF24 //!< NRF24L01 radio driver -//#define MY_RADIO_NRF5_ESB //!< nRF5 radio driver (NRF24 compatible) +#define MY_RADIO_RF24 //!< nRF24L01 radio driver +//#define MY_RADIO_NRF5_ESB //!< nRF5 radio driver (RF24 compatible) //#define MY_RADIO_RFM69 //!< RFM69 radio driver //#define MY_RADIO_RFM95 //!< RFM95 radio driver diff --git a/examples/SecurityPersonalizer/SecurityPersonalizer.ino b/examples/SecurityPersonalizer/SecurityPersonalizer.ino index 7ee2e661..e456ef28 100644 --- a/examples/SecurityPersonalizer/SecurityPersonalizer.ino +++ b/examples/SecurityPersonalizer/SecurityPersonalizer.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -16,7 +16,6 @@ * modify it under the terms of the GNU General Public License * version 2 as published by the Free Software Foundation. * - ******************************* */ /** * @ingroup MySigninggrp diff --git a/examples/SensebenderGatewaySerial/SensebenderGatewaySerial.ino b/examples/SensebenderGatewaySerial/SensebenderGatewaySerial.ino index 1c682ac8..e5bed8dd 100644 --- a/examples/SensebenderGatewaySerial/SensebenderGatewaySerial.ino +++ b/examples/SensebenderGatewaySerial/SensebenderGatewaySerial.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad -* Copyright (C) 2013-2015 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Copyright (C) 2013-2018 Sensnology AB +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -41,7 +41,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/SoilMoistSensor/SoilMoistSensor.ino b/examples/SoilMoistSensor/SoilMoistSensor.ino index 719d8ced..a0f40399 100644 --- a/examples/SoilMoistSensor/SoilMoistSensor.ino +++ b/examples/SoilMoistSensor/SoilMoistSensor.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -64,7 +64,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/UVSensor/UVSensor.ino b/examples/UVSensor/UVSensor.ino index c0246218..9720c741 100644 --- a/examples/UVSensor/UVSensor.ino +++ b/examples/UVSensor/UVSensor.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -40,7 +40,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/VibrationSensor/VibrationSensor.ino b/examples/VibrationSensor/VibrationSensor.ino index d28c6d51..b0d20c20 100644 --- a/examples/VibrationSensor/VibrationSensor.ino +++ b/examples/VibrationSensor/VibrationSensor.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -30,13 +30,13 @@ * * Based on: http://www.dfrobot.com/wiki/index.php/DFRobot_Digital_Vibration_Sensor_V2_SKU:DFR0027 * Contributor: epierre -**/ + */ // Enable debug prints to serial monitor #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino b/examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino index 1afd45a3..6a18eefb 100644 --- a/examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino +++ b/examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -38,7 +38,7 @@ #define MY_DEBUG // Enable and select radio type attached -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_RADIO_NRF5_ESB //#define MY_RADIO_RFM69 //#define MY_RADIO_RFM95 diff --git a/examples_linux/mysgw.cpp b/examples_linux/mysgw.cpp index 22771a8b..cd59dcbc 100644 --- a/examples_linux/mysgw.cpp +++ b/examples_linux/mysgw.cpp @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/architecture/AVR/MyHwAVR.cpp b/hal/architecture/AVR/MyHwAVR.cpp index de3ff86d..880691cc 100644 --- a/hal/architecture/AVR/MyHwAVR.cpp +++ b/hal/architecture/AVR/MyHwAVR.cpp @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/architecture/AVR/MyHwAVR.h b/hal/architecture/AVR/MyHwAVR.h index c0329fdf..f9c77c38 100644 --- a/hal/architecture/AVR/MyHwAVR.h +++ b/hal/architecture/AVR/MyHwAVR.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -39,9 +39,6 @@ #define MY_SERIALDEVICE Serial #endif -#define MIN(a,b) min(a,b) -#define MAX(a,b) max(a,b) - // Define these as macros to save valuable space #define hwDigitalWrite(__pin, __value) digitalWriteFast(__pin, __value) #define hwDigitalRead(__pin) digitalReadFast(__pin) @@ -52,10 +49,10 @@ bool hwInit(void); #define hwWatchdogReset() wdt_reset() #define hwReboot() wdt_enable(WDTO_15MS); while (1) #define hwMillis() millis() -#define hwReadConfig(__pos) eeprom_read_byte((uint8_t*)(__pos)) -#define hwWriteConfig(__pos, __val) eeprom_update_byte((uint8_t*)(__pos), (__val)) -#define hwReadConfigBlock(__buf, __pos, __length) eeprom_read_block((void*)(__buf), (void*)(__pos), (__length)) -#define hwWriteConfigBlock(__buf, __pos, __length) eeprom_update_block((void*)(__buf), (void*)(__pos), (__length)) +#define hwReadConfig(__pos) eeprom_read_byte((const uint8_t *)__pos) +#define hwWriteConfig(__pos, __val) eeprom_update_byte((uint8_t *)__pos, (uint8_t)__val) +#define hwReadConfigBlock(__buf, __pos, __length) eeprom_read_block((void *)__buf, (const void *)__pos, (uint32_t)__length) +#define hwWriteConfigBlock(__buf, __pos, __length) eeprom_update_block((const void *)__buf, (void *)__pos, (uint32_t)__length) inline void hwRandomNumberInit(void); void hwInternalSleep(uint32_t ms); diff --git a/hal/architecture/AVR/MyMainAVR.cpp b/hal/architecture/AVR/MyMainAVR.cpp index 8c67595f..d2792d1a 100644 --- a/hal/architecture/AVR/MyMainAVR.cpp +++ b/hal/architecture/AVR/MyMainAVR.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/architecture/ESP32/MyHwESP32.cpp b/hal/architecture/ESP32/MyHwESP32.cpp index 25578fc3..94d89d98 100644 --- a/hal/architecture/ESP32/MyHwESP32.cpp +++ b/hal/architecture/ESP32/MyHwESP32.cpp @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -154,13 +154,12 @@ void hwDebugPrint(const char *fmt, ...) #endif va_list args; va_start(args, fmt); + // cppcheck-suppress wrongPrintfScanfArgNum + vsnprintf_P(fmtBuffer, sizeof(fmtBuffer), fmt, args); #ifdef MY_GATEWAY_SERIAL // Truncate message if this is gateway node - vsnprintf_P(fmtBuffer, sizeof(fmtBuffer), fmt, args); fmtBuffer[sizeof(fmtBuffer) - 2] = '\n'; fmtBuffer[sizeof(fmtBuffer) - 1] = '\0'; -#else - vsnprintf_P(fmtBuffer, sizeof(fmtBuffer), fmt, args); #endif va_end(args); MY_SERIALDEVICE.print(fmtBuffer); diff --git a/hal/architecture/ESP32/MyHwESP32.h b/hal/architecture/ESP32/MyHwESP32.h index 346ec6ed..d7929fbe 100644 --- a/hal/architecture/ESP32/MyHwESP32.h +++ b/hal/architecture/ESP32/MyHwESP32.h @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -49,12 +49,6 @@ #define MY_SERIALDEVICE Serial -#define min(a,b) ((a)<(b)?(a):(b)) -#define max(a,b) ((a)>(b)?(a):(b)) - -#define MIN min -#define MAX max - #define MY_EEPROM_SIZE 1024 #define hwDigitalWrite(__pin, __value) digitalWrite(__pin, __value) diff --git a/hal/architecture/ESP32/MyMainESP32.cpp b/hal/architecture/ESP32/MyMainESP32.cpp index 99be1711..21df14d3 100644 --- a/hal/architecture/ESP32/MyMainESP32.cpp +++ b/hal/architecture/ESP32/MyMainESP32.cpp @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/architecture/ESP8266/MyHwESP8266.cpp b/hal/architecture/ESP8266/MyHwESP8266.cpp index 4a857076..74158bcb 100644 --- a/hal/architecture/ESP8266/MyHwESP8266.cpp +++ b/hal/architecture/ESP8266/MyHwESP8266.cpp @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -30,7 +30,7 @@ bool hwInit(void) return true; } -void hwReadConfigBlock(void* buf, void* addr, size_t length) +void hwReadConfigBlock(void *buf, void *addr, size_t length) { uint8_t* dst = static_cast(buf); int pos = reinterpret_cast(addr); @@ -39,7 +39,7 @@ void hwReadConfigBlock(void* buf, void* addr, size_t length) } } -void hwWriteConfigBlock(void* buf, void* addr, size_t length) +void hwWriteConfigBlock(void *buf, void *addr, size_t length) { uint8_t* src = static_cast(buf); int pos = reinterpret_cast(addr); @@ -125,7 +125,7 @@ ADC_MODE(ADC_VCC); ADC_MODE(ADC_TOUT); #endif -uint16_t hwCPUVoltage() +uint16_t hwCPUVoltage(void) { #if defined(MY_SPECIAL_DEBUG) // in mV, requires ADC_VCC set @@ -136,13 +136,13 @@ uint16_t hwCPUVoltage() #endif } -uint16_t hwCPUFrequency() +uint16_t hwCPUFrequency(void) { // in 1/10Mhz return ESP.getCpuFreqMHz()*10; } -uint16_t hwFreeMem() +uint16_t hwFreeMem(void) { return ESP.getFreeHeap(); } @@ -166,6 +166,7 @@ void hwDebugPrint(const char *fmt, ... ) #endif va_list args; va_start (args, fmt ); + // cppcheck-suppress wrongPrintfScanfArgNum vsnprintf_P(fmtBuffer, sizeof(fmtBuffer), fmt, args); #ifdef MY_GATEWAY_SERIAL // Truncate message if this is gateway node diff --git a/hal/architecture/ESP8266/MyHwESP8266.h b/hal/architecture/ESP8266/MyHwESP8266.h index 162f17d9..5a33fa53 100644 --- a/hal/architecture/ESP8266/MyHwESP8266.h +++ b/hal/architecture/ESP8266/MyHwESP8266.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -29,11 +29,6 @@ #define MY_SERIALDEVICE Serial #endif -#define min(a,b) ((a)<(b)?(a):(b)) -#define max(a,b) ((a)>(b)?(a):(b)) -#define MIN(a,b) min(a,b) -#define MAX(a,b) max(a,b) - #define EEPROM_size (1024) // Define these as macros to save valuable space @@ -47,8 +42,8 @@ #define hwRandomNumberInit() bool hwInit(void); -void hwReadConfigBlock(void* buf, void* adr, size_t length); -void hwWriteConfigBlock(void* buf, void* adr, size_t length); +void hwReadConfigBlock(void *buf, void *addr, size_t length); +void hwWriteConfigBlock(void *buf, void *addr, size_t length); void hwWriteConfig(const int addr, uint8_t value); uint8_t hwReadConfig(const int addr); ssize_t hwGetentropy(void *__buffer, size_t __length); diff --git a/hal/architecture/ESP8266/MyMainESP8266.cpp b/hal/architecture/ESP8266/MyMainESP8266.cpp index d7175515..34cccf5d 100644 --- a/hal/architecture/ESP8266/MyMainESP8266.cpp +++ b/hal/architecture/ESP8266/MyMainESP8266.cpp @@ -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 @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/architecture/Linux/MyHwLinuxGeneric.cpp b/hal/architecture/Linux/MyHwLinuxGeneric.cpp index 8be3de8d..b45cd4e9 100644 --- a/hal/architecture/Linux/MyHwLinuxGeneric.cpp +++ b/hal/architecture/Linux/MyHwLinuxGeneric.cpp @@ -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 @@ -51,27 +51,27 @@ bool hwInit(void) return true; } -void hwReadConfigBlock(void* buf, void* addr, size_t length) +void hwReadConfigBlock(void *buf, void *addr, size_t length) { eeprom.readBlock(buf, addr, length); } -void hwWriteConfigBlock(void* buf, void* addr, size_t length) +void hwWriteConfigBlock(void *buf, void *addr, size_t length) { eeprom.writeBlock(buf, addr, length); } -uint8_t hwReadConfig(int addr) +uint8_t hwReadConfig(const int addr) { return eeprom.readByte(addr); } -void hwWriteConfig(int addr, uint8_t value) +void hwWriteConfig(const int addr, uint8_t value) { eeprom.writeByte(addr, value); } -void hwRandomNumberInit() +void hwRandomNumberInit(void) { uint32_t seed=0; @@ -92,7 +92,7 @@ ssize_t hwGetentropy(void *__buffer, size_t __length) return(fread(__buffer, 1, __length, randomFp)); } -uint32_t hwMillis() +uint32_t hwMillis(void) { return millis(); } @@ -135,19 +135,19 @@ int8_t hwSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mo return MY_SLEEP_NOT_POSSIBLE; } -uint16_t hwCPUVoltage() +uint16_t hwCPUVoltage(void) { // TODO: Not supported! return FUNCTION_NOT_SUPPORTED; } -uint16_t hwCPUFrequency() +uint16_t hwCPUFrequency(void) { // TODO: Not supported! return FUNCTION_NOT_SUPPORTED; } -uint16_t hwFreeMem() +uint16_t hwFreeMem(void) { // TODO: Not supported! return FUNCTION_NOT_SUPPORTED; diff --git a/hal/architecture/Linux/MyHwLinuxGeneric.h b/hal/architecture/Linux/MyHwLinuxGeneric.h index 214b6126..0ae3dda6 100644 --- a/hal/architecture/Linux/MyHwLinuxGeneric.h +++ b/hal/architecture/Linux/MyHwLinuxGeneric.h @@ -41,9 +41,6 @@ StdInOutStream Serial = StdInOutStream(); #define MY_SERIALDEVICE Serial #endif -#define MIN(a,b) ((a)<(b)?(a):(b)) -#define MAX(a,b) ((a)>(b)?(a):(b)) - // Define these as macros (do nothing) #define hwWatchdogReset() #define hwReboot() @@ -53,14 +50,14 @@ inline int hwDigitalRead(uint8_t); inline void hwPinMode(uint8_t, uint8_t); bool hwInit(void); -inline void hwReadConfigBlock(void* buf, void* addr, size_t length); -inline void hwWriteConfigBlock(void* buf, void* addr, size_t length); -inline uint8_t hwReadConfig(int addr); -inline void hwWriteConfig(int addr, uint8_t value); -inline void hwRandomNumberInit(); +inline void hwReadConfigBlock(void *buf, void *addr, size_t length); +inline void hwWriteConfigBlock(void *buf, void *addr, size_t length); +inline uint8_t hwReadConfig(const int addr); +inline void hwWriteConfig(const int addr, uint8_t value); +inline void hwRandomNumberInit(void); ssize_t hwGetentropy(void *__buffer, size_t __length); #define MY_HW_HAS_GETENTROPY -inline uint32_t hwMillis(); +inline uint32_t hwMillis(void); #ifdef MY_RF24_IRQ_PIN static pthread_mutex_t hw_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/hal/architecture/Linux/MyMainLinuxGeneric.cpp b/hal/architecture/Linux/MyMainLinuxGeneric.cpp index 6003f9c1..b4f80edc 100644 --- a/hal/architecture/Linux/MyMainLinuxGeneric.cpp +++ b/hal/architecture/Linux/MyMainLinuxGeneric.cpp @@ -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 @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/architecture/MyHw.h b/hal/architecture/MyHw.h index cd45a54b..5cca78d7 100644 --- a/hal/architecture/MyHw.h +++ b/hal/architecture/MyHw.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -43,10 +43,10 @@ #define hwDigitalRead(__pin) #define hwPinMode(__pin, __value) -void hwReadConfigBlock(void* buf, void* adr, size_t length); -void hwWriteConfigBlock(void* buf, void* adr, size_t length); -void hwWriteConfig(int adr, uint8_t value); -uint8_t hwReadConfig(int adr); +void hwReadConfigBlock(void *buf, void *addr, size_t length); +void hwWriteConfigBlock(void *buf, void *addr, size_t length); +void hwWriteConfig(const int addr, uint8_t value); +uint8_t hwReadConfig(const int addr); */ /** @@ -99,19 +99,19 @@ bool hwUniqueID(unique_id_t* uniqueID); * CPU voltage * @return CPU voltage in mV */ -uint16_t hwCPUVoltage(); +uint16_t hwCPUVoltage(void); /** * CPU frequency * @return CPU frequency in 1/10Mhz */ -uint16_t hwCPUFrequency(); +uint16_t hwCPUFrequency(void); /** * Free memory * @return free memory in bytes */ -uint16_t hwFreeMem(); +uint16_t hwFreeMem(void); #if defined(DEBUG_OUTPUT_ENABLED) void hwDebugPrint(const char *fmt, ... ); diff --git a/hal/architecture/NRF5/MyHwNRF5.cpp b/hal/architecture/NRF5/MyHwNRF5.cpp index 808b92f8..ee07c7a1 100644 --- a/hal/architecture/NRF5/MyHwNRF5.cpp +++ b/hal/architecture/NRF5/MyHwNRF5.cpp @@ -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 @@ -7,10 +7,10 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB + * Copyright (C) 2013-2018 Sensnology AB * Copyright (C) 2017 Frank Holtz * Full contributor list: - * https://github.com/mysensors/Arduino/graphs/contributors + * https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -42,31 +42,31 @@ void wakeUp2() // place to send the second interrupts _wokeUpByInterrupt = _wakeUp2Interrupt; } -void hwReadConfigBlock(void *buf, void *adr, size_t length) +void hwReadConfigBlock(void *buf, void *addr, size_t length) { uint8_t *dst = static_cast(buf); - const int offs = reinterpret_cast(adr); + const int offs = reinterpret_cast(addr); (void)NVRAM.read_block(dst, offs, length); } -void hwWriteConfigBlock(void *buf, void *adr, size_t length) +void hwWriteConfigBlock(void *buf, void *addr, size_t length) { uint8_t *src = static_cast(buf); - const int offs = reinterpret_cast(adr); + const int offs = reinterpret_cast(addr); (void)NVRAM.write_block(src, offs, length); } -uint8_t hwReadConfig(int adr) +uint8_t hwReadConfig(const int addr) { - return NVRAM.read(adr); + return NVRAM.read(addr); } -void hwWriteConfig(int adr, uint8_t value) +void hwWriteConfig(const int addr, uint8_t value) { - (void)NVRAM.write(adr, value); + (void)NVRAM.write(addr, value); } -bool hwInit() +bool hwInit(void) { #ifdef MY_LOCK_MCU #ifdef NRF51 @@ -133,7 +133,7 @@ bool hwInit() static nrf_ecb_t hwRngData; static int8_t hwRndDataReadPos = -1; -void hwRandomNumberInit() +void hwRandomNumberInit(void) { // Start HWRNG #ifdef NRF51 @@ -222,12 +222,12 @@ ssize_t hwGetentropy(void *__buffer, size_t __length) return __length; } -void hwWatchdogReset() +void hwWatchdogReset(void) { NRF_WDT->RR[0] = WDT_RR_RR_Reload; } -void hwReboot() +void hwReboot(void) { NVIC_SystemReset(); while (true) @@ -332,14 +332,14 @@ void hwSleepEnd(uint32_t ms) } // Halt CPU until next interrupt event -inline void hwWaitForInterrupt() +inline void hwWaitForInterrupt(void) { __DSB(); __WFI(); } // Sleep in System ON mode -inline void hwSleep() +inline void hwSleep(void) { __WFE(); __SEV(); @@ -440,7 +440,7 @@ bool hwUniqueID(unique_id_t *uniqueID) return true; } -uint16_t hwCPUVoltage() +uint16_t hwCPUVoltage(void) { // VDD is prescaled 1/3 and compared with the internal 1.2V reference #if defined(NRF_ADC) @@ -515,7 +515,7 @@ uint16_t hwCPUVoltage() #endif } -uint16_t hwCPUFrequency() +uint16_t hwCPUFrequency(void) { #if defined(VARIANT_MCK) return (VARIANT_MCK) / 100000UL; @@ -526,7 +526,7 @@ uint16_t hwCPUFrequency() #endif } -uint16_t hwFreeMem() +uint16_t hwFreeMem(void) { // TODO: Not supported! return FUNCTION_NOT_SUPPORTED; diff --git a/hal/architecture/NRF5/MyHwNRF5.h b/hal/architecture/NRF5/MyHwNRF5.h index c9d6595b..70a26097 100644 --- a/hal/architecture/NRF5/MyHwNRF5.h +++ b/hal/architecture/NRF5/MyHwNRF5.h @@ -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 @@ -7,10 +7,10 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB + * Copyright (C) 2013-2018 Sensnology AB * Copyright (C) 2017 Frank Holtz * Full contributor list: - * https://github.com/mysensors/Arduino/graphs/contributors + * https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -61,9 +61,6 @@ #define printf_P printf #endif -#define MIN(a,b) min(a,b) -#define MAX(a,b) max(a,b) - // redefine 8 bit types of inttypes.h until fix of https://github.com/sandeepmistry/arduino-nRF5/issues/197 #undef PRId8 #undef PRIi8 @@ -108,14 +105,14 @@ #define hwPinMode(__pin, __value) nrf5_pinMode(__pin, __value) #define hwMillis() millis() -bool hwInit(); -void hwWatchdogReset(); -void hwReboot(); -void hwReadConfigBlock(void *buf, void *adr, size_t length); -void hwWriteConfigBlock(void *buf, void *adr, size_t length); -void hwWriteConfig(int adr, uint8_t value); -uint8_t hwReadConfig(int adr); -void hwRandomNumberInit(); +bool hwInit(void); +void hwWatchdogReset(void); +void hwReboot(void); +void hwReadConfigBlock(void *buf, void *addr, size_t length); +void hwWriteConfigBlock(void *buf, void *addr, size_t length); +void hwWriteConfig(const int addr, uint8_t value); +uint8_t hwReadConfig(const int addr); +void hwRandomNumberInit(void); ssize_t hwGetentropy(void *__buffer, size_t __length); #define MY_HW_HAS_GETENTROPY diff --git a/hal/architecture/NRF5/MyMainNRF5.cpp b/hal/architecture/NRF5/MyMainNRF5.cpp index 8c67595f..d2792d1a 100644 --- a/hal/architecture/NRF5/MyMainNRF5.cpp +++ b/hal/architecture/NRF5/MyMainNRF5.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/architecture/SAMD/MyHwSAMD.cpp b/hal/architecture/SAMD/MyHwSAMD.cpp index 47a14afe..e0e1f4d6 100644 --- a/hal/architecture/SAMD/MyHwSAMD.cpp +++ b/hal/architecture/SAMD/MyHwSAMD.cpp @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -41,30 +41,29 @@ ISR (WDT_vect) */ -void hwReadConfigBlock(void* buf, void* adr, size_t length) +void hwReadConfigBlock(void *buf, void *addr, size_t length) { uint8_t* dst = static_cast(buf); - const int offs = reinterpret_cast(adr); + const int offs = reinterpret_cast(addr); (void)eep.read(offs, dst, length); - } -void hwWriteConfigBlock(void* buf, void* adr, size_t length) +void hwWriteConfigBlock(void *buf, void *addr, size_t length) { uint8_t* src = static_cast(buf); - const int offs = reinterpret_cast(adr); + const int offs = reinterpret_cast(addr); // use update() instead of write() to reduce e2p wear off (void)eep.update(offs, src, length); } -uint8_t hwReadConfig(int adr) +uint8_t hwReadConfig(const int addr) { - return eep.read(adr); + return eep.read(addr); } -void hwWriteConfig(int adr, uint8_t value) +void hwWriteConfig(const int addr, uint8_t value) { - (void)eep.update(adr, value); + (void)eep.update(addr, value); } bool hwInit(void) @@ -125,12 +124,12 @@ int8_t hwSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mo bool hwUniqueID(unique_id_t *uniqueID) { - (void)memcpy((uint8_t*)uniqueID, (uint32_t *)0x0080A00C, 4); - (void)memcpy((uint8_t*)uniqueID + 4, (uint32_t *)0x0080A040, 12); + (void)memcpy((uint8_t *)uniqueID, (uint32_t *)0x0080A00C, 4); + (void)memcpy((uint8_t *)uniqueID + 4, (uint32_t *)0x0080A040, 12); return true; } -uint16_t hwCPUVoltage() +uint16_t hwCPUVoltage(void) { // disable ADC @@ -167,13 +166,13 @@ uint16_t hwCPUVoltage() return valueRead * 4; } -uint16_t hwCPUFrequency() +uint16_t hwCPUFrequency(void) { // TODO: currently reporting compile time frequency (in 1/10MHz) return F_CPU / 100000UL; } -uint16_t hwFreeMem() +uint16_t hwFreeMem(void) { // TODO: Not supported! return FUNCTION_NOT_SUPPORTED; diff --git a/hal/architecture/SAMD/MyHwSAMD.h b/hal/architecture/SAMD/MyHwSAMD.h index 353e9bca..b3853402 100644 --- a/hal/architecture/SAMD/MyHwSAMD.h +++ b/hal/architecture/SAMD/MyHwSAMD.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -36,11 +36,6 @@ extEEPROM eep(MY_EXT_EEPROM_SIZE, 1, MY_EXT_EEPROM_PAGE_SIZE, MY_EXT_EEPROM_I2C_ADDRESS); //device size, number of devices, page size - -#define min(a,b) ((a)<(b)?(a):(b)) -#define max(a,b) ((a)>(b)?(a):(b)) -#define MIN(a,b) min(a,b) -#define MAX(a,b) max(a,b) #define snprintf_P(s, f, ...) snprintf((s), (f), __VA_ARGS__) #define vsnprintf_P(s, n, f, ...) vsnprintf((s), (n), (f), __VA_ARGS__) @@ -54,10 +49,10 @@ extEEPROM eep(MY_EXT_EEPROM_SIZE, 1, MY_EXT_EEPROM_PAGE_SIZE, bool hwInit(void); void hwWatchdogReset(void); void hwReboot(void); -void hwReadConfigBlock(void* buf, void* adr, size_t length); -void hwWriteConfigBlock(void* buf, void* adr, size_t length); -void hwWriteConfig(int adr, uint8_t value); -uint8_t hwReadConfig(int adr); +void hwReadConfigBlock(void *buf, void * addr, size_t length); +void hwWriteConfigBlock(void *buf, void * addr, size_t length); +void hwWriteConfig(const int addr, uint8_t value); +uint8_t hwReadConfig(const int addr); #ifndef MY_SERIALDEVICE #define MY_SERIALDEVICE SerialUSB diff --git a/hal/architecture/SAMD/MyMainSAMD.cpp b/hal/architecture/SAMD/MyMainSAMD.cpp index 9bd40b79..ed4537a6 100644 --- a/hal/architecture/SAMD/MyMainSAMD.cpp +++ b/hal/architecture/SAMD/MyMainSAMD.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/architecture/STM32F1/MyHwSTM32F1.cpp b/hal/architecture/STM32F1/MyHwSTM32F1.cpp index 435d2444..aac9b717 100644 --- a/hal/architecture/STM32F1/MyHwSTM32F1.cpp +++ b/hal/architecture/STM32F1/MyHwSTM32F1.cpp @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -59,18 +59,18 @@ bool hwInit(void) return false; } -void hwReadConfigBlock(void* buf, void* addr, size_t length) +void hwReadConfigBlock(void *buf, void *addr, size_t length) { - uint8_t* dst = static_cast(buf); + uint8_t *dst = static_cast(buf); int pos = reinterpret_cast(addr); while (length-- > 0) { *dst++ = EEPROM.read(pos++); } } -void hwWriteConfigBlock(void* buf, void* addr, size_t length) +void hwWriteConfigBlock(void *buf, void *addr, size_t length) { - uint8_t* src = static_cast(buf); + uint8_t *src = static_cast(buf); int pos = reinterpret_cast(addr); while (length-- > 0) { EEPROM.write(pos++, *src++); @@ -149,7 +149,7 @@ bool hwUniqueID(unique_id_t* uniqueID) return true; } -uint16_t hwCPUVoltage() +uint16_t hwCPUVoltage(void) { adc_reg_map *regs = ADC1->regs; regs->CR2 |= ADC_CR2_TSVREFE; // enable VREFINT and temp sensor @@ -157,12 +157,12 @@ uint16_t hwCPUVoltage() return 1200 * 4096 / adc_read(ADC1, 17); } -uint16_t hwCPUFrequency() +uint16_t hwCPUFrequency(void) { return F_CPU/100000UL; } -uint16_t hwFreeMem() +uint16_t hwFreeMem(void) { //Not yet implemented return FUNCTION_NOT_SUPPORTED; diff --git a/hal/architecture/STM32F1/MyHwSTM32F1.h b/hal/architecture/STM32F1/MyHwSTM32F1.h index bca1f536..49dd759c 100644 --- a/hal/architecture/STM32F1/MyHwSTM32F1.h +++ b/hal/architecture/STM32F1/MyHwSTM32F1.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -45,9 +45,6 @@ #define MY_SERIALDEVICE Serial #endif -#define MIN(a,b) min(a,b) -#define MAX(a,b) max(a,b) - #ifndef digitalPinToInterrupt #define digitalPinToInterrupt(__pin) (__pin) #endif @@ -60,11 +57,10 @@ #define hwMillis() millis() extern void serialEventRun(void) __attribute__((weak)); -//void (*serialEventRun)() = NULL; bool hwInit(void); void hwRandomNumberInit(void); -void hwReadConfigBlock(void* buf, void* adr, size_t length); -void hwWriteConfigBlock(void* buf, void* adr, size_t length); +void hwReadConfigBlock(void *buf, void *addr, size_t length); +void hwWriteConfigBlock(void *buf, void *addr, size_t length); void hwWriteConfig(const int addr, uint8_t value); uint8_t hwReadConfig(const int addr); diff --git a/hal/architecture/STM32F1/MyMainSTM32F1.cpp b/hal/architecture/STM32F1/MyMainSTM32F1.cpp index dbc9f217..d688655a 100644 --- a/hal/architecture/STM32F1/MyMainSTM32F1.cpp +++ b/hal/architecture/STM32F1/MyMainSTM32F1.cpp @@ -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 @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/architecture/Teensy3/MyHwTeensy3.cpp b/hal/architecture/Teensy3/MyHwTeensy3.cpp index 1771795c..ccd042c1 100644 --- a/hal/architecture/Teensy3/MyHwTeensy3.cpp +++ b/hal/architecture/Teensy3/MyHwTeensy3.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad -* Copyright (C) 2013-2017 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Copyright (C) 2013-2018 Sensnology AB +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -99,7 +99,7 @@ bool hwUniqueID(unique_id_t *uniqueID) return true; } -uint16_t hwCPUVoltage() +uint16_t hwCPUVoltage(void) { analogReference(DEFAULT); analogReadResolution(12); @@ -120,13 +120,13 @@ uint16_t hwCPUVoltage() #endif } -uint16_t hwCPUFrequency() +uint16_t hwCPUFrequency(void) { // TODO: currently reporting compile time frequency (in 1/10MHz) return F_CPU / 100000UL; } -uint16_t hwFreeMem() +uint16_t hwFreeMem(void) { // TODO: Not supported! return FUNCTION_NOT_SUPPORTED; diff --git a/hal/architecture/Teensy3/MyHwTeensy3.h b/hal/architecture/Teensy3/MyHwTeensy3.h index 99e5046d..08cee3c6 100644 --- a/hal/architecture/Teensy3/MyHwTeensy3.h +++ b/hal/architecture/Teensy3/MyHwTeensy3.h @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad -* Copyright (C) 2013-2017 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Copyright (C) 2013-2018 Sensnology AB +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -35,8 +35,8 @@ #define CRYPTO_LITTLE_ENDIAN -#ifndef _BV -#define _BV(x) (1<<(x)) +#ifndef MY_SERIALDEVICE +#define MY_SERIALDEVICE Serial #endif #if defined(__MK64FX512__) || defined(__MK66FX1M0__) @@ -51,12 +51,6 @@ #define SIM_SCGC6_RNGA ((uint32_t)0x00000200) #endif -#define min(a,b) ((a)<(b)?(a):(b)) -#define max(a,b) ((a)>(b)?(a):(b)) - -#define MIN min -#define MAX max - // Define these as macros to save valuable space #define hwDigitalWrite(__pin, __value) digitalWriteFast(__pin, __value) #define hwDigitalRead(__pin) digitalReadFast(__pin) @@ -69,14 +63,10 @@ void hwWatchdogReset(void); void hwReboot(void); // Teensy 3.x implements avr-libc EEPROM API -#define hwReadConfig(__pos) eeprom_read_byte((uint8_t*)(__pos)) -#define hwWriteConfig(__pos, __val) eeprom_update_byte((uint8_t*)(__pos), (__val)) -#define hwReadConfigBlock(__buf, __pos, __length) eeprom_read_block((void*)(__buf), (void*)(__pos), (__length)) -#define hwWriteConfigBlock(__buf, __pos, __length) eeprom_update_block((void*)(__buf), (void*)(__pos), (__length)) - -#ifndef MY_SERIALDEVICE -#define MY_SERIALDEVICE Serial -#endif +#define hwReadConfig(__pos) eeprom_read_byte((const uint8_t *)__pos) +#define hwWriteConfig(__pos, __val) eeprom_update_byte((uint8_t *)__pos, (uint8_t)__val) +#define hwReadConfigBlock(__buf, __pos, __length) eeprom_read_block((void *)__buf, (const void *)__pos, (uint32_t)__length) +#define hwWriteConfigBlock(__buf, __pos, __length) eeprom_update_block((const void *)__buf, (void *)__pos, (uint32_t)__length) #if defined(__MK64FX512__) || defined(__MK66FX1M0__) #define MY_HW_HAS_GETENTROPY diff --git a/hal/architecture/Teensy3/MyMainTeensy3.cpp b/hal/architecture/Teensy3/MyMainTeensy3.cpp index be686887..630ebd27 100644 --- a/hal/architecture/Teensy3/MyMainTeensy3.cpp +++ b/hal/architecture/Teensy3/MyMainTeensy3.cpp @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/crypto/AVR/MyCryptoAVR.cpp b/hal/crypto/AVR/MyCryptoAVR.cpp index a803a884..99732b18 100644 --- a/hal/crypto/AVR/MyCryptoAVR.cpp +++ b/hal/crypto/AVR/MyCryptoAVR.cpp @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/crypto/AVR/MyCryptoAVR.h b/hal/crypto/AVR/MyCryptoAVR.h index 78fa369f..1a5156b2 100644 --- a/hal/crypto/AVR/MyCryptoAVR.h +++ b/hal/crypto/AVR/MyCryptoAVR.h @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/crypto/ESP32/MyCryptoESP32.cpp b/hal/crypto/ESP32/MyCryptoESP32.cpp index b41d7260..03999be0 100644 --- a/hal/crypto/ESP32/MyCryptoESP32.cpp +++ b/hal/crypto/ESP32/MyCryptoESP32.cpp @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/crypto/ESP32/MyCryptoESP32.h b/hal/crypto/ESP32/MyCryptoESP32.h index 8e7a295c..41555cae 100644 --- a/hal/crypto/ESP32/MyCryptoESP32.h +++ b/hal/crypto/ESP32/MyCryptoESP32.h @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/crypto/MyCryptoHAL.h b/hal/crypto/MyCryptoHAL.h index 1c8dbfd8..334fe4f4 100644 --- a/hal/crypto/MyCryptoHAL.h +++ b/hal/crypto/MyCryptoHAL.h @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/crypto/generic/MyCryptoGeneric.cpp b/hal/crypto/generic/MyCryptoGeneric.cpp index fc290647..f2aa2fc9 100644 --- a/hal/crypto/generic/MyCryptoGeneric.cpp +++ b/hal/crypto/generic/MyCryptoGeneric.cpp @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/crypto/generic/MyCryptoGeneric.h b/hal/crypto/generic/MyCryptoGeneric.h index 1b361e60..75dd57fb 100644 --- a/hal/crypto/generic/MyCryptoGeneric.h +++ b/hal/crypto/generic/MyCryptoGeneric.h @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB -* Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/transport/MyTransportHAL.h b/hal/transport/MyTransportHAL.h index a3da5133..308e0dd4 100644 --- a/hal/transport/MyTransportHAL.h +++ b/hal/transport/MyTransportHAL.h @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/transport/NRF5_ESB/MyTransportNRF5_ESB.cpp b/hal/transport/NRF5_ESB/MyTransportNRF5_ESB.cpp index ddc29a6b..483bd569 100644 --- a/hal/transport/NRF5_ESB/MyTransportNRF5_ESB.cpp +++ b/hal/transport/NRF5_ESB/MyTransportNRF5_ESB.cpp @@ -9,7 +9,7 @@ * Copyright (C) 2013-2018 Sensnology AB * Copyright (C) 2017 Frank Holtz * Full contributor list: - * https://github.com/mysensors/Arduino/graphs/contributors + * https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/transport/RF24/MyTransportRF24.cpp b/hal/transport/RF24/MyTransportRF24.cpp index 85b1b0b1..9ce7fcf1 100644 --- a/hal/transport/RF24/MyTransportRF24.cpp +++ b/hal/transport/RF24/MyTransportRF24.cpp @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/transport/RFM69/MyTransportRFM69.cpp b/hal/transport/RFM69/MyTransportRFM69.cpp index b1ff3db1..44533f54 100644 --- a/hal/transport/RFM69/MyTransportRFM69.cpp +++ b/hal/transport/RFM69/MyTransportRFM69.cpp @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/transport/RFM95/MyTransportRFM95.cpp b/hal/transport/RFM95/MyTransportRFM95.cpp index 5e3bd648..c8188df0 100644 --- a/hal/transport/RFM95/MyTransportRFM95.cpp +++ b/hal/transport/RFM95/MyTransportRFM95.cpp @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/hal/transport/RS485/MyTransportRS485.cpp b/hal/transport/RS485/MyTransportRS485.cpp index 00e86959..a8feff48 100644 --- a/hal/transport/RS485/MyTransportRS485.cpp +++ b/hal/transport/RS485/MyTransportRS485.cpp @@ -7,7 +7,7 @@ * * Created by Henrik Ekblad * Copyright (C) 2013-2018 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/library.json b/library.json index 4e70025c..a77abdb1 100644 --- a/library.json +++ b/library.json @@ -1,13 +1,13 @@ { "name": "MySensors", "keywords": "framework, sensor, rf", - "description": "Home Automation Framework. Create your own wireless sensor mesh using NRF24L01+, RFM69 and RFM95 radios running on AVR, ESP32, ESP8266, NRF5x, SAMD, STM32F1 and Teensyduino. Over-the-air updates and MySensors support by 20+ home automation controllers.", + "description": "Home Automation Framework. Create your own wireless sensor mesh using nRF24L01+, RFM69 and RFM95 radios running on AVR, ESP32, ESP8266, NRF5x, SAMD, STM32F1 and Teensyduino. Over-the-air updates and MySensors support by 20+ home automation controllers.", "repository": { "type": "git", "url": "https://github.com/mysensors/MySensors.git" }, - "version": "2.3.1-alpha", + "version": "2.3.1-beta", "frameworks": "arduino", "platforms": "*", "export": { diff --git a/library.properties b/library.properties index 83c865ed..7bf6b93e 100644 --- a/library.properties +++ b/library.properties @@ -1,9 +1,9 @@ name=MySensors -version=2.3.1-alpha +version=2.3.1-beta author=The MySensors Team maintainer=The MySensors Team sentence=Home Automation Framework -paragraph=Create your own wireless sensor mesh using NRF24L01+, RFM69 and RFM95 radios running on AVR, ESP32, ESP8266, NRF5x, SAMD, STM32F1 and Teensyduino. Over-the-air updates and MySensors support by 20+ home automation controllers. +paragraph=Create your own wireless sensor mesh using nRF24L01+, RFM69 and RFM95 radios running on AVR, ESP32, ESP8266, NRF5x, SAMD, STM32F1 and Teensyduino. Over-the-air updates and MySensors support by 20+ home automation controllers. category=Communication url=https://www.mysensors.org architectures=* diff --git a/tests/Arduino/sketches/hard_signing_no_whitelisting_full_debug/hard_signing_no_whitelisting_full_debug.ino b/tests/Arduino/sketches/hard_signing_no_whitelisting_full_debug/hard_signing_no_whitelisting_full_debug.ino index dea5111c..1aff80ca 100644 --- a/tests/Arduino/sketches/hard_signing_no_whitelisting_full_debug/hard_signing_no_whitelisting_full_debug.ino +++ b/tests/Arduino/sketches/hard_signing_no_whitelisting_full_debug/hard_signing_no_whitelisting_full_debug.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -22,7 +22,7 @@ #include #define MY_DEBUG #define MY_DEBUG_VERBOSE_SIGNING -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_SIGNING_SOFT #define MY_SIGNING_ATSHA204 //#define MY_SIGNING_NODE_WHITELISTING {{.nodeId = GATEWAY_ADDRESS,.serial = {0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01}}} diff --git a/tests/Arduino/sketches/hard_signing_whitelisting_full_debug/hard_signing_whitelisting_full_debug.ino b/tests/Arduino/sketches/hard_signing_whitelisting_full_debug/hard_signing_whitelisting_full_debug.ino index 23f0d9b8..55f20354 100644 --- a/tests/Arduino/sketches/hard_signing_whitelisting_full_debug/hard_signing_whitelisting_full_debug.ino +++ b/tests/Arduino/sketches/hard_signing_whitelisting_full_debug/hard_signing_whitelisting_full_debug.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -22,7 +22,7 @@ #include #define MY_DEBUG #define MY_DEBUG_VERBOSE_SIGNING -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_SIGNING_SOFT #define MY_SIGNING_ATSHA204 #define MY_SIGNING_NODE_WHITELISTING {{.nodeId = GATEWAY_ADDRESS,.serial = {0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01}}} diff --git a/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_nodelock/hard_signing_whitelisting_full_debug_nodelock.ino b/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_nodelock/hard_signing_whitelisting_full_debug_nodelock.ino index 43ff5e97..aa90b048 100644 --- a/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_nodelock/hard_signing_whitelisting_full_debug_nodelock.ino +++ b/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_nodelock/hard_signing_whitelisting_full_debug_nodelock.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -22,7 +22,7 @@ #include #define MY_DEBUG #define MY_DEBUG_VERBOSE_SIGNING -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_SIGNING_SOFT #define MY_SIGNING_ATSHA204 #define MY_SIGNING_NODE_WHITELISTING {{.nodeId = GATEWAY_ADDRESS,.serial = {0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01}}} diff --git a/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_nrf24_rsa/hard_signing_whitelisting_full_debug_nrf24_rsa.ino b/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_nrf24_rsa/hard_signing_whitelisting_full_debug_nrf24_rsa.ino index d1263b7d..8707807d 100644 --- a/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_nrf24_rsa/hard_signing_whitelisting_full_debug_nrf24_rsa.ino +++ b/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_nrf24_rsa/hard_signing_whitelisting_full_debug_nrf24_rsa.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -22,7 +22,7 @@ #include #define MY_DEBUG #define MY_DEBUG_VERBOSE_SIGNING -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 //#define MY_SIGNING_SOFT #define MY_SIGNING_ATSHA204 #define MY_SIGNING_NODE_WHITELISTING {{.nodeId = GATEWAY_ADDRESS,.serial = {0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01}}} diff --git a/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_rfm69_rsa/hard_signing_whitelisting_full_debug_rfm69_rsa.ino b/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_rfm69_rsa/hard_signing_whitelisting_full_debug_rfm69_rsa.ino index 489f926d..15177246 100644 --- a/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_rfm69_rsa/hard_signing_whitelisting_full_debug_rfm69_rsa.ino +++ b/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_rfm69_rsa/hard_signing_whitelisting_full_debug_rfm69_rsa.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_rfm95_rsa/hard_signing_whitelisting_full_debug_rfm95_rsa.ino b/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_rfm95_rsa/hard_signing_whitelisting_full_debug_rfm95_rsa.ino index 67fc11e4..fe4f925b 100644 --- a/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_rfm95_rsa/hard_signing_whitelisting_full_debug_rfm95_rsa.ino +++ b/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_rfm95_rsa/hard_signing_whitelisting_full_debug_rfm95_rsa.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2016 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/tests/Arduino/sketches/new_rfm69_driver/new_rfm69_driver.ino b/tests/Arduino/sketches/new_rfm69_driver/new_rfm69_driver.ino index eb67aebe..833cdeb8 100644 --- a/tests/Arduino/sketches/new_rfm69_driver/new_rfm69_driver.ino +++ b/tests/Arduino/sketches/new_rfm69_driver/new_rfm69_driver.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2017 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/tests/Arduino/sketches/ota_firmware_update_nrf24/ota_firmware_update_nrf24.ino b/tests/Arduino/sketches/ota_firmware_update_nrf24/ota_firmware_update_nrf24.ino index 038cb37e..8a0a7634 100644 --- a/tests/Arduino/sketches/ota_firmware_update_nrf24/ota_firmware_update_nrf24.ino +++ b/tests/Arduino/sketches/ota_firmware_update_nrf24/ota_firmware_update_nrf24.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -21,6 +21,6 @@ #include #include #define MY_DEBUG -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 #define MY_OTA_FIRMWARE_FEATURE #include diff --git a/tests/Arduino/sketches/serial_gw_no_transport_hard_signing_whitelisting_full_debug/serial_gw_no_transport_hard_signing_whitelisting_full_debug.ino b/tests/Arduino/sketches/serial_gw_no_transport_hard_signing_whitelisting_full_debug/serial_gw_no_transport_hard_signing_whitelisting_full_debug.ino index 65109fcc..ff41ab9e 100644 --- a/tests/Arduino/sketches/serial_gw_no_transport_hard_signing_whitelisting_full_debug/serial_gw_no_transport_hard_signing_whitelisting_full_debug.ino +++ b/tests/Arduino/sketches/serial_gw_no_transport_hard_signing_whitelisting_full_debug/serial_gw_no_transport_hard_signing_whitelisting_full_debug.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2016 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/tests/Arduino/sketches/serial_gw_no_transport_soft_signing_whitelisting_full_debug/serial_gw_no_transport_soft_signing_whitelisting_full_debug.ino b/tests/Arduino/sketches/serial_gw_no_transport_soft_signing_whitelisting_full_debug/serial_gw_no_transport_soft_signing_whitelisting_full_debug.ino index 7dd4fdec..9d5ea376 100644 --- a/tests/Arduino/sketches/serial_gw_no_transport_soft_signing_whitelisting_full_debug/serial_gw_no_transport_soft_signing_whitelisting_full_debug.ino +++ b/tests/Arduino/sketches/serial_gw_no_transport_soft_signing_whitelisting_full_debug/serial_gw_no_transport_soft_signing_whitelisting_full_debug.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2016 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org diff --git a/tests/Arduino/sketches/soft_signing_no_whitelisting_full_debug/soft_signing_no_whitelisting_full_debug.ino b/tests/Arduino/sketches/soft_signing_no_whitelisting_full_debug/soft_signing_no_whitelisting_full_debug.ino index f922d57e..34faae7c 100644 --- a/tests/Arduino/sketches/soft_signing_no_whitelisting_full_debug/soft_signing_no_whitelisting_full_debug.ino +++ b/tests/Arduino/sketches/soft_signing_no_whitelisting_full_debug/soft_signing_no_whitelisting_full_debug.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -22,7 +22,7 @@ #include #define MY_DEBUG #define MY_DEBUG_VERBOSE_SIGNING -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 #define MY_SIGNING_SOFT //#define MY_SIGNING_ATSHA204 //#define MY_SIGNING_NODE_WHITELISTING {{.nodeId = GATEWAY_ADDRESS,.serial = {0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01}}} diff --git a/tests/Arduino/sketches/soft_signing_whitelisting_full_debug/soft_signing_whitelisting_full_debug.ino b/tests/Arduino/sketches/soft_signing_whitelisting_full_debug/soft_signing_whitelisting_full_debug.ino index 3790fc69..d9e8749a 100644 --- a/tests/Arduino/sketches/soft_signing_whitelisting_full_debug/soft_signing_whitelisting_full_debug.ino +++ b/tests/Arduino/sketches/soft_signing_whitelisting_full_debug/soft_signing_whitelisting_full_debug.ino @@ -6,8 +6,8 @@ * network topology allowing messages to be routed to nodes. * * Created by Henrik Ekblad - * Copyright (C) 2013-2015 Sensnology AB - * Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors + * Copyright (C) 2013-2018 Sensnology AB + * Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors * * Documentation: http://www.mysensors.org * Support Forum: http://forum.mysensors.org @@ -22,7 +22,7 @@ #include #define MY_DEBUG #define MY_DEBUG_VERBOSE_SIGNING -#define MY_RADIO_NRF24 +#define MY_RADIO_RF24 #define MY_SIGNING_SOFT //#define MY_SIGNING_ATSHA204 #define MY_SIGNING_NODE_WHITELISTING {{.nodeId = GATEWAY_ADDRESS,.serial = {0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01}}}