temperature correction wrong for Fahrenheit

vitotai · Feb 18, 2024 · f67fcd7 · f67fcd7
1 parent 83f70ee
commit f67fcd7
Show file tree

Hide file tree

Showing 167 changed files with 890 additions and 37,400 deletions.
diff --git a/docs/C0.iSpindelSupport.md b/docs/C0.iSpindelSupport.md
@@ -10,8 +10,8 @@ To support **softAP**, set the correct settings in `System configuration`. Pleas
 | iSpindel         | To enable iSpindel support.   	   |
 | Offset          | the offset between reported gravity and "real" gravity" |
 | Calculated by BPL | Do the conversion from tilt angle to gravity by BrewPiLess. If this option is OFF, all the following options are not used. |
-| SG Calibration   |  Deprecated. |
-| Coefficients | The coefficients of the formula to calculate gravity. Note: this set of coefficients is for calcuation of **specific gravity**, **not** plato. Use 0 for x^3 term if quadratic polynomial is used.|
+| Calibration points   | Calibration data. |
+| Coefficients | The coefficients of the formula to calculate gravity. The formula is derived based on calibration points. It is not editable. |
 | LowPass Filter Coefficient | 0~1. See following description|
 | Gravity Stability Threshold | Integer value. 1 point = 0.001.  |
 
@@ -20,11 +20,18 @@ Offset will be "added" to reported gravity to derive the result gravity. If calc
 After version 4.4, the calibration data survives through brews. The coefficients(formula) is derived from the calibration data.
 
 ### iSpindel Settting
- * the **iSpindel Name** must start with `iSpindel`, like `iSpindel000` 
  * Select `Generic HTTP`
  * Server address set to `192.168.4.1` if iSpindel connect to the AP created by BrewPiless. or use the ip of BrewPiless if iSpindel connects the AP that BrewPiLess connects to.
  * set url to `/gravity`
 
+BrewPiLess accept post if it contains the following keys/values:
+- name
+- temperature
+- angle
+- RSSI
+- gravity
+
+
 For other iSpindel setting, like network settting, please refer to iSpindel project.
 
 ### About low Pass Filter

diff --git a/docs/C1.BrewNCalibrate.md b/docs/C1.BrewNCalibrate.md
@@ -2,4 +2,13 @@ After version 4.4, the calibration data survives through brews. The maximum numb
 
 When starting a log, the calibration data available will be written into the log file, so that tilt angles are recorded and gravity can be derived from the tilt angles. Otherwise, gravity data is recorded.
 
+The "Calculated by BPL" option determines whether or not using the gravity reported directly, while "Record Raw" option when starting logging determines whether or not recording raw data instead of gravity values. These two options are independent but related.
+
+| Calculated by BPL | Record Raw | Gravity of BPL | Gravity of Log |
+| --  | -- | -- | -- |
+|  ON | ON | calculated by BPL, need calibration data | calculated on the fly, need calibration data    |
+| ON  | OFF |calculated by BPL, need calibration data | gravity calculated by BPL |
+| OFF | ON | gravity reported from wireless hydrometer | calculated on the fly, need calibration data. |
+| OFF | OFF | gravity reported from wireless hydrometer | gravity from BPL, reported from wireless hydrometer|
+
 The calculated gravity is always temperature corrected. When inputing new data from main page, corrected gravity will be calculated automatically if beer temperature is available. However, no temperature correction is available if calibration data is input at "gravity device" page.
diff --git a/docs/D1.RaptPillHydrometerSupport.md b/docs/D1.RaptPillHydrometerSupport.md
@@ -6,6 +6,22 @@ Pill broadcasts gravity and tilt angle related information, which make it possib
 
 ![Pill setup](image/pill_setup.jpg)
 
+| Setting   | Description       |
+| -------------- |:---------------------------------|
+| Mac Address  | MAC used for registration and real MAC address   	   |
+| use Plato    | Plato or Specific Gravity(eg. 1.054) |
+| Gravity Offset          | the offset between reported gravity and "real" gravity" |
+| Calculated by BPL | Do the conversion from tilt angle to gravity by BrewPiLess. If this option is OFF, all the following options are not used. |
+| Calibration Points   |  Calibration data. At least two set of data is necessary. |
+| Coefficients | The coefficients of the formula to calculate gravity. The formula is derived based on calibration points. It is not editable.|
+| LowPass Filter Coefficient | 0~1. See following description|
+| Gravity Stability Threshold | Integer value. 1 point = 0.001.  |
+
+Offset will be "added" to reported gravity to derive the result gravity. If calculated by BPL is enabled, offset is ignored. To enable calculation, at least two points of calibration points should be entered. 
+
+After version 4.4, the calibration data survives through brews. The coefficients(formula) is derived from the calibration data.
+
+
 
 The MAC address used for registration and displayed on Rapt Pill's Dianostics page is calculated by taking the RAPT Pill's BLE address and subtracting 2 off the last octet. Therefore, thare are TWO addresses displayed.
 

diff --git a/htmljs/dist/chinese/BPLLogViewer.htm b/htmljs/dist/chinese/BPLLogViewer.htm
diff --git a/htmljs/dist/chinese/BPLLogViewer.htm.gz b/htmljs/dist/chinese/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/chinese/BPLogWebViewer.htm b/htmljs/dist/chinese/BPLogWebViewer.htm
diff --git a/htmljs/dist/chinese/BPLogWebViewer.htm.gz b/htmljs/dist/chinese/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/chinese/config.htm b/htmljs/dist/chinese/config.htm
diff --git a/htmljs/dist/chinese/config.htm.gz b/htmljs/dist/chinese/config.htm.gz
diff --git a/htmljs/dist/chinese/control.htm b/htmljs/dist/chinese/control.htm
diff --git a/htmljs/dist/chinese/control.htm.gz b/htmljs/dist/chinese/control.htm.gz
diff --git a/htmljs/dist/chinese/gravity.htm b/htmljs/dist/chinese/gravity.htm
diff --git a/htmljs/dist/chinese/gravity.htm.gz b/htmljs/dist/chinese/gravity.htm.gz
diff --git a/htmljs/dist/chinese/index.htm b/htmljs/dist/chinese/index.htm
diff --git a/htmljs/dist/chinese/index.htm.gz b/htmljs/dist/chinese/index.htm.gz
diff --git a/htmljs/dist/chinese/logging.htm b/htmljs/dist/chinese/logging.htm
diff --git a/htmljs/dist/chinese/logging.htm.gz b/htmljs/dist/chinese/logging.htm.gz
diff --git a/htmljs/dist/chinese/pressure.htm b/htmljs/dist/chinese/pressure.htm
diff --git a/htmljs/dist/chinese/pressure.htm.gz b/htmljs/dist/chinese/pressure.htm.gz
diff --git a/htmljs/dist/chinese/setup.htm b/htmljs/dist/chinese/setup.htm
diff --git a/htmljs/dist/chinese/setup.htm.gz b/htmljs/dist/chinese/setup.htm.gz
diff --git a/htmljs/dist/english/BPLLogViewer.htm b/htmljs/dist/english/BPLLogViewer.htm
diff --git a/htmljs/dist/english/BPLLogViewer.htm.gz b/htmljs/dist/english/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/english/BPLogWebViewer.htm b/htmljs/dist/english/BPLogWebViewer.htm
diff --git a/htmljs/dist/english/BPLogWebViewer.htm.gz b/htmljs/dist/english/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/english/config.htm b/htmljs/dist/english/config.htm
diff --git a/htmljs/dist/english/config.htm.gz b/htmljs/dist/english/config.htm.gz
diff --git a/htmljs/dist/english/control.htm b/htmljs/dist/english/control.htm
diff --git a/htmljs/dist/english/control.htm.gz b/htmljs/dist/english/control.htm.gz
diff --git a/htmljs/dist/english/gravity.htm b/htmljs/dist/english/gravity.htm
diff --git a/htmljs/dist/english/gravity.htm.gz b/htmljs/dist/english/gravity.htm.gz
diff --git a/htmljs/dist/english/index.htm b/htmljs/dist/english/index.htm
diff --git a/htmljs/dist/english/index.htm.gz b/htmljs/dist/english/index.htm.gz
diff --git a/htmljs/dist/english/logging.htm b/htmljs/dist/english/logging.htm
diff --git a/htmljs/dist/english/logging.htm.gz b/htmljs/dist/english/logging.htm.gz
diff --git a/htmljs/dist/english/pressure.htm b/htmljs/dist/english/pressure.htm
diff --git a/htmljs/dist/english/pressure.htm.gz b/htmljs/dist/english/pressure.htm.gz
diff --git a/htmljs/dist/english/setup.htm b/htmljs/dist/english/setup.htm
diff --git a/htmljs/dist/english/setup.htm.gz b/htmljs/dist/english/setup.htm.gz
diff --git a/htmljs/dist/italian/BPLLogViewer.htm b/htmljs/dist/italian/BPLLogViewer.htm
diff --git a/htmljs/dist/italian/BPLLogViewer.htm.gz b/htmljs/dist/italian/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/italian/BPLogWebViewer.htm b/htmljs/dist/italian/BPLogWebViewer.htm
diff --git a/htmljs/dist/italian/BPLogWebViewer.htm.gz b/htmljs/dist/italian/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/italian/config.htm b/htmljs/dist/italian/config.htm
diff --git a/htmljs/dist/italian/config.htm.gz b/htmljs/dist/italian/config.htm.gz
diff --git a/htmljs/dist/italian/control.htm b/htmljs/dist/italian/control.htm
diff --git a/htmljs/dist/italian/control.htm.gz b/htmljs/dist/italian/control.htm.gz
diff --git a/htmljs/dist/italian/gravity.htm b/htmljs/dist/italian/gravity.htm
diff --git a/htmljs/dist/italian/gravity.htm.gz b/htmljs/dist/italian/gravity.htm.gz
diff --git a/htmljs/dist/italian/index.htm b/htmljs/dist/italian/index.htm
diff --git a/htmljs/dist/italian/index.htm.gz b/htmljs/dist/italian/index.htm.gz
diff --git a/htmljs/dist/italian/logging.htm b/htmljs/dist/italian/logging.htm
diff --git a/htmljs/dist/italian/logging.htm.gz b/htmljs/dist/italian/logging.htm.gz
diff --git a/htmljs/dist/italian/pressure.htm b/htmljs/dist/italian/pressure.htm
diff --git a/htmljs/dist/italian/pressure.htm.gz b/htmljs/dist/italian/pressure.htm.gz
diff --git a/htmljs/dist/italian/setup.htm b/htmljs/dist/italian/setup.htm
diff --git a/htmljs/dist/italian/setup.htm.gz b/htmljs/dist/italian/setup.htm.gz
diff --git a/htmljs/dist/lcd.htm.gz b/htmljs/dist/lcd.htm.gz
diff --git a/htmljs/dist/norwegian/BPLLogViewer.htm b/htmljs/dist/norwegian/BPLLogViewer.htm
diff --git a/htmljs/dist/norwegian/BPLLogViewer.htm.gz b/htmljs/dist/norwegian/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/norwegian/BPLogWebViewer.htm b/htmljs/dist/norwegian/BPLogWebViewer.htm
diff --git a/htmljs/dist/norwegian/BPLogWebViewer.htm.gz b/htmljs/dist/norwegian/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/norwegian/config.htm b/htmljs/dist/norwegian/config.htm
diff --git a/htmljs/dist/norwegian/config.htm.gz b/htmljs/dist/norwegian/config.htm.gz
diff --git a/htmljs/dist/norwegian/control.htm b/htmljs/dist/norwegian/control.htm
diff --git a/htmljs/dist/norwegian/control.htm.gz b/htmljs/dist/norwegian/control.htm.gz
diff --git a/htmljs/dist/norwegian/control_s.htm b/htmljs/dist/norwegian/control_s.htm
diff --git a/htmljs/dist/norwegian/control_s.htm.gz b/htmljs/dist/norwegian/control_s.htm.gz
diff --git a/htmljs/dist/norwegian/gravity.htm b/htmljs/dist/norwegian/gravity.htm
diff --git a/htmljs/dist/norwegian/gravity.htm.gz b/htmljs/dist/norwegian/gravity.htm.gz
diff --git a/htmljs/dist/norwegian/gravity_e32.htm b/htmljs/dist/norwegian/gravity_e32.htm
diff --git a/htmljs/dist/norwegian/gravity_e32.htm.gz b/htmljs/dist/norwegian/gravity_e32.htm.gz
diff --git a/htmljs/dist/norwegian/index.htm b/htmljs/dist/norwegian/index.htm
diff --git a/htmljs/dist/norwegian/index.htm.gz b/htmljs/dist/norwegian/index.htm.gz