Merge branch 'tosa' of https://github.com/ToSa27/Arduino into

ToSa27-tosa

Conflicts:
	libraries/MySensors/examples/EthernetGateway/EthernetGateway.ino

libraries/MySensors/MyConfig.h

@@ -4,17 +4,22 @@
 /***
  * Configure Sensor Network
  */
-#define RF24_CHANNEL	   76             //RF channel for the sensor net, 0-127
-#define RF24_DATARATE 	   RF24_250KBPS   //RF24_250KBPS for 250kbs, RF24_1MBPS for 1Mbps, or RF24_2MBPS for 2Mbps
-#define RF24_PA_LEVEL 	   RF24_PA_MAX    //Sensor PA Level == RF24_PA_MIN=-18dBm, RF24_PA_LOW=-12dBm, RF24_PA_HIGH=-6dBM, and RF24_PA_MAX=0dBm
-#define RF24_PA_LEVEL_GW   RF24_PA_LOW  //Gateway PA Level, defaults to Sensor net PA Level.  Tune here if using an amplified nRF2401+ in your gateway.
-#define BASE_RADIO_ID 	   ((uint64_t)0xA8A8E1FC00LL) // This is also act as base value for sensor nodeId addresses. Change this (or channel) if you have more than one sensor network.
+ 
+// pick ONE of these - other board layouts can be easily added this way
+#define MYSENSORS_SENSOR
+//#define MYSENSORS_SERIAL_GATEWAY
+//#define MYSENSORS_ETHERNET_MQTT_GATEWAY
 
-// MySensors online examples defaults
-#define DEFAULT_CE_PIN 9
-#define DEFAULT_CS_PIN 10
+// Choose radio type by enabling one of the following
+#define MYSENSORS_RF_NRF24
 
 
+
+#ifdef MYSENSORS_RF_NRF24
+#include "MyDriverNRF24.h"
+typedef class MyDriverNRF24 MyDriverClass;
+#endif
+
 /***
  * Enable/Disable debug logging
  */