Merge pull request #186 from mp-se/dev

Merge beta2
mp-se · Aug 10, 2024 · 6ccb19c · 6ccb19c
2 parents f9f6b32 + e9dcb0c
commit 6ccb19c
Show file tree

Hide file tree

Showing 43 changed files with 231 additions and 14 deletions.
diff --git a/bin/firmware.bin b/bin/firmware.bin
diff --git a/bin/firmware32.bin b/bin/firmware32.bin
diff --git a/bin/firmware32c3.bin b/bin/firmware32c3.bin
diff --git a/bin/firmware32lite.bin b/bin/firmware32lite.bin
diff --git a/bin/firmware32s2.bin b/bin/firmware32s2.bin
diff --git a/bin/firmware32s3.bin b/bin/firmware32s3.bin
diff --git a/html/app.js.gz b/html/app.js.gz
diff --git a/html/favicon.ico.gz b/html/favicon.ico.gz
diff --git a/platformio.ini b/platformio.ini
@@ -15,8 +15,8 @@ include_dir = lib
 [common_env_data]
 upload_speed = 921600
 monitor_speed =  115200
-platform = espressif8266 @ 4.2.1
-platform32 = espressif32 @6.6.0
+platform = espressif8266@4.2.1
+platform32 = espressif32@6.6.0
 build_unflags = 
 build_flags = 
 	-Wl,-Map,output.map
@@ -26,7 +26,7 @@ build_flags =
 	#-D COLLECT_PERFDATA
 	-D USE_LITTLEFS=true
 	-D CFG_APPVER="\"2.0.0\""
-	-D CFG_GITREV=\""beta-1\""
+	-D CFG_GITREV=\""beta-2\""
 	#-D ENABLE_REMOTE_UI_DEVELOPMENT
 	#!python script/git_rev.py 
 lib_deps =
@@ -41,7 +41,7 @@ lib_deps =
 	https://github.com/mp-se/arduino-mqtt#v2.5.2
 	https://github.com/mp-se/ESPAsyncWebServer#0.1.1
 	https://github.com/mp-se/ESPAsyncTCP#0.1.0
-	https://github.com/mp-se/espframework/#1.0.0
+	https://github.com/mp-se/espframework/#1.0.1
 lib_deps32 = 
 	https://github.com/mp-se/NimBLE-Arduino#1.4.1
 extra_scripts =  
@@ -51,6 +51,7 @@ html_files =
 	html/index.html
 	html/app.js.gz
 	html/app.css.gz
+	html/favicon.ico.gz
 
 [env:gravity-release]
 upload_speed = ${common_env_data.upload_speed}

diff --git a/src_docs/source/conf.py b/src_docs/source/conf.py
@@ -22,7 +22,7 @@
 author = 'Magnus Persson'
 
 # The full version, including alpha/beta/rc tags
-release = '2.0.0-beta1'
+release = '2.0.0-beta2'
 
 # -- General configuration ---------------------------------------------------
 
@@ -48,7 +48,7 @@
 #
 html_theme = 'furo'
 html_logo = "images/gravitymon_logo.png"
-html_title = "GravityMon v2.0.0-beta1"
+html_title = "GravityMon v2.0.0"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

diff --git a/src_docs/source/configuration.rst b/src_docs/source/configuration.rst
@@ -526,7 +526,6 @@ Push - Bluetooth
   - **TILT iBeacon**: Standard tilt data transmission. Data: Gravity and Temperature   
   - **TILT PRO iBeacon**: Higher accuracy tilt data transmission. Data: Gravity and Temperature   
   - **GM iBeacon**: Higher accuracy. Data: Gravity, Temperature, ID, Angle
-  - **GM SERVICE**: Client can read standard iSpindle JSON payload, require connection with device.
   - **GM EDDYSTONE**: Beacon format that requires active scanning by the client. Data: Gravity, ID, Temperature and Angle 
 
 Other

diff --git a/src_docs/source/gateway.rst b/src_docs/source/gateway.rst
@@ -0,0 +1,209 @@
+.. _gateway:
+
+Gateway
+#######
+
+.. note::
+
+  This documentation reflects **v0.4.0 beta 1**. Last updated 2024-08-02
+
+GravityMon Gateway is an separate project that can act as a proxy between your GravityMon devices and services. It can:
+
+* Receive the new GravityMon 2.0 BLE formats and transform these to HTTP Post/Get, InfluxDB or MQTT requests
+* Receive data via direct WiFi connection (Direct connection between the device and the gateway) and relay this data to defined endpoints. 
+
+Hardware 
+========
+
+The main supported hardware is ESP32s3 PRO with a TFT 
+
+* `Lolin ESP32s3 PRO <https://www.wemos.cc/en/latest/s3/s3_pro.html>`_ 
+* `Lolin TFT <https://www.wemos.cc/en/latest/d1_mini_shield/tft_2_4.html>`_ 
+* Cable to connect the display with the ESP
+
+There is also a build for the ESP32 PRO (Tiltbridge Hardware setup) but that does not support the new BLE formats since that board does not have BLE 5 support.
+
+* `Releases for GravityMon Gateway <https://github.com/mp-se/gravitymon-gateway/releases>`_ 
+
+Most of the UI is copied from GravityMon with a few alterations so the documentation here will only point out the differences.
+
+.. note::
+
+  GravityMon Gateway does not support the TILT options, if you want to use these I recommend Tiltbridge that has a lot of good 
+  features for that. The main reason is that these formats have very little data and would require a lot of work to make the gateway
+  add the missing information. Tiltbridge already has this support built in so it makes little sense to replicate that work.
+
+
+Home page 
+=========
+
+URL: (http://gravmon-gw.local)
+
+.. image:: images/gw/ui-home.png
+  :width: 800
+  :alt: Home page
+
+The main page shows the device settings as well as the latest readings from connected devices. 
+
+
+Device 
+======
+
+Device - Settings
++++++++++++++++++
+
+.. image:: images/gw/ui-device-settings.png
+  :width: 800
+  :alt: Device Settings
+
+* **MDNS:** 
+
+  This is unique name for the device. It will be used in pushing data as well as mDNS name on the network (<name>.local). 
+  The limitation is 63 chars but using long names might break endpoints that data is sent to if they have other limitations. 
+
+* **Temperature format:** 
+
+  Choose between Celsius and Fahrenheit when displaying temperature. 
+
+* **Gravity format:**
+
+  Gravity format can be either `SG` or `Plato`. The device will use SG Internally and convert to Plato when displaying or sending data.
+
+* **Dark Mode:**
+
+  Switches the UI between light and dark mode. You can also use the toggle on the menubar for that.
+
+* **Factory default**
+
+  This function will reset all settings to factory default. Use with caution!
+
+* **Restart**
+
+  Restarts the device, similar to pressing the reset button
+
+
+Device - Hardware
++++++++++++++++++
+
+.. image:: images/gw/ui-device-hardware.png
+  :width: 800
+  :alt: Device Hardware
+
+* **Scan mode:**
+
+  Determine if the BLE scan will be done in active or passive mode. 
+
+* **Scan time:**
+
+  Time the BLE scan cycle. Don't use too long time since this will impact the updates on readings and display.
+
+* **Time zone:**
+
+  Select the timezone so that date / time will be correcly displayed. This is not an extensive list of all timezones so let me know if you are missing one. 
+
+
+Device - WIFI
++++++++++++++
+
+.. image:: images/gw/ui-device-wifi.png
+  :width: 800
+  :alt: Device WIFI
+
+Most of these settings are the same as for GravityMon with the following expections.
+
+* **Direct SSID:**
+
+  Name of the SSID that GravityMon devices will use in Wifi Direct mode.
+
+* **Direct Password:**
+
+  Enter the SSID password. 
+
+* **Generate:**
+
+  Will create an SSID and Password
+
+
+Push targets
+============
+
+Push - Settings
++++++++++++++++
+
+.. image:: images/gw/ui-push-settings.png
+  :width: 800
+  :alt: Push Settings
+
+* **Token:**
+
+  If the incoming payload does not contain the token this value will be added to the outgoing payload.
+
+* **Push timeout:** 
+
+  How long the device will wait for a connection accept from the remote service.
+
+* **Push minium resend time:** 
+
+  This the minimum time before an update can be sent. Some remote services do not want to have updates too often. 
+
+Push - HTTP Post
+++++++++++++++++
+
+See GravityMon configuration.
+
+
+Push - HTTP Get
++++++++++++++++
+
+See GravityMon configuration.
+
+
+Push - InfluxDB v2
+++++++++++++++++++
+
+See GravityMon configuration.
+
+
+Push - MQTT
++++++++++++
+
+See GravityMon configuration.
+
+
+Other
+=====
+
+Other - Serial
+++++++++++++++
+
+See GravityMon configuration.
+
+
+Other - Backup
+++++++++++++++
+
+See GravityMon configuration.
+
+
+Other - Firmware
+++++++++++++++++
+
+See GravityMon configuration.
+
+
+Other - Support
++++++++++++++++
+
+See GravityMon configuration.
+
+
+Other - Tools
++++++++++++++
+
+See GravityMon configuration.
+
+
+Other - About
++++++++++++++
+
+Shows information about the software
diff --git a/src_docs/source/images/config-popup1.png b/src_docs/source/images/config-popup1.png
diff --git a/src_docs/source/images/firmware.png b/src_docs/source/images/firmware.png
diff --git a/src_docs/source/images/format.png b/src_docs/source/images/format.png
diff --git a/src_docs/source/images/formula1.png b/src_docs/source/images/formula1.png
diff --git a/src_docs/source/images/formula2.png b/src_docs/source/images/formula2.png
diff --git a/src_docs/source/images/gw/ui-device-hardware.png b/src_docs/source/images/gw/ui-device-hardware.png
diff --git a/src_docs/source/images/gw/ui-device-settings.png b/src_docs/source/images/gw/ui-device-settings.png
diff --git a/src_docs/source/images/gw/ui-device-wifi.png b/src_docs/source/images/gw/ui-device-wifi.png
diff --git a/src_docs/source/images/gw/ui-home.png b/src_docs/source/images/gw/ui-home.png
diff --git a/src_docs/source/images/gw/ui-push-settings.png b/src_docs/source/images/gw/ui-push-settings.png
diff --git a/src_docs/source/images/ui-device-hardware.png b/src_docs/source/images/ui-device-hardware.png
diff --git a/src_docs/source/images/ui-device-settings.png b/src_docs/source/images/ui-device-settings.png
diff --git a/src_docs/source/images/ui-device-wifi.png b/src_docs/source/images/ui-device-wifi.png
diff --git a/src_docs/source/images/ui-gravity-analysis.png b/src_docs/source/images/ui-gravity-analysis.png
diff --git a/src_docs/source/images/ui-gravity-formula.png b/src_docs/source/images/ui-gravity-formula.png
diff --git a/src_docs/source/images/ui-gravity-settings.png b/src_docs/source/images/ui-gravity-settings.png
diff --git a/src_docs/source/images/ui-home.png b/src_docs/source/images/ui-home.png
diff --git a/src_docs/source/images/ui-other-about.png b/src_docs/source/images/ui-other-about.png
diff --git a/src_docs/source/images/ui-other-backup.png b/src_docs/source/images/ui-other-backup.png
diff --git a/src_docs/source/images/ui-other-firmware.png b/src_docs/source/images/ui-other-firmware.png
diff --git a/src_docs/source/images/ui-other-logs.png b/src_docs/source/images/ui-other-logs.png
diff --git a/src_docs/source/images/ui-other-serial.png b/src_docs/source/images/ui-other-serial.png
diff --git a/src_docs/source/images/ui-other-tools.png b/src_docs/source/images/ui-other-tools.png
diff --git a/src_docs/source/images/ui-push-ble.png b/src_docs/source/images/ui-push-ble.png
diff --git a/src_docs/source/images/ui-push-get.png b/src_docs/source/images/ui-push-get.png
diff --git a/src_docs/source/images/ui-push-influx.png b/src_docs/source/images/ui-push-influx.png
diff --git a/src_docs/source/images/ui-push-mqtt.png b/src_docs/source/images/ui-push-mqtt.png
diff --git a/src_docs/source/images/ui-push-post.png b/src_docs/source/images/ui-push-post.png
diff --git a/src_docs/source/images/ui-push-settings.png b/src_docs/source/images/ui-push-settings.png
diff --git a/src_docs/source/index.rst b/src_docs/source/index.rst
@@ -7,7 +7,7 @@ Welcome to GravityMon
 #####################
 
 .. note::
-  This documentation reflects **v2.0.0 beta 1**. Last updated 2024-07-13
+  This documentation reflects **v2.0.0 beta 2**. Last updated 2024-07-13
 
   Link to `previous documentation here <https://mp-se.github.io/gravitymon/v1.4/>`_ 
 
@@ -138,6 +138,7 @@ the following libraries and without these this would have been much more difficu
    hardware
    services
    data
+   gateway
    compiling
    contributing
    license

diff --git a/src_docs/source/releases.rst b/src_docs/source/releases.rst
@@ -3,6 +3,19 @@
 Releases 
 ########
 
+v2.0.0-beta2
+============
+
+Issues adressed
++++++++++++++++
+* Force gravity mode toggle on main page does not reflect the real state of the flag when other views have been used.
+* Updated user interface with project name and device name for easier identification.
+* Removed BLE GravityMon Service option since this is not really performing well.
+
+Known Issues
+++++++++++++
+* RGB led on ESP32S3 does not work due to bug in Arduino for ESP32 (Manually edit the pins_arduino.h for esp32s3 will fix the issue, #define RGB_BUILTIN LED_BUILTIN+SOC_GPIO_PIN_COUNT)
+
 v2.0.0-beta1
 ============
 
@@ -13,12 +26,6 @@ Issues adressed
 * Added WIFI Direct Connect option with GravityMon Gateway, I hope this will help with wifi connection issues in my steel fermenter and force a connect to the designated AP. Wifi Direct will send the data via http 
   to the Gateway and then forward this to the correct endpoint. 
 
-Known Issues
-++++++++++++
-* Wire (Gyro communication), does not work properly on ESP32C3 boards, timeout error. Problem resides in esp-idf framework. 
-  https://github.com/espressif/arduino-esp32/issues/8056
-* RGB led on ESP32S3 does not work due to bug in Arduino for ESP32 (Manually edit the pins_arduino.h for esp32s3 will fix the issue, #define RGB_BUILTIN LED_BUILTIN+SOC_GPIO_PIN_COUNT)
-
 New Features
 ++++++++++++
 * Added option for wifi direct when in gravity mode, wifi direct allows direct access to device without going through AP. This feature is inteded to be used with the gravitymon gateway.