Merge branch 'master' into Test_Firmware_WINC_1.4.2
# Conflicts: # ChaletLora.X/Source/WiFiCtrl.c # ChaletLora.X/dist/ChaletDuinoV2_795F512H_/production/ChaletLora.X.production.elf # ChaletLora.X/dist/ChaletDuinoV2_795F512H_/production/ChaletLora.X.production.hex # ChaletLora.X/dist/ChaletDuinoV2_795F512H_/production/ChaletLora.X.production.map
This commit is contained in:
commit
02de58133a