Skip to content

Commit

Permalink
Merge branch 'mysensors:development' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
@AdamSlowik
AdamSlowik authored Jul 11, 2022
2 parents c27c087 + 6e4206b commit e42abaa
Show file tree
Hide file tree
Showing 14 changed files with 631 additions and 442 deletions.
9 changes: 8 additions & 1 deletion .ci/arduino.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ def buildMySensorsMicro(config, sketches, String key) {
for (sketch = 0; sketch < sketches.size(); sketch++) {
if (sketches[sketch].path != config.library_root+'examples/GatewayESP8266/GatewayESP8266.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266SecureMQTTClient/GatewayESP8266SecureMQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266OTA/GatewayESP8266OTA.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayGSMMQTTClient/GatewayGSMMQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP32/GatewayESP32.ino' &&
Expand Down Expand Up @@ -87,6 +88,7 @@ def buildMySensorsGw(config, sketches, String key) {
if (sketches[sketch].path != config.library_root+'examples/BatteryPoweredSensor/BatteryPoweredSensor.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266/GatewayESP8266.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266SecureMQTTClient/GatewayESP8266SecureMQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266OTA/GatewayESP8266OTA.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayGSMMQTTClient/GatewayGSMMQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP32/GatewayESP32.ino' &&
Expand Down Expand Up @@ -123,6 +125,7 @@ def buildArduinoUno(config, sketches, String key) {
for (sketch = 0; sketch < sketches.size(); sketch++) {
if (sketches[sketch].path != config.library_root+'examples/GatewayESP8266/GatewayESP8266.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266SecureMQTTClient/GatewayESP8266SecureMQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266OTA/GatewayESP8266OTA.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP32/GatewayESP32.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP32OTA/GatewayESP32OTA.ino' &&
Expand Down Expand Up @@ -157,6 +160,7 @@ def buildArduinoMega(config, sketches, String key) {
for (sketch = 0; sketch < sketches.size(); sketch++) {
if (sketches[sketch].path != config.library_root+'examples/GatewayESP8266/GatewayESP8266.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266SecureMQTTClient/GatewayESP8266SecureMQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266OTA/GatewayESP8266OTA.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP32/GatewayESP32.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP32OTA/GatewayESP32OTA.ino' &&
Expand Down Expand Up @@ -191,6 +195,7 @@ def buildSTM32F1(config, sketches, String key) {
for (sketch = 0; sketch < sketches.size(); sketch++) {
if (sketches[sketch].path != config.library_root+'examples/GatewayESP8266/GatewayESP8266.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266SecureMQTTClient/GatewayESP8266SecureMQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266OTA/GatewayESP8266OTA.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP32/GatewayESP32.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP32OTA/GatewayESP32OTA.ino' &&
Expand Down Expand Up @@ -280,6 +285,7 @@ def buildESP32(config, sketches, String key) {
sketches[sketch].path != config.library_root+'examples/GatewayGSMMQTTClient/GatewayGSMMQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266/GatewayESP8266.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266SecureMQTTClient/GatewayESP8266SecureMQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266OTA/GatewayESP8266OTA.ino' &&
sketches[sketch].path != config.library_root+'examples/SensebenderGatewaySerial/SensebenderGatewaySerial.ino' &&
sketches[sketch].path != config.library_root+'examples/MotionSensorRS485/MotionSensorRS485.ino' &&
Expand Down Expand Up @@ -316,6 +322,7 @@ def buildnRF5(config, sketches, String key) {
sketches[sketch].path != config.library_root+'examples/DustSensorDSM/DustSensorDSM.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266/GatewayESP8266.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266SecureMQTTClient/GatewayESP8266SecureMQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayGSMMQTTClient/GatewayGSMMQTTClient.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP8266OTA/GatewayESP8266OTA.ino' &&
sketches[sketch].path != config.library_root+'examples/GatewayESP32/GatewayESP32.ino' &&
Expand Down Expand Up @@ -396,4 +403,4 @@ def buildnRF51822(config, sketches, String key) {
}
}

return this
return this
76 changes: 66 additions & 10 deletions MyConfig.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1472,6 +1472,8 @@
* @brief Define this for Ethernet GW based on the ENC28J60 module.
* @def MY_GATEWAY_ESP8266
* @brief Define this for Ethernet GW based on the ESP8266.
* @def MY_GATEWAY_ESP8266_SECURE
* @brief Define this for Ethernet GW based on the ESP8266 with TLS.
* @def MY_GATEWAY_ESP32
* @brief Define this for Ethernet GW based on the ESP32.
* @def MY_GATEWAY_LINUX
Expand All @@ -1487,6 +1489,7 @@
//#define MY_GATEWAY_W5100
//#define MY_GATEWAY_ENC28J60
//#define MY_GATEWAY_ESP8266
//#define MY_GATEWAY_ESP8266_SECURE
//#define MY_GATEWAY_ESP32
//#define MY_GATEWAY_LINUX
//#define MY_GATEWAY_TINYGSM
Expand Down Expand Up @@ -1594,29 +1597,79 @@
//#define MY_MQTT_SUBSCRIBE_TOPIC_PREFIX "mygateway1-in"

/**
* @def MY_MQTT_CA_CERT
* @brief Set a specific CA certificate needed to validate MQTT server against. Use the certificate as a trust anchor, accepting remote certificates signed by it.
* @def MY_MQTT_CA_CERT1
* @brief Up to three root Certificates Authorities could be defined to validate the mqtt server' certificate. The most secure.
*
* This define is mandatory when you need connect MQTT over SSL/TLS. Certificate Authorities.
* The best method to validate server certificates.
* Advised to retrieve root Certificate Authorities as they expire less often than server certificates.
* With let's encrypt you may need up to three Certificate Authorities
*
* This define is mandatory when you need connect MQTT over SSL/TLS.
* Example: @code
*
* const char mqtt_ca_cert[] PROGMEM = R"EOF(
* const char cert_isrgrootx1_Authority[] PROGMEM = R"EOF(
* ----- BEGIN THE CERTIFICATE -----
* XXX ... XXX
* ----- FINISH CERTIFICATE -----
* )EOF";
*
* #define MY_MQTT_CA_CERT mqtt_ca_cert
* const char cert_isrgrootx2_Authority[] PROGMEM = R"EOF(
* ----- BEGIN THE CERTIFICATE -----
* XXX ... XXX
* ----- FINISH CERTIFICATE -----
* )EOF";
*
* const char cert_letsEncryptR3_Authority[] PROGMEM = R"EOF(
* ----- BEGIN THE CERTIFICATE -----
* XXX ... XXX
* ----- FINISH CERTIFICATE -----
* )EOF";
*
* #define MY_MQTT_CA_CERT1 cert_isrgrootx1_Authority
* #define MY_MQTT_CA_CERT2 cert_isrgrootx2_Authority
* #define MY_MQTT_CA_CERT3 cert_letsEncryptR3_Authority
*
* @endcode
*/
//#define MY_MQTT_CA_CERT1

/**
* @def MY_MQTT_CA_CERT2
* @brief Up to three root Certificates Authorities could be defined to validate the mqtt serv.
*/
//#define MY_MQTT_CA_CERT2

/**
* @def MY_MQTT_CA_CERT3
* @brief Up to three root Certificates Authorities could be defined to validate the mqtt serv.
*/
//#define MY_MQTT_CA_CERT3


/**
* @def MY_MQTT_FINGERPRINT
* @brief Server certificate validation with its fingerprint
*
* The finger print to validate the mqtt server certificate. This is less secure and less convenient
* than using certificate authorities.
* Command (3 lines...) to obtain the certificate finger print:
* @code
* $>openssl s_client -connect <hostname>:<host port> < /dev/null 2>/dev/null | \
* openssl x509 -fingerprint -noout -in /dev/stdin \
* awk -F= '{print $2}'
* @endcode
*
* Example: @code
* const char mqtt_fingerprint [] PROGMEM = "CA:CE:2B:MD:D3:32:A3:F1:8C:73:9E:1B:B7:D5:75:4A:10:61:E4:05";
* @endcode
*/
//#define MY_MQTT_CA_CERT
//#define MY_MQTT_FINGERPRINT

/**
* @def MY_MQTT_CLIENT_CERT
* @brief Set a client certificate to send to a MQTT server that requests one over TLS connection.
*
* This define is mandatory when you need connect MQTT over SSL/TLS.
* This define is mandatory when you need connect MQTT over SSL/TLS and client certificate is requested.
* Example: @code
*
* const char mqtt_client_cert[] PROGMEM = R"EOF(
Expand All @@ -1633,9 +1686,9 @@

/**
* @def MY_MQTT_CLIENT_KEY
* @brief Set a client private key to send to a MQTT server that requests one over TLS connection.
* @brief Set the client private key generated with the MY_MQTT_CLIENT_CERT.
*
* This define is mandatory when you need connect MQTT over SSL/TLS.
* This define is mandatory when you need connect MQTT over SSL/TLS and client certificate is requested.
* Example: @code
*
* const char mqtt_client_key[] PROGMEM = R"EOF(
Expand Down Expand Up @@ -2419,7 +2472,10 @@
#define MY_MQTT_CLIENT_ID
#define MY_MQTT_PUBLISH_TOPIC_PREFIX
#define MY_MQTT_SUBSCRIBE_TOPIC_PREFIX
#define MY_MQTT_CA_CERT
#define MY_MQTT_CA_CERT1
#define MY_MQTT_CA_CERT2
#define MY_MQTT_CA_CERT3
#define MY_MQTT_FINGERPRINT
#define MY_MQTT_CLIENT_CERT
#define MY_MQTT_CLIENT_KEY
#define MY_SIGNAL_REPORT_ENABLED
Expand Down
Loading

0 comments on commit e42abaa

Please sign in to comment.