Skip to content

Commit f4fd69e

Browse files
committed
MySensors 2.3.1 release
2 parents 15351cd + 121648f commit f4fd69e

File tree

245 files changed

+5598
-1865
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

245 files changed

+5598
-1865
lines changed

.ci/arduino.groovy

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!groovy
22
def buildArduino(config, String buildFlags, String sketch, String key) {
3-
def root = '/opt/arduino-1.8.5/'
3+
def root = '/opt/arduino-1.8.7/'
44
if (config.nightly_arduino_ide)
55
{
66
root = '/opt/arduino-nightly/'
@@ -50,6 +50,7 @@ def buildMySensorsMicro(config, sketches, String key) {
5050
sketches[sketch].path != config.library_root+'examples/GatewayESP8266OTA/GatewayESP8266OTA.ino' &&
5151
sketches[sketch].path != config.library_root+'examples/GatewayGSMMQTTClient/GatewayGSMMQTTClient.ino' &&
5252
sketches[sketch].path != config.library_root+'examples/GatewayESP32/GatewayESP32.ino' &&
53+
sketches[sketch].path != config.library_root+'examples/GatewayESP32OTA/GatewayESP32OTA.ino' &&
5354
sketches[sketch].path != config.library_root+'examples/GatewayESP32MQTTClient/GatewayESP32MQTTClient.ino' &&
5455
sketches[sketch].path != config.library_root+'examples/SensebenderGatewaySerial/SensebenderGatewaySerial.ino') {
5556
buildArduino(config, fqbn, sketches[sketch].path, key+'_MySensorsMicro')
@@ -85,6 +86,7 @@ def buildMySensorsGw(config, sketches, String key) {
8586
sketches[sketch].path != config.library_root+'examples/GatewayESP8266OTA/GatewayESP8266OTA.ino' &&
8687
sketches[sketch].path != config.library_root+'examples/GatewayGSMMQTTClient/GatewayGSMMQTTClient.ino' &&
8788
sketches[sketch].path != config.library_root+'examples/GatewayESP32/GatewayESP32.ino' &&
89+
sketches[sketch].path != config.library_root+'examples/GatewayESP32OTA/GatewayESP32OTA.ino' &&
8890
sketches[sketch].path != config.library_root+'examples/GatewayESP32MQTTClient/GatewayESP32MQTTClient.ino' &&
8991
sketches[sketch].path != config.library_root+'examples/GatewaySerialRS485/GatewaySerialRS485.ino' &&
9092
sketches[sketch].path != config.library_root+'examples/MotionSensorRS485/MotionSensorRS485.ino') {
@@ -119,6 +121,7 @@ def buildArduinoUno(config, sketches, String key) {
119121
sketches[sketch].path != config.library_root+'examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino' &&
120122
sketches[sketch].path != config.library_root+'examples/GatewayESP8266OTA/GatewayESP8266OTA.ino' &&
121123
sketches[sketch].path != config.library_root+'examples/GatewayESP32/GatewayESP32.ino' &&
124+
sketches[sketch].path != config.library_root+'examples/GatewayESP32OTA/GatewayESP32OTA.ino' &&
122125
sketches[sketch].path != config.library_root+'examples/GatewayESP32MQTTClient/GatewayESP32MQTTClient.ino' &&
123126
sketches[sketch].path != config.library_root+'examples/SensebenderGatewaySerial/SensebenderGatewaySerial.ino') {
124127
buildArduino(config, fqbn, sketches[sketch].path, key+'_ArduinoUno')
@@ -152,6 +155,7 @@ def buildArduinoMega(config, sketches, String key) {
152155
sketches[sketch].path != config.library_root+'examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino' &&
153156
sketches[sketch].path != config.library_root+'examples/GatewayESP8266OTA/GatewayESP8266OTA.ino' &&
154157
sketches[sketch].path != config.library_root+'examples/GatewayESP32/GatewayESP32.ino' &&
158+
sketches[sketch].path != config.library_root+'examples/GatewayESP32OTA/GatewayESP32OTA.ino' &&
155159
sketches[sketch].path != config.library_root+'examples/GatewayESP32MQTTClient/GatewayESP32MQTTClient.ino' &&
156160
sketches[sketch].path != config.library_root+'examples/SensebenderGatewaySerial/SensebenderGatewaySerial.ino') {
157161
buildArduino(config, fqbn, sketches[sketch].path, key+'_ArduinoMega')
@@ -185,6 +189,7 @@ def buildSTM32F1(config, sketches, String key) {
185189
sketches[sketch].path != config.library_root+'examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino' &&
186190
sketches[sketch].path != config.library_root+'examples/GatewayESP8266OTA/GatewayESP8266OTA.ino' &&
187191
sketches[sketch].path != config.library_root+'examples/GatewayESP32/GatewayESP32.ino' &&
192+
sketches[sketch].path != config.library_root+'examples/GatewayESP32OTA/GatewayESP32OTA.ino' &&
188193
sketches[sketch].path != config.library_root+'examples/GatewayESP32MQTTClient/GatewayESP32MQTTClient.ino' &&
189194
sketches[sketch].path != config.library_root+'examples/SensebenderGatewaySerial/SensebenderGatewaySerial.ino') {
190195
buildArduino(config, fqbn, sketches[sketch].path, key+'_STM32F1')
@@ -210,7 +215,7 @@ def buildSTM32F1(config, sketches, String key) {
210215
}
211216

212217
def buildESP8266(config, sketches, String key) {
213-
def fqbn = '-fqbn=esp8266:esp8266:generic:CpuFrequency=80,ResetMethod=ck,CrystalFreq=26,FlashFreq=40,FlashMode=qio,FlashSize=512K0,led=2,LwIPVariant=v2mss536,Debug=Disabled,DebugLevel=None____,FlashErase=none,UploadSpeed=115200'
218+
def fqbn = '-fqbn=esp8266:esp8266:generic:CpuFrequency=80,VTable=flash,ResetMethod=ck,CrystalFreq=26,FlashFreq=40,FlashMode=qio,FlashSize=512K0,led=2,LwIPVariant=v2mss536,Debug=Disabled,DebugLevel=None____,FlashErase=none,UploadSpeed=115200'
214219
config.pr.setBuildStatus(config, 'PENDING', 'Toll gate (ESP8266 - '+key+')', 'Building...', '${BUILD_URL}flowGraphTable/')
215220
try {
216221
for (sketch = 0; sketch < sketches.size(); sketch++) {
@@ -222,6 +227,7 @@ def buildESP8266(config, sketches, String key) {
222227
sketches[sketch].path != config.library_root+'examples/GatewayW5100MQTTClient/GatewayW5100MQTTClient.ino' &&
223228
sketches[sketch].path != config.library_root+'examples/GatewayGSMMQTTClient/GatewayGSMMQTTClient.ino' &&
224229
sketches[sketch].path != config.library_root+'examples/GatewayESP32/GatewayESP32.ino' &&
230+
sketches[sketch].path != config.library_root+'examples/GatewayESP32OTA/GatewayESP32OTA.ino' &&
225231
sketches[sketch].path != config.library_root+'examples/GatewayESP32MQTTClient/GatewayESP32MQTTClient.ino' &&
226232
sketches[sketch].path != config.library_root+'examples/MotionSensorRS485/MotionSensorRS485.ino' &&
227233
sketches[sketch].path != config.library_root+'examples/SensebenderGatewaySerial/SensebenderGatewaySerial.ino' &&
@@ -309,6 +315,7 @@ def buildnRF5(config, sketches, String key) {
309315
sketches[sketch].path != config.library_root+'examples/GatewayGSMMQTTClient/GatewayGSMMQTTClient.ino' &&
310316
sketches[sketch].path != config.library_root+'examples/GatewayESP8266OTA/GatewayESP8266OTA.ino' &&
311317
sketches[sketch].path != config.library_root+'examples/GatewayESP32/GatewayESP32.ino' &&
318+
sketches[sketch].path != config.library_root+'examples/GatewayESP32OTA/GatewayESP32OTA.ino' &&
312319
sketches[sketch].path != config.library_root+'examples/GatewayESP32MQTTClient/GatewayESP32MQTTClient.ino' &&
313320
sketches[sketch].path != config.library_root+'examples/GatewaySerialRS485/GatewaySerialRS485.ino' &&
314321
sketches[sketch].path != config.library_root+'examples/GatewayW5100/GatewayW5100.ino' &&

.ci/butler.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ fi
8181
astyle --options=.mystools/astyle/config/style.cfg -nq --recursive "*.h" "*.c" "*.cpp"
8282
git diff > restyling.patch
8383
if [ -s restyling.patch ]; then
84-
echo "I am afraid your coding style is not entirely in line with the MySensors preffered style.<b><br>A mail with a patch has been sent to you that, if applied to your PR, will make it follow the MySensors coding standards.</b><br>" >> butler.html
84+
echo "I am afraid your coding style is not entirely in line with the MySensors prefered style.<b><br>A mail with a patch has been sent to you that, if applied to your PR, will make it follow the MySensors coding standards.</b><br>" >> butler.html
8585
echo "You can apply the patch using:<br>" >> butler.html
8686
echo "git apply restyling.patch<br>" >> butler.html
8787
echo "<br>" >> butler.html

Documentation/mainpage.dox

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Are you a core/library developer, see @ref internals
77

88
@copyright (C) 2013-2018 Sensnology AB
99

10-
Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors
10+
Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors
1111
*/
1212

1313
/*

Documentation/styles/html/footerFile.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!--END GENERATE_TREEVIEW-->
1313
<!--BEGIN !GENERATE_TREEVIEW-->
1414
<hr class="footer"/><address class="footer"><small>
15-
Copyright (C) 2013-2017 Sensnology AB. $generatedby <a href="http://www.doxygen.org/index.html">doxygen</a>
15+
Copyright (C) 2013-2018 Sensnology AB. $generatedby <a href="http://www.doxygen.org/index.html">doxygen</a>
1616
</a> $doxygenversion
1717
</small></address>
1818
<!--END !GENERATE_TREEVIEW-->

0 commit comments

Comments
 (0)