Merge branch 'mega' of https://github.com/letscontrolit/ESPEasy into feature/P141-add-pcd8544-nokia-5110-display

This commit is contained in:
Ton Huisman
2022-08-28 17:04:16 +02:00
104 changed files with 1047 additions and 1016 deletions
+4 -4
View File
@@ -17,10 +17,10 @@ lib_ignore = ${core_2_7_4_alt_wifi.lib_ignore}
[core302_platform]
build_flags = ${core_4_0_1.build_flags}
platform = ${core_4_0_1.platform}
platform_packages = ${core_4_0_1.platform_packages}
lib_ignore = ${core_4_0_1.lib_ignore}
build_flags = ${core_stage.build_flags}
platform = ${core_stage.platform}
platform_packages = ${core_stage.platform_packages}
lib_ignore = ${core_stage.lib_ignore}
[beta_platform_2ndheap]