Remove Solo1 support + validate HTTPS certs on HTTPS requests (#443)
* Use esp_crt_bundle for HTTPS requests * Remove Solo1 support
This commit is contained in:
@@ -8,8 +8,6 @@ from pathlib import Path
|
||||
|
||||
def get_board_name(env):
|
||||
board = env.get('BOARD_MCU')
|
||||
if env.get('BOARD') == 'esp32-solo1':
|
||||
board = env.get('BOARD').replace('-', '')
|
||||
return board
|
||||
|
||||
def create_target_dir(env):
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
import re, shutil, os
|
||||
from datetime import datetime, timezone
|
||||
|
||||
if not os.path.exists('src/networkDevices/'):
|
||||
os.mkdir('src/networkDevices')
|
||||
|
||||
shutil.copy("../src/main.cpp", "src/main.cpp")
|
||||
shutil.copy("../src/Config.h", "src/Config.h")
|
||||
shutil.copy("../src/Logger.h", "src/Logger.h")
|
||||
shutil.copy("../src/NukiNetwork.h", "src/NukiNetwork.h")
|
||||
shutil.copy("../src/Ota.h", "src/Ota.h")
|
||||
shutil.copy("../src/PreferencesKeys.h", "src/PreferencesKeys.h")
|
||||
shutil.copy("../src/RestartReason.h", "src/RestartReason.h")
|
||||
shutil.copy("../src/WebCfgServer.h", "src/WebCfgServer.h")
|
||||
shutil.copy("../src/WebCfgServerConstants.h", "src/WebCfgServerConstants.h")
|
||||
|
||||
shutil.copy("../src/Logger.cpp", "src/Logger.cpp")
|
||||
shutil.copy("../src/NukiNetwork.cpp", "src/NukiNetwork.cpp")
|
||||
shutil.copy("../src/Ota.cpp", "src/Ota.cpp")
|
||||
shutil.copy("../src/WebCfgServer.cpp", "src/WebCfgServer.cpp")
|
||||
|
||||
shutil.copy("../src/networkDevices/EthLan8720Device.h", "src/networkDevices/EthLan8720Device.h")
|
||||
shutil.copy("../src/networkDevices/IPConfiguration.h", "src/networkDevices/IPConfiguration.h")
|
||||
shutil.copy("../src/networkDevices/NetworkDevice.h", "src/networkDevices/NetworkDevice.h")
|
||||
shutil.copy("../src/networkDevices/W5500Device.h", "src/networkDevices/W5500Device.h")
|
||||
shutil.copy("../src/networkDevices/WifiDevice.h", "src/networkDevices/WifiDevice.h")
|
||||
|
||||
shutil.copy("../src/networkDevices/EthLan8720Device.cpp", "src/networkDevices/EthLan8720Device.cpp")
|
||||
shutil.copy("../src/networkDevices/IPConfiguration.cpp", "src/networkDevices/IPConfiguration.cpp")
|
||||
shutil.copy("../src/networkDevices/NetworkDevice.cpp", "src/networkDevices/NetworkDevice.cpp")
|
||||
shutil.copy("../src/networkDevices/W5500Device.cpp", "src/networkDevices/W5500Device.cpp")
|
||||
shutil.copy("../src/networkDevices/WifiDevice.cpp", "src/networkDevices/WifiDevice.cpp")
|
||||
|
||||
regex = r"\#define NUKI_HUB_DATE \"(.*)\""
|
||||
content_new = ""
|
||||
|
||||
with open ('src/Config.h', 'r' ) as readfile:
|
||||
file_content = readfile.read()
|
||||
content_new = re.sub(regex, "#define NUKI_HUB_DATE \"" + datetime.now(timezone.utc).strftime("%Y-%m-%d") + "\"", file_content, flags = re.M)
|
||||
|
||||
with open('src/Config.h', 'w') as writefile:
|
||||
writefile.write(content_new)
|
||||
@@ -63,23 +63,4 @@ board = nuki-esp32-s3
|
||||
|
||||
[env:updater_esp32-c6]
|
||||
extends = env:updater_esp32dev
|
||||
board = esp32-c6-devkitm-1
|
||||
|
||||
[env:updater_esp32solo1]
|
||||
platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.03/platform-espressif32-2023.10.03.zip
|
||||
framework = arduino
|
||||
board = esp32-solo1
|
||||
extra_scripts =
|
||||
pre:pio_package_pre_solo1.py
|
||||
post:pio_package.py
|
||||
build_flags =
|
||||
${env.build_flags}
|
||||
-DFRAMEWORK_ARDUINO_SOLO1
|
||||
lib_deps =
|
||||
AsyncTCP=symlink://../lib/AsyncTCP
|
||||
Ethernet=symlink://../lib/Ethernet
|
||||
HTTPClient=symlink://../lib/HTTPClient
|
||||
WebServer=symlink://../lib/WebServer
|
||||
WiFiManager=symlink://../lib/WiFiManager
|
||||
lib_ignore =
|
||||
NetworkClientSecure
|
||||
board = esp32-c6-devkitm-1
|
||||
Reference in New Issue
Block a user