archive-gh-me/Espruino
1
0
Fork 0
mirror of https://github.com/espruino/Espruino.git synced 2025-12-08 19:06:15 +00:00
Code Issues Projects Releases Wiki Activity

Add seaLevelPressure to Bangle.setOptions (fix #2213)

Browse Source
This commit is contained in:
Gordon Williams 2022-06-06 15:39:38 +01:00
parent 7819de937a
commit 42cd8f61e9
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -30,6 +30,7 @@
Enable releases and cutting edge builds for Puck.js minimal releases (with 98kB of free Storage)
nRF5x: Fix memory leak (of address) when using NRF.setScan/requestDevice/findDevice (regression in 2v13)
Fix issue with const in a module when called from a scope with const already in (fix #2215, fix #2207)
Add `seaLevelPressure` to Bangle.setOptions (fix #2213)
2v13 : Memory usage improvement: Function scopes no longer stored as an array if they only contain one scope
Memory usage improvement: The root scope is never stored in the scope list (it's searched by default)

15
libs/banglejs/jswrap_bangle.c
View File

@ -576,6 +576,7 @@ JsVar *promisePressure;
double barometerPressure;
double barometerTemperature;
double barometerAltitude;
double barometerSeaLevelPressure = 1013.25; // Standard atmospheric pressure (millibars)
bool jswrap_banglejs_barometerPoll();
JsVar *jswrap_banglejs_getBarometerObject();
#endif // PRESSURE_DEVICE
@ -2011,8 +2012,8 @@ void jswrap_banglejs_setPollInterval(JsVarFloat interval) {
Set internal options used for gestures, etc...
* `wakeOnBTN1` should the LCD turn on when BTN1 is pressed? default = `true`
* `wakeOnBTN2` should the LCD turn on when BTN2 is pressed? default = `true`
* `wakeOnBTN3` should the LCD turn on when BTN3 is pressed? default = `true`
* `wakeOnBTN2` (Bangle.js 1) should the LCD turn on when BTN2 is pressed? default = `true`
* `wakeOnBTN3` (Bangle.js 1) should the LCD turn on when BTN3 is pressed? default = `true`
* `wakeOnFaceUp` should the LCD turn on when the watch is turned face up? default = `false`
* `wakeOnTouch` should the LCD turn on when the touchscreen is pressed? default = `false`
* `wakeOnTwist` should the LCD turn on when the watch is twisted? default = `true`
@ -2030,6 +2031,7 @@ Set internal options used for gestures, etc...
* `lcdPowerTimeout` how many milliseconds before the screen turns off
* `backlightTimeout` how many milliseconds before the screen's backlight turns off
* `hrmPollInterval` set the requested poll interval (in milliseconds) for the heart rate monitor. On Bangle.js 2 only 10,20,40,80,160,200 ms are supported, and polling rate may not be exact. The algorithm's filtering is tuned for 20-40ms poll intervals, so higher/lower intervals may effect the reliability of the BPM reading.
* `seaLevelPressure` (Bangle.js 2) Normally 1013.25 millibars - this is used for calculating altitude with the pressure sensor
Where accelerations are used they are in internal units, where `8192 = 1g`
@ -2051,6 +2053,9 @@ JsVar * _jswrap_banglejs_setOptions(JsVar *options, bool createObject) {
jsvConfigObject configs[] = {
#ifdef HEARTRATE
{"hrmPollInterval", JSV_INTEGER, &_hrmPollInterval},
#endif
#ifdef PRESSURE_DEVICE
{"seaLevelPressure", JSV_FLOAT, &barometerSeaLevelPressure},
#endif
{"gestureStartThresh", JSV_INTEGER, &_accelGestureStartThresh},
{"gestureEndThresh", JSV_INTEGER, &_accelGestureEndThresh},
@ -4206,8 +4211,7 @@ bool jswrap_banglejs_barometerPoll() {
traw_scaled * barometer_c01 +
traw_scaled * praw_scaled * ( barometer_c11 + praw_scaled * barometer_c21));
barometerPressure = pressurePa / 100; // convert Pa to hPa/millibar
double seaLevelPressure = 1013.25; // Standard atmospheric pressure
barometerAltitude = 44330 * (1.0 - jswrap_math_pow(barometerPressure / seaLevelPressure, 0.1903));
barometerAltitude = 44330 * (1.0 - jswrap_math_pow(barometerPressure / barometerSeaLevelPressure, 0.1903));
// TODO: temperature corrected altitude?
return true;
}
@ -4249,8 +4253,7 @@ bool jswrap_banglejs_barometerPoll() {
barometerPressure = 0;
}
double seaLevelPressure = 1013.25; // Standard atmospheric pressure
barometerAltitude = 44330 * (1.0 - jswrap_math_pow(barometerPressure / seaLevelPressure, 0.1903));
barometerAltitude = 44330 * (1.0 - jswrap_math_pow(barometerPressure / barometerSeaLevelPressure, 0.1903));
// TODO: temperature corrected altitude?
return true;
}