FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

btadv: re-enable serv-update, only show when new

pull/2587/head
Rob Pilling 2023-01-27 23:07:34 +00:00
parent 414a6817b0
commit c82e0f4e0a
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/btadv/app.ts
View File

@ -487,7 +487,7 @@ const enableSensors = () => {
// ---------------------------- // ----------------------------
const serviceActive = (serv: BleServ): boolean => { const haveServiceData = (serv: BleServ): boolean => {
switch (serv) { switch (serv) {
case BleServ.HRM: return !!hrm; case BleServ.HRM: return !!hrm;
case BleServ.EnvSensing: return !!(bar || mag); case BleServ.EnvSensing: return !!(bar || mag);
@ -506,6 +506,7 @@ const serviceToAdvert = (serv: BleServ, initial = false): BleServAdvert => {
}; };
if (hrm) { if (hrm) {
o.value = encodeHrm(hrm); o.value = encodeHrm(hrm);
hrm = undefined;
} }
return { [BleChar.HRM]: o }; return { [BleChar.HRM]: o };
@ -521,6 +522,7 @@ const serviceToAdvert = (serv: BleServ, initial = false): BleServAdvert => {
}; };
if (gps) { if (gps) {
o.value = encodeGps(gps); o.value = encodeGps(gps);
gps = undefined;
} }
return { [BleChar.LocationAndSpeed]: o }; return { [BleChar.LocationAndSpeed]: o };
@ -551,6 +553,7 @@ const serviceToAdvert = (serv: BleServ, initial = false): BleServAdvert => {
o[BleChar.Elevation]!.value = encodeElevation(bar); o[BleChar.Elevation]!.value = encodeElevation(bar);
o[BleChar.TempCelsius]!.value = encodeTemp(bar); o[BleChar.TempCelsius]!.value = encodeTemp(bar);
o[BleChar.Pressure]!.value = encodePressure(bar); o[BleChar.Pressure]!.value = encodePressure(bar);
bar = undefined;
} }
} }
@ -563,6 +566,7 @@ const serviceToAdvert = (serv: BleServ, initial = false): BleServAdvert => {
if (mag) { if (mag) {
o[BleChar.MagneticFlux3D]!.value = encodeMag(mag); o[BleChar.MagneticFlux3D]!.value = encodeMag(mag);
mag = undefined;
} }
} }
@ -575,7 +579,7 @@ const getBleAdvert = <T>(map: (s: BleServ) => T, all = false) => {
const advert: { [key in BleServ]?: T } = {}; const advert: { [key in BleServ]?: T } = {};
for (const serv of services) { for (const serv of services) {
if (all || serviceActive(serv)) { if (all || haveServiceData(serv)) {
advert[serv] = map(serv); advert[serv] = map(serv);
} }
} }
@ -665,10 +669,10 @@ const setIntervals = (connected: boolean) => {
} }
}; };
// setIntervals(NRF.getSecurityStatus().connected); setIntervals(NRF.getSecurityStatus().connected);
// NRF.on("connect", () => { NRF.on("connect", () => {
// setIntervals(true); setIntervals(true);
// }); });
// NRF.on("disconnect", () => { NRF.on("disconnect", () => {
// setIntervals(false); setIntervals(false);
// }); });