Merge pull request #29 from RushikeshPatange/test/smol-toml

Feature : Added smol-toml Parser To Support User Friendly App Name
RushikeshPatange · Sep 28, 2023 · abdab20 · abdab20
2 parents 2de46fd + 394abec
commit abdab20
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/config/rainmaker_config.toml b/config/rainmaker_config.toml
@@ -12,6 +12,7 @@ image.esp32-s2 = "esp32s2_rainmaker_fan_merged.bin"
 image.esp32-c3 = "esp32c3_rainmaker_fan_merged.bin"
 android_app_url = "https://play.google.com/store/apps/details?id=com.espressif.rainmaker"
 ios_app_url = "https://apps.apple.com/app/esp-rainmaker/id1497491540"
+name = "My name is Rushi"
 
 [RainMaker-GPIO]
 chipsets = ["ESP32", "ESP32-S2", "ESP32-C3"]

diff --git a/index.html b/index.html
@@ -431,7 +431,6 @@ <h4 class=" mb-4" style="color: #e63f36;"><b>Publish your own firmware apps</b><
         <script src="node_modules/xterm-addon-fit/lib/xterm-addon-fit.js"></script>
         <script src="node_modules/crypto-js/crypto-js.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/pako/2.0.3/pako.js"></script>
-        <script type="text/javascript" src="node_modules/toml-js/src/toml.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"></script>
 
         <script src="js/index.js" type="module"></script>

diff --git a/js/index.js b/js/index.js
@@ -30,6 +30,8 @@ let resizeTimeout = false;
 
 import * as utilities from "./utils.js";
 import * as esptooljs from "../node_modules/esptool-js/bundle.js";
+import * as toml from '../node_modules/smol-toml/dist/index.js';
+
 const ESPLoader = esptooljs.ESPLoader;
 const Transport = esptooljs.Transport;
 
@@ -178,7 +180,7 @@ function populateSupportedChipsets(deviceConfig) {
         inputElement.setAttribute("class", "form-check-input");
         inputElement.name = "chipType";
         inputElement.id = "radio-" + chipset;
-        inputElement.value = deviceConfig["image." + chipset.toLowerCase()];
+        inputElement.value = deviceConfig["image"][chipset.toLowerCase()];
         if (chipset.toLowerCase() === chip.toLowerCase())
             inputElement.checked = true;
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
 	"dependencies": {
 		"crypto-js": "^4.1.1",
 		"esptool-js": "^0.3.0",
-		"toml-js": "^0.0.8",
+		"smol-toml": "^1.1.2",
 		"xterm": "^4.17.0",
 		"xterm-addon-fit": "^0.5.0"
 	}