Merge branch 'main' of https://github.com/makerbase-mks/MKS-TinyBee

makerbase-mks · Jan 25, 2022 · 61ad5ad · 61ad5ad
2 parents 7fe665b + 5c64559
commit 61ad5ad
Show file tree

Hide file tree

Showing 6 changed files with 201 additions and 192 deletions.
diff --git a/firmware/mks tinybee marlin/.pio/build/project.checksum b/firmware/mks tinybee marlin/.pio/build/project.checksum
@@ -1 +1,5 @@
-ee33a516e08c42328dd98626154bbe5c323c7362
+<<<<<<< HEAD
+ee33a516e08c42328dd98626154bbe5c323c7362
+=======
+3fdd5d8849b51d47932d7c94fd628d6dfb478bf7
+>>>>>>> 5c64559d2962bd664e1fbe4c1e7298be0fb7c8f8
diff --git a/firmware/mks tinybee marlin/.pio/libdeps/mks_tinybee/ESP3DLib/src/esp3dlib.cpp b/firmware/mks tinybee marlin/.pio/libdeps/mks_tinybee/ESP3DLib/src/esp3dlib.cpp
@@ -42,6 +42,8 @@ void ESP3DLibTaskfn( void * parameter )
 {
     Esp3DLibConfig::wait(DELAY_START_ESP3D);  // Yield to other tasks
     WiFiConfig::begin();
+
+
     for(;;) {
         WiFiConfig::handle();
         Esp3DLibConfig::wait(0);  // Yield to other tasks

diff --git a/firmware/mks tinybee marlin/.vscode/c_cpp_properties.json b/firmware/mks tinybee marlin/.vscode/c_cpp_properties.json
diff --git a/firmware/mks tinybee marlin/.vscode/launch.json b/firmware/mks tinybee marlin/.vscode/launch.json
@@ -12,9 +12,9 @@
             "type": "platformio-debug",
             "request": "launch",
             "name": "PIO Debug",
-            "executable": "f:/github/MKS-TinyBee/firmware/mks tinybee marlin/.pio/build/mks_tinybee/firmware.elf",
+            "executable": "f:/sola_github/MKS_Robin_Nano/esp_tinyBee/MKS-TinyBee/firmware/mks tinybee marlin/.pio/build/mks_tinybee/firmware.elf",
             "projectEnvName": "mks_tinybee",
-            "toolchainBinDir": "C:/Users/Administrator/.platformio/packages/toolchain-xtensa32/bin",
+            "toolchainBinDir": "C:/Users/SOLA/.platformio/packages/toolchain-xtensa32/bin",
             "internalConsoleOptions": "openOnSessionStart",
             "preLaunchTask": {
                 "type": "PlatformIO",
@@ -25,18 +25,18 @@
             "type": "platformio-debug",
             "request": "launch",
             "name": "PIO Debug (skip Pre-Debug)",
-            "executable": "f:/github/MKS-TinyBee/firmware/mks tinybee marlin/.pio/build/mks_tinybee/firmware.elf",
+            "executable": "f:/sola_github/MKS_Robin_Nano/esp_tinyBee/MKS-TinyBee/firmware/mks tinybee marlin/.pio/build/mks_tinybee/firmware.elf",
             "projectEnvName": "mks_tinybee",
-            "toolchainBinDir": "C:/Users/Administrator/.platformio/packages/toolchain-xtensa32/bin",
+            "toolchainBinDir": "C:/Users/SOLA/.platformio/packages/toolchain-xtensa32/bin",
             "internalConsoleOptions": "openOnSessionStart"
         },
         {
             "type": "platformio-debug",
             "request": "launch",
             "name": "PIO Debug (without uploading)",
-            "executable": "f:/github/MKS-TinyBee/firmware/mks tinybee marlin/.pio/build/mks_tinybee/firmware.elf",
+            "executable": "f:/sola_github/MKS_Robin_Nano/esp_tinyBee/MKS-TinyBee/firmware/mks tinybee marlin/.pio/build/mks_tinybee/firmware.elf",
             "projectEnvName": "mks_tinybee",
-            "toolchainBinDir": "C:/Users/Administrator/.platformio/packages/toolchain-xtensa32/bin",
+            "toolchainBinDir": "C:/Users/SOLA/.platformio/packages/toolchain-xtensa32/bin",
             "internalConsoleOptions": "openOnSessionStart",
             "loadMode": "manual"
         }

diff --git a/firmware/webUI/index.html.gz b/firmware/webUI/index.html.gz
diff --git a/firmware/webUI/readme.md b/firmware/webUI/readme.md
@@ -0,0 +1,3 @@
+# Instruction
+
+Here is the data package of the webUI, which uses the .gz format. When using it for the first time, you need to upload the webUI to the motherboard, you can upload it on the web page, and you need to reopen the web page after uploading.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Instruction

		Here is the data package of the webUI, which uses the .gz format. When using it for the first time, you need to upload the webUI to the motherboard, you can upload it on the web page, and you need to reopen the web page after uploading.