Updates.

SmingHub · Dec 25, 2021 · 9a9e850 · 9a9e850
1 parent 64578ce
commit 9a9e850
Show file tree

Hide file tree

Showing 28 changed files with 261 additions and 1,024 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -369,4 +369,3 @@
 # END OF .gitmodules
 #
 #################################################################################################
-
diff --git a/Sming/Arch/Esp32/Components/esp32/sdk/config/debug b/Sming/Arch/Esp32/Components/esp32/sdk/config/debug
@@ -0,0 +1,29 @@
+#
+# DEBUG
+#
+
+# The bootloader logs all type of messages
+CONFIG_BOOTLOADER_LOG_LEVEL_NONE=
+CONFIG_BOOTLOADER_LOG_LEVEL_ERROR=
+CONFIG_BOOTLOADER_LOG_LEVEL_WARN=
+CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y
+CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG=
+CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE=
+CONFIG_BOOTLOADER_LOG_LEVEL=3
+
+# ESP-IDF logs all type of messages
+CONFIG_LOG_DEFAULT_LEVEL_NONE=
+CONFIG_LOG_DEFAULT_LEVEL_ERROR=
+CONFIG_LOG_DEFAULT_LEVEL_WARN=
+CONFIG_LOG_DEFAULT_LEVEL_INFO=y
+CONFIG_LOG_DEFAULT_LEVEL_DEBUG=
+CONFIG_LOG_DEFAULT_LEVEL_VERBOSE=
+CONFIG_LOG_DEFAULT_LEVEL=3
+
+# Sets watchpoint index 1 (the second of two) at the end of any task stack. This is the most accurate way to debug task stack overflows.
+CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
+
+# Used by TaskStat class to track task usage
+CONFIG_FREERTOS_USE_TRACE_FACILITY=y
+CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y
+CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y
diff --git a/Sming/Arch/Esp32/Components/esp32/sdk/config/release b/Sming/Arch/Esp32/Components/esp32/sdk/config/release
@@ -0,0 +1,22 @@
+#
+# RELEASE
+#
+
+# The bootloader logs only errors
+CONFIG_BOOTLOADER_LOG_LEVEL_NONE=
+CONFIG_BOOTLOADER_LOG_LEVEL_ERROR=y
+CONFIG_BOOTLOADER_LOG_LEVEL_WARN=
+CONFIG_BOOTLOADER_LOG_LEVEL_INFO=
+CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG=
+CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE=
+CONFIG_BOOTLOADER_LOG_LEVEL=1
+
+# ESP-IDF logs only errors
+CONFIG_LOG_DEFAULT_LEVEL_NONE=
+CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
+CONFIG_LOG_DEFAULT_LEVEL_WARN=
+CONFIG_LOG_DEFAULT_LEVEL_INFO=
+CONFIG_LOG_DEFAULT_LEVEL_DEBUG=
+CONFIG_LOG_DEFAULT_LEVEL_VERBOSE=
+CONFIG_LOG_DEFAULT_LEVEL=1
+
diff --git a/Sming/Arch/Esp32/Components/spi_flash/flashmem.cpp b/Sming/Arch/Esp32/Components/spi_flash/flashmem.cpp
@@ -8,7 +8,6 @@
  *
  ****/
 
-#include <sdkconfig.h>
 #include <esp_spi_flash.h>
 #include <soc/mmu.h>
 #include <esp_flash_partitions.h>

diff --git a/Sming/Arch/Esp32/Core/Interrupts.cpp b/Sming/Arch/Esp32/Core/Interrupts.cpp
@@ -15,9 +15,6 @@
 #include <esp_intr_alloc.h>
 #include <hal/gpio_ll.h>
 
-#define gpio_drive_cap_t uint32_t
-#include <hal/gpio_ll.h>
-
 constexpr unsigned MAX_INTERRUPTS = 40;
 
 static intr_handle_t interruptHandle = nullptr;

diff --git a/Sming/Arch/Esp32/Tools/install.sh b/Sming/Arch/Esp32/Tools/install.sh
diff --git a/Sming/Arch/Esp32/app.mk b/Sming/Arch/Esp32/app.mk
@@ -24,10 +24,5 @@ ifeq ($(CHIP_REV_MIN),)
 CHIP_REV_MIN := 0
 endif
 
-CHIP_REV_MIN := $(CONFIG_$(call ToUpper,$(ESP_VARIANT))_REV_MIN)
-ifeq ($(CHIP_REV_MIN),)
-CHIP_REV_MIN := 0
-endif
-
 $(TARGET_BIN): $(TARGET_OUT)
 	$(Q) $(ESPTOOL_CMDLINE) elf2image --min-rev $(CHIP_REV_MIN) --elf-sha256-offset 0xb0 $(flashimageoptions) -o $@ $<
diff --git a/Sming/Arch/Esp8266/Components/driver/include/driver/os_timer.h b/Sming/Arch/Esp8266/Components/driver/include/driver/os_timer.h
@@ -16,12 +16,6 @@
 
 #include <esp_system.h>
 
-// Disarmed
-#define OS_TIMER_DEFAULT()                                                                                             \
-	{                                                                                                                  \
-		.timer_next = (os_timer_t*)-1,                                                                                 \
-	}
-
 // Disarmed
 #define OS_TIMER_DEFAULT()                                                                                             \
 	{                                                                                                                  \

diff --git a/Sming/Arch/Esp8266/build.mk b/Sming/Arch/Esp8266/build.mk
@@ -4,10 +4,6 @@
 #
 ##############
 
-ifdef ESP_VARIANT
-override ESP_VARIANT :=
-endif
-
 CPPFLAGS			+= -DARCH_ESP8266
 CXXFLAGS			+= -fno-threadsafe-statics
 

diff --git a/Sming/Arch/Host/build.mk b/Sming/Arch/Host/build.mk
@@ -4,10 +4,6 @@
 #
 ##############
 
-ifdef ESP_VARIANT
-override ESP_VARIANT :=
-endif
-
 CPPFLAGS	+= -DARCH_HOST
 
 TOOLSPEC 	:=

diff --git a/Sming/Libraries/simpleRPC/component.mk b/Sming/Libraries/simpleRPC/component.mk
diff --git a/Sming/Libraries/simpleRPC/include/simpleRPC/.cs b/Sming/Libraries/simpleRPC/include/simpleRPC/.cs
diff --git a/Sming/Libraries/simpleRPC/include/simpleRPC/parser.h b/Sming/Libraries/simpleRPC/include/simpleRPC/parser.h
diff --git a/Sming/Libraries/simpleRPC/simpleRPC b/Sming/Libraries/simpleRPC/simpleRPC
diff --git a/Sming/Libraries/simpleRPC/simpleRPC.patch b/Sming/Libraries/simpleRPC/simpleRPC.patch
diff --git a/Sming/Libraries/simpleRPC/src/.cs b/Sming/Libraries/simpleRPC/src/.cs
Original file line number	Diff line number	Diff line change
Expand Up		@@ -369,4 +369,3 @@
		# END OF .gitmodules
		#
		#################################################################################################