Merge development branch
This commit is contained in:
+71
@@ -459,6 +459,8 @@
|
||||
#define MY_RF24_CE_PIN 4
|
||||
#elif defined(ARDUINO_ARCH_SAMD)
|
||||
#define MY_RF24_CE_PIN 27
|
||||
#elif defined(LINUX_ARCH_RASPBERRYPI)
|
||||
#define MY_RF24_CE_PIN 22
|
||||
#else
|
||||
#define MY_RF24_CE_PIN 9
|
||||
#endif
|
||||
@@ -473,6 +475,8 @@
|
||||
#define MY_RF24_CS_PIN 15
|
||||
#elif defined(ARDUINO_ARCH_SAMD)
|
||||
#define MY_RF24_CS_PIN 3
|
||||
#elif defined(LINUX_ARCH_RASPBERRYPI)
|
||||
#define MY_RF24_CS_PIN 24
|
||||
#else
|
||||
#define MY_RF24_CS_PIN 10
|
||||
#endif
|
||||
@@ -654,6 +658,7 @@
|
||||
//#define MY_GATEWAY_W5100
|
||||
//#define MY_GATEWAY_ENC28J60
|
||||
//#define MY_GATEWAY_ESP8266
|
||||
//#define MY_GATEWAY_LINUX
|
||||
|
||||
/**
|
||||
* @def MY_PORT
|
||||
@@ -695,6 +700,10 @@
|
||||
// If MY_CONTROLLER_IP_ADDRESS is left un-defined, gateway acts as server allowing incoming connections.
|
||||
//#define MY_CONTROLLER_IP_ADDRESS 192, 168, 178, 254
|
||||
|
||||
/**************************************
|
||||
* Node Locking
|
||||
***************************************/
|
||||
|
||||
/**
|
||||
* @defgroup MyLockgrp MyNodeLock
|
||||
* @ingroup internals
|
||||
@@ -751,8 +760,68 @@
|
||||
#endif
|
||||
/** @}*/ // Node lock group
|
||||
|
||||
/**********************************
|
||||
* ESP8266 Defaults
|
||||
***********************************/
|
||||
|
||||
/**
|
||||
* @def MY_ESP8266_SERIAL_MODE
|
||||
* @brief Serial modes: SERIAL_FULL, SERIAL_RX_ONLY, SERIAL_TX_ONLY
|
||||
*
|
||||
* SERIAL_FULL: Default mode.
|
||||
* SERIAL_TX_ONLY: allows to use RX (GPIO3) as a general purpose input/output.
|
||||
* SERIAL_RX_ONLY: allows to use TX (GPIO1) as a general purpose input/output.
|
||||
*/
|
||||
#ifndef MY_ESP8266_SERIAL_MODE
|
||||
#define MY_ESP8266_SERIAL_MODE SERIAL_FULL
|
||||
#endif
|
||||
|
||||
/**************************************
|
||||
* Linux Settings
|
||||
***************************************/
|
||||
|
||||
/**
|
||||
* @def MY_LINUX_SERIAL_PORT
|
||||
* @brief Serial device port
|
||||
*/
|
||||
#ifndef MY_LINUX_SERIAL_PORT
|
||||
#define MY_LINUX_SERIAL_PORT "/dev/ttyACM0"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @def MY_IS_SERIAL_PTY
|
||||
* @brief Set serial as a pseudo terminal.
|
||||
*
|
||||
* Enable this if you need to connect to a controller running on the same device.
|
||||
*/
|
||||
//#define MY_IS_SERIAL_PTY
|
||||
|
||||
/**
|
||||
* @def MY_LINUX_SERIAL_PTY
|
||||
* @brief Symlink name for the PTY device.
|
||||
*/
|
||||
#ifndef MY_LINUX_SERIAL_PTY
|
||||
#define MY_LINUX_SERIAL_PTY "/dev/ttyMySensorsGateway"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @def MY_LINUX_SERIAL_GROUPNAME
|
||||
* @brief Grant access to the specified system group for the serial device.
|
||||
*/
|
||||
//#define MY_LINUX_SERIAL_GROUPNAME "tty"
|
||||
|
||||
/**
|
||||
* @def MY_LINUX_CONFIG_FILE
|
||||
* @brief Set the filepath for the gateway config file
|
||||
*
|
||||
* For now the configuration file is only used to store the emulated eeprom state
|
||||
*/
|
||||
#ifndef MY_LINUX_CONFIG_FILE
|
||||
#define MY_LINUX_CONFIG_FILE "/etc/mysensors.dat"
|
||||
#endif
|
||||
|
||||
#endif // MyConfig_h
|
||||
|
||||
// Doxygen specific constructs, not included when built normally
|
||||
// This is used to enable disabled macros/definitions to be included in the documentation as well.
|
||||
#if DOXYGEN
|
||||
@@ -771,4 +840,6 @@
|
||||
#define MY_NODE_LOCK_FEATURE
|
||||
#define MY_REPEATER_FEATURE
|
||||
#define MY_TRANSPORT_DONT_CARE_MODE
|
||||
#define MY_LINUX_SERIAL_GROUPNAME
|
||||
#define MY_IS_SERIAL_PTY
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user