Merge pull request #29 from playground/esp-now-mesh

update firmware for mesh

firmwares/esp-mesh-bluetooth/manifest.json

@@ -0,0 +1,14 @@
+{
+  "name": "Liquid Prep Web Tools",
+  "builds": [
+    {
+      "chipFamily": "ESP32",
+      "improv": false,
+      "parts": [
+        { "path": "bootloader.bin", "offset": 4096 },
+        { "path": "partitions.bin", "offset": 32768 },
+        { "path": "firmware.bin", "offset": 65536 }
+      ]
+    }
+  ]
+}

firmwares/esp-now-gateway/backup/config.json

@@ -0,0 +1,15 @@
+{
+  "uuid": {
+    "SERVICE_UUID": "4fafc201-1fb5-459e-8fcc-c5c9c331914b",
+    "CHARACTERISTIC_UUID": "beb5483e-36e1-4688-b7f5-ea07361b26a8"
+  },
+  "airValue": 3440,
+  "waterValue": 1803,
+  "sensorPin": 32,
+  "wsserver": "192.168.1.28",
+  "wsport": 3000,
+  "espInterval": 80000,
+  "wifiChannel": 11,
+  "receiverAddress": "",
+  "senderAddress": ""
+}

firmwares/esp-now-gateway/backup/manifest.json

@@ -0,0 +1,14 @@
+{
+  "name": "Liquid Prep Web Tools",
+  "builds": [
+    {
+      "chipFamily": "ESP32",
+      "improv": false,
+      "parts": [
+        { "path": "bootloader.bin", "offset": 4096 },
+        { "path": "partitions.bin", "offset": 32768 },
+        { "path": "firmware.bin", "offset": 65536 }
+      ]
+    }
+  ]
+}

firmwares/esp-now-gateway/backup/page.json

@@ -0,0 +1,126 @@
+[
+  {
+    "title": "Config",
+    "uri": "/update_config",
+    "menu": true,
+    "element": [
+      {
+        "name": "header",
+        "type": "ACText"
+      },
+      {
+        "name": "caption1",
+        "type": "ACText",
+        "value": "Air value"
+      },
+      {
+        "name": "airValue",
+        "type": "ACInput"
+      },
+      {
+        "name": "caption2",
+        "type": "ACText",
+        "value": "Water value"
+      },
+      {
+        "name": "waterValue",
+        "type": "ACInput"
+      },
+      {
+        "name": "caption3",
+        "type": "ACText",
+        "value": "Pin"
+      },
+      {
+        "name": "sensorPin",
+        "type": "ACInput"
+      },
+      {
+        "name": "caption4",
+        "type": "ACText",
+        "value": "WebSocket Server"
+      },
+      {
+        "name": "wsserver",
+        "type": "ACInput"
+      },
+      {
+        "name": "caption5",
+        "type": "ACText",
+        "value": "WebSocket Port"
+      },
+      {
+        "name": "wsport",
+        "type": "ACInput"
+      },
+      {
+        "name": "caption6",
+        "type": "ACText",
+        "value": "Receiver Mac Address"
+      },
+      {
+        "name": "receiverMac",
+        "type": "ACInput"
+      },
+      {
+        "name": "caption7",
+        "type": "ACText",
+        "value": "Sender Mac Address"
+      },
+      {
+        "name": "senderMac",
+        "type": "ACInput"
+      },
+      {
+        "name": "caption8",
+        "type": "ACText",
+        "value": "Interval"
+      },
+      {
+        "name": "espInterval",
+        "type": "ACInput"
+      },
+      {
+        "name": "save",
+        "type": "ACSubmit",
+        "value": "SAVE",
+        "uri": "/save_config"
+      }
+    ]
+  },
+  {
+    "uri": "/save_config",
+    "title": "Save configuration",
+    "menu": false,
+    "element": [
+      {
+        "name": "results",
+        "type": "ACText",
+        "value": ""
+      }
+    ]
+  },
+  {
+    "uri": "/",
+    "title": "Moisture reading",
+    "menu": false,
+    "element": [
+      {
+        "name": "moisture",
+        "type": "ACText",
+        "value": "Moisture:  "
+      },
+      {
+        "name": "results",
+        "type": "ACText",
+        "value": "..."
+      },
+      {
+        "name": "save",
+        "type": "ACSubmit",
+        "value": "Read again...",
+        "uri": "/"
+      }
+    ]
+  }
+]    

index-backup.json

@@ -0,0 +1,10 @@
+{
+  "0": "",
+  "1": "<br>\n<i>Note:  Depending on the state your ESP32 is in, you may have to hold down the \"BOOT button\" to put it in upload mode</i>\n</p>\n<p>\n    Once the installation is completed, you should see your ESP32-LiquidPrep listed via bluetooth.  You can also allow your ESP32 to join your local WiFi by first\n    joining the \"esp32ap\".  After joining the \"esp32ap\", a portal should pop up.  If the portal doesn't pop open, you can go to it in your browser\n    with this ip address \"http://172.217.28.1/_ac/update\".  \n</p>\n<p id=\"downloadInfo\">Before changing to your Wifi, let's first download the following files to update the configurations.<br><ul><li>Download <a href='esp-now-gateway/config.json' download='config.json'>config.json</a></li><li>Download <a href='esp-now-gateway/page.json' download='page.json'>page.json</a></li><li>Got to http://yourip/_ac/update and upload both config.json and page.json</li><li>Reset</li></ul>   \n</p>\n<p>\n<p>Now let's go to http://172.217.28.1/_ac/config to make changes to the WiFi\n    \n</p>\n<p>\n    <i>(Recommended:  Uncheck \"Enable DHCP\" and assign it witha static ip)</i> then click \"Apply\" to save the new configuration.\n</p>\n<p>   \n    After it is saved successfully, join back to your home WiFi.\n    You can always go back to the Portal with the static ip address you have assigned to this ESP32.\n</p>\n<p>   For sensor calibration, go to Liquid Prep App and select the sensor you would like to calibrate  to adjust \"Air value\" and \"Water value\" as needed to calibrate the moisture sensor.  You would\n    want to get close to 0% for dry condition.\n    <br><br><i>Note:  DO NOT change the \"Pin\" value, leave it at 32</i>\n</p>\n\n<esp-web-install-button manifest=\"./firmwares/esp-now-gateway/manifest.json\"></esp-web-install-button>\n\n <p><img src='mesh.jpg'>",
+  "2": "<br>\n<i>Note:  Depending on the state your ESP32 is in, you may have to hold down the \"BOOT button\" to put it in upload mode</i><br><br>  By default, this esp mesh worker is set to use wifi channel 11 to broadcast sensor data.  If setting a fixed wifi channel on the router is not an option, you can update the wifi channel by broadcasting the new channel via bluetooth from the Liquid Prep App.\n</p>\n<p>\n <esp-web-install-button manifest=\"./firmwares/esp-mesh-bluetooth/manifest.json\"></esp-web-install-button>\n\n <p><img src='mesh.jpg'>",
+  "3": "<br>\n<i>Note:  Depending on the state your ESP32 is in, you may have to hold down the \"BOOT button\" to put it in upload mode</i><br><br>  By default, this esp mesh worker is set to use wifi channel 11 to broadcast sensor data.  If setting a fixed wifi channel on the router is not an option, you can update the wifi channel by broadcasting the new channel via bluetooth from the Liquid Prep App.\n</p>\n<p>\n <esp-web-install-button manifest=\"./firmwares/esp-now-mesh/manifest.json\"></esp-web-install-button>\n\n <p><img src='mesh.jpg'>",
+  "4": "<br>\n<i>Note:  Depending on the state your ESP32 is in, you may have to hold down the \"BOOT button\" to put it in upload mode</i>\n</p>\n<p>\n    Once the installation is completed, you should see your ESP32-LiquidPrep listed via bluetooth.  You can also allow your ESP32 to join your local WiFi by first\n    joining the \"esp32ap\".  After joining the \"esp32ap\", a portal should pop up.  If the portal doesn't pop open, you can go to it in your browser\n    with this ip address \"http://172.217.28.1/_ac/update\".  \n</p>\n<p id=\"downloadInfo\">Before changing to your Wifi, let's first download the following files to update the configurations.\n   \n</p>\n<p>\n<p>Now let's go to http://172.217.28.1/_ac/config to make changes to the WiFi\n    \n</p>\n<p>\n    <i>(Recommended:  Uncheck \"Enable DHCP\" and assign it witha static ip)</i> then click \"Apply\" to save the new configuration.\n</p>\n<p>   \n    After it is saved successfully, join back to your home WiFi.\n    You can always go back to the Portal with the static ip address you have assigned to this ESP32.\n</p>\n<p>    \n    For sensor calibration, go to http://yourip/update_config to adjust \"Air value\" and \"Water value\" as needed to calibrate the moisture sensor.  You would\n    want to get close to 0% for dry condition.\n    <br><i>Note:  DO NOT change the \"Pin\" value, leave it at 32</i>\n</p>\n\n<esp-web-install-button manifest=\"./firmwares/wifi-ble/manifest.json\"></esp-web-install-button>\n\n",
+  "5": "<br>\n<i>Note:  Depending on the state your ESP32 is in, you may have to hold down the \"BOOT button\" to put it in upload mode</i>\n</p>\n<p>\n <esp-web-install-button manifest=\"./firmwares/calibrate/manifest.json\"></esp-web-install-button>\n\n",
+  "6": "<br>\n<i>Note:  Depending on the state your ESP32 is in, you may have to hold down the \"BOOT button\" to put it in upload mode</i>\n</p>\n<p>\n <esp-web-install-button manifest=\"./firmwares/esp-now/manifest.json\"></esp-web-install-button>\n\n"
+
+}

index.html

@@ -18,10 +18,7 @@ <h1>Liquid Prep Web Tools</h1>
         <select id="firmwareSelect">
             <option value="0">Select your Firmware</option>
             <option value="1">ESP-Now-Gateway</option>
-            <option value="2">ESP-Now-Mesh</option>
-            <option value="3">WiFi-BLE</option>
-            <option value="4">Websocket-BLE</option>
-            <option value="5">Calibrate</option>
+            <option value="2">ESP-Mesh-Bluetooth</option>
         </select>
 
         <br>

index.json

@@ -1,10 +1,6 @@
 {
     "0": "",
     "1": "<br>\n<i>Note:  Depending on the state your ESP32 is in, you may have to hold down the \"BOOT button\" to put it in upload mode</i>\n</p>\n<p>\n    Once the installation is completed, you should see your ESP32-LiquidPrep listed via bluetooth.  You can also allow your ESP32 to join your local WiFi by first\n    joining the \"esp32ap\".  After joining the \"esp32ap\", a portal should pop up.  If the portal doesn't pop open, you can go to it in your browser\n    with this ip address \"http://172.217.28.1/_ac/update\".  \n</p>\n<p id=\"downloadInfo\">Before changing to your Wifi, let's first download the following files to update the configurations.<br><ul><li>Download <a href='esp-now-gateway/config.json' download='config.json'>config.json</a></li><li>Download <a href='esp-now-gateway/page.json' download='page.json'>page.json</a></li><li>Got to http://yourip/_ac/update and upload both config.json and page.json</li><li>Reset</li></ul>   \n</p>\n<p>\n<p>Now let's go to http://172.217.28.1/_ac/config to make changes to the WiFi\n    \n</p>\n<p>\n    <i>(Recommended:  Uncheck \"Enable DHCP\" and assign it witha static ip)</i> then click \"Apply\" to save the new configuration.\n</p>\n<p>   \n    After it is saved successfully, join back to your home WiFi.\n    You can always go back to the Portal with the static ip address you have assigned to this ESP32.\n</p>\n<p>   For sensor calibration, go to Liquid Prep App and select the sensor you would like to calibrate  to adjust \"Air value\" and \"Water value\" as needed to calibrate the moisture sensor.  You would\n    want to get close to 0% for dry condition.\n    <br><br><i>Note:  DO NOT change the \"Pin\" value, leave it at 32</i>\n</p>\n\n<esp-web-install-button manifest=\"./firmwares/esp-now-gateway/manifest.json\"></esp-web-install-button>\n\n <p><img src='mesh.jpg'>",
-    "2": "<br>\n<i>Note:  Depending on the state your ESP32 is in, you may have to hold down the \"BOOT button\" to put it in upload mode</i><br><br>  By default, this esp mesh worker is set to use wifi channel 11 to broadcast sensor data.  If setting a fixed wifi channel on the router is not an option, you can update the wifi channel by broadcasting the new channel via bluetooth from the Liquid Prep App.\n</p>\n<p>\n <esp-web-install-button manifest=\"./firmwares/esp-now-mesh/manifest.json\"></esp-web-install-button>\n\n <p><img src='mesh.jpg'>",
-    "3": "<br>\n<i>Note:  Depending on the state your ESP32 is in, you may have to hold down the \"BOOT button\" to put it in upload mode</i>\n</p>\n<p>\n    Once the installation is completed, you should see your ESP32-LiquidPrep listed via bluetooth.  You can also allow your ESP32 to join your local WiFi by first\n    joining the \"esp32ap\".  After joining the \"esp32ap\", a portal should pop up.  If the portal doesn't pop open, you can go to it in your browser\n    with this ip address \"http://172.217.28.1/_ac/update\".  \n</p>\n<p id=\"downloadInfo\">Before changing to your Wifi, let's first download the following files to update the configurations.\n   \n</p>\n<p>\n<p>Now let's go to http://172.217.28.1/_ac/config to make changes to the WiFi\n    \n</p>\n<p>\n    <i>(Recommended:  Uncheck \"Enable DHCP\" and assign it witha static ip)</i> then click \"Apply\" to save the new configuration.\n</p>\n<p>   \n    After it is saved successfully, join back to your home WiFi.\n    You can always go back to the Portal with the static ip address you have assigned to this ESP32.\n</p>\n<p>    \n    For sensor calibration, go to http://yourip/update_config to adjust \"Air value\" and \"Water value\" as needed to calibrate the moisture sensor.  You would\n    want to get close to 0% for dry condition.\n    <br><i>Note:  DO NOT change the \"Pin\" value, leave it at 32</i>\n</p>\n\n<esp-web-install-button manifest=\"./firmwares/wifi-ble/manifest.json\"></esp-web-install-button>\n\n",
-    "4": "<br>\n<i>Note:  Depending on the state your ESP32 is in, you may have to hold down the \"BOOT button\" to put it in upload mode</i>\n</p>\n<p>\n <esp-web-install-button manifest=\"./firmwares/calibrate/manifest.json\"></esp-web-install-button>\n\n",
-    "5": "<br>\n<i>Note:  Depending on the state your ESP32 is in, you may have to hold down the \"BOOT button\" to put it in upload mode</i>\n</p>\n<p>\n <esp-web-install-button manifest=\"./firmwares/esp-now/manifest.json\"></esp-web-install-button>\n\n"
-
+    "2": "<br>\n<i>Note:  Depending on the state your ESP32 is in, you may have to hold down the \"BOOT button\" to put it in upload mode</i><br><br>  By default, this esp mesh worker is set to use wifi channel 11 to broadcast sensor data.  If setting a fixed wifi channel on the router is not an option, you can update the wifi channel by broadcasting the new channel via bluetooth from the Liquid Prep App.\n</p>\n<p>\n <esp-web-install-button manifest=\"./firmwares/esp-mesh-bluetooth/manifest.json\"></esp-web-install-button>\n\n <p><img src='mesh.jpg'>"
   }
 

package.json

@@ -0,0 +1 @@
+{}