Не спрашивать про Bluetooth
@@ -8327,69 +8247,6 @@ async function renderSettings(container) {
bleConnectBtn.disabled = false; bleConnectBtn.textContent = "Подключить";
};
- // --- Barometer (altitude sensor): its own bind/connect, separate from the heart-rate strap ---
- let baroReadoutOn = false;
- function startBaroReadout() {
- if (baroReadoutOn) return;
- baroReadoutOn = true;
- let anchorPa = null;
- let loop = () => {
- let st = container.querySelector("#s-baro-status");
- if (!st) { baroReadoutOn = false; return; } // left the settings screen
- let s = window.BARO ? BARO.state : null;
- let pa = s ? s.lastPa : null, tc = s ? s.lastTempC : null;
- if (pa) {
- if (anchorPa == null) anchorPa = pa;
- let rel = BARO.deltaH(anchorPa, pa, tc);
- st.textContent = `${(pa / 100).toFixed(1)} гПа${tc != null ? " · " + tc.toFixed(1) + " C" : ""} · высота ${rel >= 0 ? "+" : ""}${rel.toFixed(1)} м (отн. подключения)`;
- } else {
- st.textContent = "подключение, ждём данные...";
- }
- if (baroReadoutOn) setTimeout(loop, 2000);
- };
- loop();
- }
-
- let baroUnbindBtn = container.querySelector("#s-baro-unbind");
- if (baroUnbindBtn) baroUnbindBtn.onclick = async () => {
- await DB.setProfileValue("baro_device_addr", "");
- await DB.setProfileValue("baro_device_name", "");
- state.profile.baro_device_addr = "";
- state.profile.baro_device_name = "";
- try { if (window.BARO) { BARO.stop(); BARO.reset(); } } catch {}
- baroReadoutOn = false;
- try { await window.__TAURI__.core.invoke("ble_save_baro_device", { address: "" }); } catch {}
- try { await window.__TAURI__.core.invoke("ble_baro_disconnect"); } catch {}
- let nm = container.querySelector("#s-baro-name"); if (nm) nm.textContent = "не привязан";
- let st = container.querySelector("#s-baro-status"); if (st) st.textContent = "найдите в поиске ниже";
- baroUnbindBtn.remove();
- };
-
- let baroConnectBtn = container.querySelector("#s-baro-connect");
- if (baroConnectBtn) baroConnectBtn.onclick = async () => {
- let addr = state.profile.baro_device_addr;
- if (!addr) return;
- let bt = "on"; try { bt = await window.__TAURI__.core.invoke("ble_check_bluetooth"); } catch {}
- if (bt === "off") { try { await window.__TAURI__.core.invoke("ble_request_enable"); } catch {} showToast("Включите Bluetooth, затем «Подключить»"); return; }
- if (bt === "no_adapter") { showToast("Bluetooth недоступен"); return; }
- baroConnectBtn.disabled = true; baroConnectBtn.textContent = "...";
- let st = container.querySelector("#s-baro-status"); if (st) st.textContent = "Подключение...";
- try {
- await window.__TAURI__.core.invoke("ble_connect", { address: addr, deviceType: "baro" });
- try { await window.__TAURI__.core.invoke("ble_save_baro_device", { address: addr }); } catch {}
- try { if (window.BARO) { BARO.reset(); BARO.start(); } } catch {}
- startBaroReadout();
- showToast("Барометр: подключение...");
- } catch (e) {
- if (st) st.textContent = "ошибка подключения";
- showToast("Ошибка: " + (e.message || e));
- }
- baroConnectBtn.disabled = false; baroConnectBtn.textContent = "Подключить";
- };
-
- // already-bound barometer that is still polling: resume its live readout on opening settings
- if (state.profile.baro_device_addr && window.BARO && BARO.state && BARO.state.polling) startBaroReadout();
-
let dontAskBt = container.querySelector("#s-dontask-bt");
if (dontAskBt) dontAskBt.onchange = () => { try { localStorage.setItem("baldav_dontask_bt", dontAskBt.checked ? "1" : "0"); } catch {} };
let dontAskGps = container.querySelector("#s-dontask-gps");
@@ -8455,27 +8312,17 @@ async function renderSettings(container) {
item.querySelector(".settings-item-desc").textContent = "Подключение...";
try {
await window.__TAURI__.core.invoke("ble_connect", { address: addr, deviceType: type });
- if (type === "baro") {
- // barometer -> its own slot, so it doesn't overwrite the heart-rate strap
- await DB.setProfileValue("baro_device_addr", addr);
- await DB.setProfileValue("baro_device_name", name);
- state.profile.baro_device_addr = addr;
- state.profile.baro_device_name = name;
- // persist for auto-connect at start (separate from the HR device file)
- try { await window.__TAURI__.core.invoke("ble_save_baro_device", { address: addr }); } catch {}
- try { if (window.BARO) { BARO.reset(); BARO.start(); } } catch {}
- } else {
- await DB.setProfileValue("ble_device_addr", addr);
- await DB.setProfileValue("ble_device_type", type);
- await DB.setProfileValue("ble_device_name", name);
- // Write file for Kotlin to read at GPS start (HR auto-connect)
- try { await window.__TAURI__.core.invoke("ble_save_device", { address: addr, deviceType: type }); } catch {}
- state.profile.ble_device_addr = addr;
- state.profile.ble_device_type = type;
- state.profile.ble_device_name = name;
- }
- // re-render settings so the Connect/Unbind buttons appear and the baro readout resumes
- await renderSettings(container);
+ await DB.setProfileValue("ble_device_addr", addr);
+ await DB.setProfileValue("ble_device_type", type);
+ await DB.setProfileValue("ble_device_name", name);
+ // Write file for Kotlin to read at GPS start
+ try { await window.__TAURI__.core.invoke("ble_save_device", { address: addr, deviceType: type }); } catch {}
+ state.profile.ble_device_addr = addr;
+ state.profile.ble_device_type = type;
+ state.profile.ble_device_name = name;
+ container.querySelector("#s-ble-name").textContent = name;
+ container.querySelector("#s-ble-status").textContent = addr + " (подключён)";
+ bleResults.innerHTML = "";
} catch (e) {
item.querySelector(".settings-item-desc").textContent = "Ошибка: " + e;
}
diff --git a/src-tauri/gen/android/app/src/main/AndroidManifest.xml b/src-tauri/gen/android/app/src/main/AndroidManifest.xml
index f17984f..a7feaf4 100644
--- a/src-tauri/gen/android/app/src/main/AndroidManifest.xml
+++ b/src-tauri/gen/android/app/src/main/AndroidManifest.xml
@@ -48,11 +48,6 @@
android:foregroundServiceType="connectedDevice"
android:exported="false" />
-
-
Unit>()
- private var gattBusy = false
- private fun enqueueGatt(op: () -> Unit) { gattQueue.add(op); processGattQueue() }
- private fun processGattQueue() {
- if (gattBusy || gattQueue.isEmpty()) return
- gattBusy = true
- gattQueue.removeAt(0).invoke()
- }
- private fun onGattOperationComplete() {
- gattBusy = false
- handler.postDelayed({ processGattQueue() }, 100)
- }
-
- private fun setupBaro(g: BluetoothGatt) {
- val svc = g.getService(ESS_SERVICE)
- if (svc == null) { Log.e(TAG, "ESS service not found"); return }
- val pc = svc.getCharacteristic(PRESSURE_CHAR)
- if (pc == null) { Log.e(TAG, "pressure characteristic not found"); return }
- val tc = svc.getCharacteristic(TEMP_CHAR)
- enqueueGatt { subscribeNotify(g, pc) }
- if (tc != null) enqueueGatt { subscribeNotify(g, tc) }
- Log.d(TAG, "subscribed pressure${if (tc != null) " + temp" else ""}")
- }
-
- private fun subscribeNotify(g: BluetoothGatt, char: BluetoothGattCharacteristic) {
- try {
- g.setCharacteristicNotification(char, true)
- val desc = char.getDescriptor(CCCD_UUID)
- if (desc != null) {
- desc.value = BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE
- g.writeDescriptor(desc)
- } else onGattOperationComplete()
- } catch (e: Exception) { Log.e(TAG, "subscribeNotify: ${e.message}"); onGattOperationComplete() }
- }
-
- private fun parseBaro(char: BluetoothGattCharacteristic, value: ByteArray) {
- when (char.uuid) {
- TEMP_CHAR -> if (value.size >= 2) {
- val u = ((value[1].toInt() and 0xFF) shl 8) or (value[0].toInt() and 0xFF)
- lastTempC = u.toShort().toInt() / 100.0
- }
- PRESSURE_CHAR -> if (value.size >= 4) {
- val raw = (value[0].toLong() and 0xFF) or ((value[1].toLong() and 0xFF) shl 8) or
- ((value[2].toLong() and 0xFF) shl 16) or ((value[3].toLong() and 0xFF) shl 24)
- val pa = raw / 10.0
- val ts = System.currentTimeMillis() / 1000
- val tj = if (!lastTempC.isNaN()) ",\"temp_c\":${String.format(Locale.US, "%.2f", lastTempC)}" else ""
- val json = "{\"pressure_pa\":${String.format(Locale.US, "%.1f", pa)}$tj,\"ts\":$ts}"
- try { dataFile?.writeText(json) } catch (e: Exception) { Log.e(TAG, "write: ${e.message}") }
- try { logFile?.appendText(json + "\n") } catch (e: Exception) {}
- Log.d(TAG, "Baro: $pa Pa T=$lastTempC")
- }
- }
- }
-
- private fun disconnect() {
- isRunning = false
- handler.removeCallbacksAndMessages(null)
- try { gatt?.disconnect() } catch (e: Exception) {}
- try { gatt?.close() } catch (e: Exception) {}
- gatt = null
- }
-
- private fun createNotificationChannel() {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- val channel = NotificationChannel(CHANNEL_ID, "BLE барометр", NotificationManager.IMPORTANCE_LOW)
- getSystemService(NotificationManager::class.java).createNotificationChannel(channel)
- }
- }
- private fun buildNotification(text: String): Notification {
- val intent = packageManager.getLaunchIntentForPackage(packageName)
- val pi = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE)
- return Notification.Builder(this, CHANNEL_ID)
- .setContentTitle("BalDav барометр")
- .setContentText(text)
- .setSmallIcon(android.R.drawable.ic_menu_compass)
- .setContentIntent(pi)
- .setOngoing(true)
- .build()
- }
- private fun updateNotification(text: String) {
- getSystemService(NotificationManager::class.java).notify(NOTIFICATION_ID, buildNotification(text))
- }
-
- override fun onDestroy() {
- stopping = true
- try { unregisterReceiver(btStateReceiver) } catch (e: Exception) {}
- disconnect()
- super.onDestroy()
- }
-}
diff --git a/src-tauri/gen/android/app/src/main/java/dev/baldav/app/BleHrService.kt b/src-tauri/gen/android/app/src/main/java/dev/baldav/app/BleHrService.kt
index d2c2523..01f54ad 100644
--- a/src-tauri/gen/android/app/src/main/java/dev/baldav/app/BleHrService.kt
+++ b/src-tauri/gen/android/app/src/main/java/dev/baldav/app/BleHrService.kt
@@ -19,7 +19,6 @@ import android.os.Looper
import android.os.ParcelUuid
import android.util.Log
import java.io.File
-import java.util.Locale
import java.util.UUID
import org.json.JSONArray
import org.json.JSONObject
@@ -43,11 +42,6 @@ class BleHrService : Service() {
val BATTERY_SERVICE: UUID = UUID.fromString("0000180f-0000-1000-8000-00805f9b34fb")
val BATTERY_LEVEL: UUID = UUID.fromString("00002a19-0000-1000-8000-00805f9b34fb")
- // Standard Environmental Sensing — our DIY barometer "BaroBalDav" (ESP32-C3 + BMP280)
- val ESS_SERVICE: UUID = UUID.fromString("0000181a-0000-1000-8000-00805f9b34fb")
- val PRESSURE_CHAR: UUID = UUID.fromString("00002a6d-0000-1000-8000-00805f9b34fb") // uint32, 0.1 Pa
- val TEMP_CHAR: UUID = UUID.fromString("00002a6e-0000-1000-8000-00805f9b34fb") // int16, 0.01 C
-
// FitPro Nordic UART
val FITPRO_SERVICE: UUID = UUID.fromString("6e400001-b5a3-f393-e0a9-e50e24dcca9d")
val FITPRO_WRITE: UUID = UUID.fromString("6e400002-b5a3-f393-e0a9-e50e24dcca9d")
@@ -84,11 +78,6 @@ class BleHrService : Service() {
private var scanResultsFile: File? = null
private var fitproWriteChar: BluetoothGattCharacteristic? = null
private var fitproGatt: BluetoothGatt? = null
- // DIY barometer (BaroBalDav): its own data/log files, and the last temperature so each pressure
- // reading can carry the temperature for the altitude calc on the JS side.
- private var baroDataFile: File? = null
- private var baroLogFile: File? = null
- private var lastTempC: Double = Double.NaN
// One handler for all postDelayed work, so teardown can cancel every pending callback at once
// (a stray callback touching a GATT/scanner after the adapter is off crashes the native BT stack).
@@ -146,14 +135,9 @@ class BleHrService : Service() {
startForeground(NOTIFICATION_ID, buildNotification("Подключение..."))
isRunning = true
val appDataDir = filesDir.parentFile ?: filesDir
- if (deviceType == "baro") {
- baroDataFile = File(appDataDir, "ble_baro_data.json")
- baroLogFile = File(appDataDir, "ble_baro_log.jsonl")
- } else {
- dataFile = File(appDataDir, "ble_hr_data.json")
- logFile = File(appDataDir, "ble_hr_log.jsonl")
- uptimeFile = File(appDataDir, "strap_uptime.json")
- }
+ dataFile = File(appDataDir, "ble_hr_data.json")
+ logFile = File(appDataDir, "ble_hr_log.jsonl")
+ uptimeFile = File(appDataDir, "strap_uptime.json")
// fresh user-initiated connect: arm reconnect only after it actually connects
lastAddress = address; stopping = false; connectedOnce = false; reconnectTries = 0
connectDevice(address)
@@ -192,10 +176,8 @@ class BleHrService : Service() {
val services = result.scanRecord?.serviceUuids?.map { it.uuid } ?: emptyList()
val type = when {
- services.contains(ESS_SERVICE) -> "baro"
services.contains(HR_SERVICE_UUID) -> "hr_standard"
services.contains(FITPRO_SERVICE) -> "fitpro"
- name.lowercase().contains("baro") -> "baro"
name.lowercase().let { it.contains("fitpro") || it.contains("band") || it.contains("m7") || it.contains("m8") } -> "fitpro"
name.lowercase().let { it.contains("coospo") || it.contains("polar") || it.contains("garmin") || it.contains("hr") } -> "hr_standard"
else -> "unknown"
@@ -261,14 +243,12 @@ class BleHrService : Service() {
handler.postDelayed({
try { scanner.stopScan(scanCallback) } catch (e: Exception) { Log.e(TAG, "stopScan: ${e.message}") }
if (gatt == null) {
- // Not re-found in the pre-connect scan within 5 s. A present-but-not-rescanned device
- // (a stationary sensor, or a BlueZ peripheral that the scanner just missed) still
- // connects by address, so fall back to a direct connect instead of giving up. The
- // address type is already cached from the earlier scan, so connectGatt uses it.
- Log.d(TAG, "Scan timeout, device $address not re-found - direct connect fallback")
- val a = adapter()
- if (a != null && a.isEnabled) directConnect(a, address)
- else { writeData("""{"status":"not_found","ts":${System.currentTimeMillis()/1000}}"""); stopSelf() }
+ // Not seen in the scan → the band isn't nearby/on. Do NOT hold a GATT connect to
+ // an absent device (that keeps the radio busy and drains the battery). Give up;
+ // the user re-taps "Подключить" once the band is on.
+ Log.d(TAG, "Scan timeout, device $address not found - stopping")
+ writeData("""{"status":"not_found","ts":${System.currentTimeMillis()/1000}}""")
+ stopSelf()
}
}, 5000)
}
@@ -317,7 +297,6 @@ class BleHrService : Service() {
if (deviceType == "unknown") {
deviceType = when {
g.getService(HR_SERVICE_UUID) != null -> "hr_standard"
- g.getService(ESS_SERVICE) != null -> "baro"
g.getService(FITPRO_SERVICE) != null -> "fitpro"
else -> "fitpro" // fallback: try FitPro (Nordic UART is common for cheap bracelets)
}
@@ -329,25 +308,15 @@ class BleHrService : Service() {
when (deviceType) {
"hr_standard" -> setupStandardHr(g)
"fitpro" -> setupFitPro(g)
- "baro" -> setupBaro(g)
}
- updateNotification(if (deviceType == "baro") "Барометр подключён" else "Пульсометр подключён")
- // drink reminder is a workout/HR feature; the barometer is just a passive altitude source
- if (deviceType != "baro") startHydrationReminder()
+ updateNotification("Пульсометр подключён")
+ startHydrationReminder() // workout is on (strap connected) → arm the drink reminder
}
override fun onCharacteristicChanged(g: BluetoothGatt, char: BluetoothGattCharacteristic, value: ByteArray) {
Log.d(TAG, "Data received (${value.size} bytes): ${value.joinToString(" ") { "%02X".format(it) }}")
- // Route by WHAT the characteristic is, not the current deviceType: if an HR auto-connect
- // races in and flips deviceType while the baro link is still delivering, a pressure/temp
- // packet must NOT be parsed as HR. Standard GATT UUIDs are unambiguous.
- when (char.uuid) {
- PRESSURE_CHAR, TEMP_CHAR -> { parseBaro(char, value); return }
- HR_MEASUREMENT_UUID -> { parseStandardHr(value); return }
- }
when (deviceType) {
"hr_standard" -> parseStandardHr(value)
- "baro" -> parseBaro(char, value)
"fitpro" -> {
// Send ACK for data packets (0xCD) — required by FitPro protocol
if (value.isNotEmpty() && value[0] == 0xCD.toByte() && value.size >= 4) {
@@ -422,61 +391,6 @@ class BleHrService : Service() {
} catch (e: Exception) { Log.e(TAG, "readBattery: ${e.message}") }
}
- // DIY barometer (Environmental Sensing): subscribe to pressure (required) and temperature
- // (optional) notifications. Two CCCD writes can't overlap, so queue them like the FitPro setup.
- private fun setupBaro(g: BluetoothGatt) {
- val svc = g.getService(ESS_SERVICE)
- if (svc == null) { Log.e(TAG, "ESS service not found"); return }
- val pc = svc.getCharacteristic(PRESSURE_CHAR)
- if (pc == null) { Log.e(TAG, "Pressure characteristic not found"); return }
- val tc = svc.getCharacteristic(TEMP_CHAR)
- enqueueGatt { subscribeNotify(g, pc) }
- if (tc != null) enqueueGatt { subscribeNotify(g, tc) }
- Log.d(TAG, "Baro setup: subscribed pressure${if (tc != null) " + temp" else ""}")
- }
-
- // Enable notifications on one characteristic and write its CCCD; onDescriptorWrite advances the
- // GATT queue. If there's no CCCD, complete immediately so the queue doesn't stall.
- private fun subscribeNotify(g: BluetoothGatt, char: BluetoothGattCharacteristic) {
- try {
- g.setCharacteristicNotification(char, true)
- val desc = char.getDescriptor(CCCD_UUID)
- if (desc != null) {
- desc.value = BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE
- g.writeDescriptor(desc)
- } else onGattOperationComplete()
- } catch (e: Exception) { Log.e(TAG, "subscribeNotify: ${e.message}"); onGattOperationComplete() }
- }
-
- // Pressure char = uint32 little-endian in 0.1 Pa; Temperature char = int16 little-endian in 0.01 C
- // (standard BLE Environmental Sensing units). Temperature arrives on its own notification, so keep
- // the last value and attach it to each pressure reading. JS turns pressure into altitude.
- private fun parseBaro(char: BluetoothGattCharacteristic, value: ByteArray) {
- when (char.uuid) {
- TEMP_CHAR -> {
- if (value.size >= 2) {
- val u = ((value[1].toInt() and 0xFF) shl 8) or (value[0].toInt() and 0xFF)
- lastTempC = u.toShort().toInt() / 100.0
- }
- }
- PRESSURE_CHAR -> {
- if (value.size >= 4) {
- val raw = (value[0].toLong() and 0xFF) or ((value[1].toLong() and 0xFF) shl 8) or
- ((value[2].toLong() and 0xFF) shl 16) or ((value[3].toLong() and 0xFF) shl 24)
- val pa = raw / 10.0 // 0.1 Pa units -> Pa
- val ts = System.currentTimeMillis() / 1000
- // format with Locale.US - the phone's RU locale writes a decimal comma, which is
- // invalid JSON and fails the Rust parse
- val tj = if (!lastTempC.isNaN()) ",\"temp_c\":${String.format(Locale.US, "%.2f", lastTempC)}" else ""
- val json = "{\"pressure_pa\":${String.format(Locale.US, "%.1f", pa)}$tj,\"ts\":$ts}"
- try { baroDataFile?.writeText(json) } catch (e: Exception) { Log.e(TAG, "baro write: ${e.message}") }
- try { baroLogFile?.appendText(json + "\n") } catch (e: Exception) {}
- Log.d(TAG, "Baro: $pa Pa T=$lastTempC")
- }
- }
- }
- }
-
private val gattQueue = mutableListOf<() -> Unit>()
private var gattBusy = false
diff --git a/src-tauri/gen/android/app/src/main/java/dev/baldav/app/Hydration.kt b/src-tauri/gen/android/app/src/main/java/dev/baldav/app/Hydration.kt
index 46a8ba2..c645276 100644
--- a/src-tauri/gen/android/app/src/main/java/dev/baldav/app/Hydration.kt
+++ b/src-tauri/gen/android/app/src/main/java/dev/baldav/app/Hydration.kt
@@ -12,10 +12,8 @@ import android.os.Build
import android.os.Handler
import android.os.VibrationEffect
import android.os.Vibrator
-import android.speech.tts.TextToSpeech
import android.util.Log
import java.io.File
-import java.util.Locale
import org.json.JSONObject
// Drink reminder shared by GpsRecorderService (rides) and BleHrService (VR/workout). LEVEL-based,
@@ -27,23 +25,18 @@ import org.json.JSONObject
object Hydration {
private const val TAG = "Hydration"
private const val CH = "baldav_hydration"
- private var baseDeficit = 0.0 // sedentary shortfall at (re)seed: need-so-far minus intake
- private var sweatMl = 0.0 // activity sweat accrued this session (grows with the session)
- private var startDeficitMl = 0.0 // last seeded base from the food log; applied on (re)seed
- private var seedSeq = 0L // JS bumps it on (re)seed (e.g. after you log a drink)
- private var lastSeedSeq = -1L // a change re-applies startDeficitMl to baseDeficit mid-session
- private var pendingStart = false // apply the seed on the first tick after reset()
+ private var accruedMl = 0.0 // running water deficit: start-of-session shortfall + sweat
+ private var startDeficitMl = 0.0 // how far behind you were at session start (from the food log)
+ private var pendingStart = false // apply startDeficitMl on the first tick after reset()
private var lastTickMs = 0L
private var lastBeepMs = 0L
private var lastCfgMs = 0L
private var enabled = true // ON by default — works out of the box, no toggle to find
- private var sweatMlPerMin = 10.0 // need rate during an active session (set per activity by JS)
+ private var sweatMlPerMin = 10.0 // need rate during an active session (600 ml/h default)
private var alertMl = 600.0 // beep once the deficit reaches this
private var reAlertMs = 15 * 60 * 1000L
private var lastLogMs = 0L
private var savedAlarmVol = -1 // alarm volume to restore after an alert
- private var tts: TextToSpeech? = null
- private var ttsReady = false // the signal is a SPOKEN "hydrate now" — unmistakably BalDav
private fun readCfg(ctx: Context) {
try {
@@ -55,11 +48,6 @@ object Hydration {
alertMl = j.optInt("alertMl", 600).coerceIn(100, 3000).toDouble()
reAlertMs = j.optInt("reAlertMin", 15).coerceIn(2, 120) * 60_000L
startDeficitMl = j.optInt("startDeficitMl", 0).coerceIn(0, 5000).toDouble()
- seedSeq = j.optLong("seedSeq", 0L)
- // a NON-ZERO new seedSeq means JS recomputed the base (session start / after a drink)
- // -> re-apply it to baseDeficit mid-session; sweat keeps accruing. seedSeq=0 (profile
- // save, init) must NOT zero the deficit mid-ride, so it's ignored here.
- if (seedSeq != 0L && seedSeq != lastSeedSeq) { baseDeficit = startDeficitMl; lastSeedSeq = seedSeq }
} else enabled = true // no config yet -> ON by default
} catch (e: Exception) { Log.e(TAG, "cfg: ${e.message}"); enabled = true }
}
@@ -75,15 +63,14 @@ object Hydration {
val now = System.currentTimeMillis()
if (now - lastCfgMs > 30_000L) { readCfg(ctx); lastCfgMs = now }
if (!enabled) { if (now - lastLogMs > 120_000L) { logState(ctx, "disabled"); lastLogMs = now }; return }
- if (pendingStart) { baseDeficit = startDeficitMl; sweatMl = 0.0; lastSeedSeq = seedSeq; pendingStart = false }
- if (lastTickMs == 0L) { lastTickMs = now; ensureTts(ctx); logState(ctx, "start"); lastLogMs = now; return }
+ if (pendingStart) { accruedMl = startDeficitMl; pendingStart = false }
+ if (lastTickMs == 0L) { lastTickMs = now; logState(ctx, "start"); lastLogMs = now; return }
val dtMin = (now - lastTickMs) / 60_000.0
lastTickMs = now
- sweatMl += sweatMlPerMin * dtMin
- val deficit = baseDeficit + sweatMl
- if (deficit >= alertMl && now - lastBeepMs >= reAlertMs) {
+ accruedMl += sweatMlPerMin * dtMin
+ if (accruedMl >= alertMl && now - lastBeepMs >= reAlertMs) {
lastBeepMs = now
- val ok = beep(ctx, handler); vibrate(ctx); notify(ctx, deficit.toInt())
+ val ok = beep(ctx, handler); vibrate(ctx); notify(ctx, accruedMl.toInt())
logState(ctx, if (ok) "beepOk" else "beepError"); lastLogMs = now
} else if (now - lastLogMs > 120_000L) { logState(ctx, "tick"); lastLogMs = now }
}
@@ -93,8 +80,8 @@ object Hydration {
try {
val f = File(ctx.filesDir.parentFile ?: ctx.filesDir, "hydration_log.jsonl")
f.appendText("{\"ts\":${System.currentTimeMillis() / 1000},\"ev\":\"$event\"," +
- "\"enabled\":$enabled,\"accruedMl\":${(baseDeficit + sweatMl).toInt()},\"sweatMl\":${sweatMl.toInt()}," +
- "\"baseMl\":${baseDeficit.toInt()},\"alertMl\":${alertMl.toInt()},\"startMl\":${startDeficitMl.toInt()}}\n")
+ "\"enabled\":$enabled,\"accruedMl\":${accruedMl.toInt()},\"alertMl\":${alertMl.toInt()}," +
+ "\"startMl\":${startDeficitMl.toInt()}}\n")
} catch (e: Exception) {}
}
@@ -106,43 +93,24 @@ object Hydration {
val am = ctx.getSystemService(Context.AUDIO_SERVICE) as AudioManager
if (savedAlarmVol < 0) savedAlarmVol = am.getStreamVolume(AudioManager.STREAM_ALARM)
am.setStreamVolume(AudioManager.STREAM_ALARM, am.getStreamMaxVolume(AudioManager.STREAM_ALARM), 0)
- if (tts == null) {
- tts = TextToSpeech(ctx.applicationContext) { status ->
- ttsReady = status == TextToSpeech.SUCCESS
- if (ttsReady) { try { tts?.language = Locale.US } catch (e: Exception) {}; speakNow() }
- }
- } else if (ttsReady) speakNow()
- // restore the alarm volume a few seconds after the phrase
+ val uri = RingtoneManager.getActualDefaultRingtoneUri(ctx, RingtoneManager.TYPE_ALARM)
+ ?: RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM)
+ val mp = MediaPlayer()
+ mp.setAudioAttributes(AudioAttributes.Builder()
+ .setUsage(AudioAttributes.USAGE_ALARM)
+ .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION).build())
+ mp.setDataSource(ctx, uri)
+ mp.isLooping = true
+ mp.prepare()
+ mp.start()
handler.postDelayed({
+ try { mp.stop(); mp.release() } catch (e: Exception) {}
try { if (savedAlarmVol >= 0) { am.setStreamVolume(AudioManager.STREAM_ALARM, savedAlarmVol, 0); savedAlarmVol = -1 } } catch (e: Exception) {}
- }, 5000)
+ }, 4000)
true
} catch (e: Exception) { Log.e(TAG, "beep: ${e.message}"); false }
}
- // Warm the TTS engine up at session start so the first alert isn't silent (init is async).
- private fun ensureTts(ctx: Context) {
- if (tts != null) return
- try {
- tts = TextToSpeech(ctx.applicationContext) { status ->
- ttsReady = status == TextToSpeech.SUCCESS
- if (ttsReady) { try { tts?.language = Locale.US } catch (e: Exception) {} }
- }
- } catch (e: Exception) { Log.e(TAG, "tts init: ${e.message}") }
- }
-
- // Speak the phrase over the ALARM stream so it's loud even with media muted.
- private fun speakNow() {
- try {
- val t = tts ?: return
- t.setAudioAttributes(AudioAttributes.Builder()
- .setUsage(AudioAttributes.USAGE_ALARM)
- .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH).build())
- t.speak("hydrate now", TextToSpeech.QUEUE_FLUSH, null, "hyd1")
- t.speak("hydrate now", TextToSpeech.QUEUE_ADD, null, "hyd2")
- } catch (e: Exception) { Log.e(TAG, "speak: ${e.message}") }
- }
-
private fun vibrate(ctx: Context) {
try {
val v = ctx.getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator ?: return
@@ -159,12 +127,11 @@ object Hydration {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && nm.getNotificationChannel(CH) == null) {
nm.createNotificationChannel(NotificationChannel(CH, "Напоминание пить", NotificationManager.IMPORTANCE_HIGH))
}
- val time = java.text.SimpleDateFormat("HH:mm", Locale.getDefault()).format(java.util.Date())
val n = Notification.Builder(ctx, CH)
- .setContentTitle("БалДав: попей воды")
- .setContentText("$time — отстаёшь примерно на $deficitMl мл")
+ .setContentTitle("Попей воды!")
+ .setContentText("Отстаёшь примерно на $deficitMl мл — попей")
.setSmallIcon(android.R.drawable.ic_menu_compass)
- .setAutoCancel(true) // stays in the shade as a record until you tap it
+ .setAutoCancel(true)
.build()
nm.notify(776601, n)
} catch (e: Exception) { Log.e(TAG, "notify: ${e.message}") }
diff --git a/src-tauri/gen/android/app/src/main/java/dev/baldav/app/MainActivity.kt b/src-tauri/gen/android/app/src/main/java/dev/baldav/app/MainActivity.kt
index 653916f..bce5a65 100644
--- a/src-tauri/gen/android/app/src/main/java/dev/baldav/app/MainActivity.kt
+++ b/src-tauri/gen/android/app/src/main/java/dev/baldav/app/MainActivity.kt
@@ -565,14 +565,9 @@ class MainActivity : TauriActivity() {
val type = if (lastColon > 0) payload.substring(lastColon + 1) else "hr_standard"
Log.d("BalDav", "BLE connect: $address ($type)")
if (ensureBlePermissions()) {
- // barometer has its own service so it and the HR strap connect at the same time
- val intent = if (type == "baro") {
- Intent(this, BleBaroService::class.java).apply { putExtra(BleBaroService.EXTRA_ADDRESS, address) }
- } else {
- Intent(this, BleHrService::class.java).apply {
- putExtra(BleHrService.EXTRA_ADDRESS, address)
- putExtra(BleHrService.EXTRA_DEVICE_TYPE, type)
- }
+ val intent = Intent(this, BleHrService::class.java).apply {
+ putExtra(BleHrService.EXTRA_ADDRESS, address)
+ putExtra(BleHrService.EXTRA_DEVICE_TYPE, type)
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) startForegroundService(intent) else startService(intent)
}
@@ -583,12 +578,6 @@ class MainActivity : TauriActivity() {
intent.action = BleHrService.ACTION_STOP
startService(intent)
}
- cmd == "baro_disconnect" -> {
- Log.d("BalDav", "Baro disconnect")
- val intent = Intent(this, BleBaroService::class.java)
- intent.action = BleBaroService.ACTION_STOP
- startService(intent)
- }
cmd == "ble_request_enable" -> {
Log.d("BalDav", "Requesting Bluetooth enable")
if (ensureBlePermissions()) {
@@ -722,18 +711,6 @@ class MainActivity : TauriActivity() {
private fun autoStartBle(appDataDir: File) {
try {
- // Barometer: auto-connect its own device via its own service, so it runs alongside the HR strap
- val baroFile = File(appDataDir, "baro_device.json")
- if (baroFile.exists()) {
- val bjson = baroFile.readText().trim()
- val baddr = Regex(""""addr"\s*:\s*"([^"]+)"""").find(bjson)?.groupValues?.get(1)
- if (!baddr.isNullOrEmpty() && ensureBlePermissions()) {
- Log.d("BalDav", "Auto-starting baro: $baddr")
- val bi = Intent(this, BleBaroService::class.java).apply { putExtra(BleBaroService.EXTRA_ADDRESS, baddr) }
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) startForegroundService(bi) else startService(bi)
- }
- }
-
// Read paired BLE device from profile in DB
val bleAddr = File(appDataDir, "ble_device.txt")
// JS saves ble_device_addr in profile (SQLite), but we can't read SQLite here easily.
diff --git a/src-tauri/src/ble.rs b/src-tauri/src/ble.rs
index 88509ce..1e33525 100644
--- a/src-tauri/src/ble.rs
+++ b/src-tauri/src/ble.rs
@@ -29,17 +29,6 @@ pub struct HrReading {
pub battery: Option,
}
-// DIY barometer reading (BaroBalDav): atmospheric pressure in Pa and optional chip temperature.
-// JS turns pressure into altitude (hypsometric formula, using temp), anchored to GPS at ride start.
-#[derive(Serialize, Deserialize, Clone, Debug, Default)]
-pub struct BaroReading {
- pub pressure_pa: f64,
- #[serde(default)]
- pub temp_c: Option,
- #[serde(alias = "ts", default)]
- pub timestamp: u64,
-}
-
// Shared state for BLE operations
#[cfg(not(target_os = "android"))]
lazy_static::lazy_static! {
@@ -60,9 +49,6 @@ struct BleState {
const HR_SERVICE_UUID: &str = "0000180d-0000-1000-8000-00805f9b34fb";
const HR_MEASUREMENT_UUID: &str = "00002a37-0000-1000-8000-00805f9b34fb";
-// Standard Environmental Sensing — our DIY barometer "BaroBalDav"
-const ESS_SERVICE: &str = "0000181a-0000-1000-8000-00805f9b34fb";
-
// FitPro Nordic UART UUIDs
const FITPRO_SERVICE: &str = "6e400001-b5a3-f393-e0a9-e50e24dcca9d";
const FITPRO_WRITE: &str = "6e400002-b5a3-f393-e0a9-e50e24dcca9d";
@@ -95,10 +81,6 @@ mod desktop {
}
fn detect_device_type(name: &str, services: &[Uuid]) -> String {
- // Our DIY barometer advertises standard Environmental Sensing
- if services.contains(&uuid(ESS_SERVICE)) {
- return "baro".to_string();
- }
// Check for standard HR service
if services.contains(&uuid(HR_SERVICE_UUID)) {
return "hr_standard".to_string();
@@ -402,15 +384,6 @@ mod android {
}
Ok(None)
}
-
- pub fn read_baro_data(app: &tauri::AppHandle) -> Result, String> {
- if let Some(s) = read_file(app, "ble_baro_data.json") {
- if let Ok(r) = serde_json::from_str::(&s) {
- if r.pressure_pa > 0.0 { return Ok(Some(r)); }
- }
- }
- Ok(None)
- }
}
// --- Tauri commands ---
@@ -492,18 +465,6 @@ pub fn ble_get_hr(
{ android::read_hr_data(&app) }
}
-// Latest barometer reading (BaroBalDav). Android: read from the file the Kotlin BLE service writes.
-// Desktop: not wired (btleplug baro path not implemented) — returns None.
-#[tauri::command]
-pub fn ble_get_baro(
- app: tauri::AppHandle,
-) -> Result, String> {
- #[cfg(not(target_os = "android"))]
- { let _ = &app; Ok(None) }
- #[cfg(target_os = "android")]
- { android::read_baro_data(&app) }
-}
-
// Full HR history for the current workout. The Kotlin foreground service appends every
// reading to ble_hr_log.jsonl (one {"hr","ts"[,"bat"]} per line) — that keeps logging with
// the screen off, unlike the JS poll which Android freezes in the background. The workout
@@ -596,29 +557,6 @@ pub fn ble_save_device(app: tauri::AppHandle, address: String, device_type: Stri
Ok(())
}
-// Disconnect ONLY the barometer (its own service), leaving the HR strap connected.
-#[tauri::command]
-pub async fn ble_baro_disconnect(app: tauri::AppHandle) -> Result {
- #[cfg(not(target_os = "android"))]
- { let _ = &app; Ok("desktop: no-op".to_string()) }
- #[cfg(target_os = "android")]
- { android::send_command(&app, "baro_disconnect")?; Ok("Disconnecting baro".to_string()) }
-}
-
-// Persist the paired barometer so the Kotlin side auto-connects it at start (separate from the HR
-// device file). Empty address clears it.
-#[tauri::command]
-pub fn ble_save_baro_device(app: tauri::AppHandle, address: String) -> Result<(), String> {
- use tauri::Manager;
- let data_dir = app.path().app_data_dir().map_err(|e: tauri::Error| e.to_string())?;
- let json = format!(r#"{{"addr":"{}","type":"baro"}}"#, address);
- std::fs::write(data_dir.join("baro_device.json"), &json).ok();
- if let Some(root) = data_dir.parent().and_then(|p| p.parent()) {
- std::fs::write(root.join("baro_device.json"), &json).ok();
- }
- Ok(())
-}
-
#[tauri::command]
pub fn ble_check_bluetooth(
app: tauri::AppHandle,
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 9025eb6..b7b4260 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -550,12 +550,10 @@ fn gps_service_command(app: tauri::AppHandle, cmd: String) -> Result) -> Result {
- // seed_seq: bump it (e.g. a timestamp) whenever the base deficit is recomputed mid-session
- // (after logging a drink) so the native side re-applies start_deficit_ml to its baseDeficit.
+fn set_hydration_config(app: tauri::AppHandle, enabled: bool, alert_ml: u32, sweat_ml_per_hour: u32, re_alert_min: u32, start_deficit_ml: u32) -> Result {
let json = format!(
- "{{\"enabled\":{},\"alertMl\":{},\"sweatMlPerHour\":{},\"reAlertMin\":{},\"startDeficitMl\":{},\"seedSeq\":{}}}",
- enabled, alert_ml.clamp(100, 3000), sweat_ml_per_hour.clamp(60, 2000), re_alert_min.clamp(2, 120), start_deficit_ml.clamp(0, 5000), seed_seq.unwrap_or(0)
+ "{{\"enabled\":{},\"alertMl\":{},\"sweatMlPerHour\":{},\"reAlertMin\":{},\"startDeficitMl\":{}}}",
+ enabled, alert_ml.clamp(100, 3000), sweat_ml_per_hour.clamp(60, 2000), re_alert_min.clamp(2, 120), start_deficit_ml.clamp(0, 5000)
);
write_app_root_file(&app, "hydration.json", &json);
Ok(json)
@@ -1315,7 +1313,7 @@ pub fn run() {
.add_migrations("sqlite:baldav.db", migrations)
.build(),
)
- .invoke_handler(tauri::generate_handler![get_safe_insets, import_seed_products, import_tiles, download_file, get_points_filename, delete_points_file, gps_set_session_id, list_points_files, read_points_file, pick_file_open, get_picked_file, debug_native_paths, rebuild_roads, get_road_points, get_ride_graph, get_elev_correction, get_app_info, gps_service_command, set_hydration_config, set_live_config, send_sms, pick_contact, get_contact_result, gps_service_read_points, brouter_route, brouter_download_tile, brouter_download_status, brouter_list_tiles, save_file, export_image, read_file_base64, export_db, import_db, restart_app, get_update_info, http_request, chzn_http, ble::ble_scan, ble::ble_scan_results, ble::ble_connect, ble::ble_disconnect, ble::ble_get_hr, ble::ble_get_baro, ble::ble_baro_disconnect, ble::ble_save_baro_device, ble::ble_is_connected, ble::ble_check_bluetooth, ble::ble_save_device, ble::ble_clear_hr, ble::ble_read_hr_log, ble::ble_read_strap_uptime, ble::ble_reset_strap_uptime, ble::ble_request_enable, read_state_file])
+ .invoke_handler(tauri::generate_handler![get_safe_insets, import_seed_products, import_tiles, download_file, get_points_filename, delete_points_file, gps_set_session_id, list_points_files, read_points_file, pick_file_open, get_picked_file, debug_native_paths, rebuild_roads, get_road_points, get_ride_graph, get_elev_correction, get_app_info, gps_service_command, set_hydration_config, set_live_config, send_sms, pick_contact, get_contact_result, gps_service_read_points, brouter_route, brouter_download_tile, brouter_download_status, brouter_list_tiles, save_file, export_image, read_file_base64, export_db, import_db, restart_app, get_update_info, http_request, chzn_http, ble::ble_scan, ble::ble_scan_results, ble::ble_connect, ble::ble_disconnect, ble::ble_get_hr, ble::ble_is_connected, ble::ble_check_bluetooth, ble::ble_save_device, ble::ble_clear_hr, ble::ble_read_hr_log, ble::ble_read_strap_uptime, ble::ble_reset_strap_uptime, ble::ble_request_enable, read_state_file])
.run(tauri::generate_context!())
.expect("error while running tauri application");
}
diff --git a/tools/baro-sensor/arduino/baro_sensor/baro_sensor.ino b/tools/baro-sensor/arduino/baro_sensor/baro_sensor.ino
deleted file mode 100644
index 3b14838..0000000
--- a/tools/baro-sensor/arduino/baro_sensor/baro_sensor.ino
+++ /dev/null
@@ -1,70 +0,0 @@
-// BalDav BLE barometer - Arduino IDE version (ESP32-C3 SuperMini + BMP280).
-// Reads BMP280 over I2C at max oversampling (+IIR) and broadcasts pressure and temperature over
-// BLE as the standard Environmental Sensing service, ~1 Hz. baldav reads it via noble and turns
-// pressure into altitude (using the temperature for the hypsometric correction). It advertises
-// continuously so a USB power bank does not cut off on an idle load.
-//
-// One-time setup in Arduino IDE:
-// 1. File > Preferences > Additional Boards Manager URLs:
-// https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
-// 2. Boards Manager: install "esp32 by Espressif Systems".
-// 3. Tools > Board > ESP32 Arduino > "ESP32C3 Dev Module".
-// Tools > USB CDC On Boot > Enabled (so the native USB serial works).
-// 4. Library Manager: install "Adafruit BMP280 Library" (pulls Adafruit Unified Sensor +
-// Adafruit BusIO) and "NimBLE-Arduino".
-// 5. Plug the board (USB-C), pick the port, press Upload.
-// If upload can't connect: hold BOOT (GPIO9), tap RESET, release BOOT, upload again.
-
-#include
-#include
-#include
-
-static const int SDA_PIN = 3; // BMP280 SDA -> GPIO3
-static const int SCL_PIN = 4; // BMP280 SCL -> GPIO4
-static const uint8_t BMP_ADDR_A = 0x76; // SDO -> GND
-static const uint8_t BMP_ADDR_B = 0x77; // SDO -> 3V3 (fallback)
-
-Adafruit_BMP280 bmp;
-NimBLECharacteristic* chPress; // 0x2A6D Pressure, uint32, units 0.1 Pa
-NimBLECharacteristic* chTemp; // 0x2A6E Temperature, int16, units 0.01 C
-
-void setup() {
- Serial.begin(115200);
- Wire.begin(SDA_PIN, SCL_PIN);
- if (!bmp.begin(BMP_ADDR_A) && !bmp.begin(BMP_ADDR_B)) {
- Serial.println("BMP280 not found - check VCC/GND/SDA/SCL, CSB->3V3, SDO->GND");
- }
- bmp.setSampling(Adafruit_BMP280::MODE_NORMAL,
- Adafruit_BMP280::SAMPLING_X2, // temperature oversampling
- Adafruit_BMP280::SAMPLING_X16, // pressure oversampling (max)
- Adafruit_BMP280::FILTER_X16, // IIR filter (max smoothing)
- Adafruit_BMP280::STANDBY_MS_250);
-
- NimBLEDevice::init("BaroBalDav");
- NimBLEServer* srv = NimBLEDevice::createServer();
- NimBLEService* ess = srv->createService("181A"); // Environmental Sensing
- chPress = ess->createCharacteristic("2A6D",
- NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY); // Pressure
- chTemp = ess->createCharacteristic("2A6E",
- NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY); // Temperature
- ess->start();
-
- NimBLEAdvertising* adv = NimBLEDevice::getAdvertising();
- adv->addServiceUUID("181A");
- adv->setName("BaroBalDav");
- adv->start();
-}
-
-void loop() {
- float pa = bmp.readPressure(); // Pa
- float tc = bmp.readTemperature(); // deg C (chip temperature)
-
- uint32_t pv = (uint32_t)lroundf(pa * 10.0f); // 0.1 Pa units per BLE spec
- int16_t tv = (int16_t)lroundf(tc * 100.0f); // 0.01 C units per BLE spec
-
- chPress->setValue((uint8_t*)&pv, sizeof(pv)); chPress->notify();
- chTemp->setValue((uint8_t*)&tv, sizeof(tv)); chTemp->notify();
-
- Serial.printf("P=%.2f hPa T=%.2f C\n", pa / 100.0f, tc);
- delay(1000);
-}
diff --git a/tools/baro-sensor/emulate_baro.py b/tools/baro-sensor/emulate_baro.py
deleted file mode 100644
index e0a3ca6..0000000
--- a/tools/baro-sensor/emulate_baro.py
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/usr/bin/env python3
-# Emulate the "BaroBalDav" sensor on this PC's Bluetooth so the phone's baldav can be tested
-# against the REAL Kotlin BLE read path before the ESP32 arrives. Advertises the standard
-# Environmental Sensing service (0x181A) with Pressure (0x2A6D, uint32 0.1 Pa) and Temperature
-# (0x2A6E, int16 0.01 C), and pushes a simulated pressure that rises and falls so altitude moves.
-#
-# Pure BlueZ D-Bus GATT server (python3-dbus + python3-gi) - no bluetoothctl, no pip installs.
-# Run: python3 tools/baro-sensor/emulate_baro.py (Ctrl+C to stop)
-import struct, math, time, sys
-import dbus, dbus.mainloop.glib, dbus.service
-from gi.repository import GLib
-
-BLUEZ = "org.bluez"
-ADAPTER_IFACE = "org.bluez.Adapter1"
-GATT_MANAGER = "org.bluez.GattManager1"
-LE_ADV_MANAGER = "org.bluez.LEAdvertisingManager1"
-DBUS_OM = "org.freedesktop.DBus.ObjectManager"
-DBUS_PROP = "org.freedesktop.DBus.Properties"
-
-ESS_UUID = "0000181a-0000-1000-8000-00805f9b34fb"
-PRESSURE_UUID = "00002a6d-0000-1000-8000-00805f9b34fb"
-TEMP_UUID = "00002a6e-0000-1000-8000-00805f9b34fb"
-
-def find_adapter(bus):
- om = dbus.Interface(bus.get_object(BLUEZ, "/"), DBUS_OM)
- for path, ifaces in om.GetManagedObjects().items():
- if ADAPTER_IFACE in ifaces and LE_ADV_MANAGER in ifaces:
- return path
- return None
-
-# ---- GATT application / service / characteristic boilerplate (BlueZ example pattern) ----
-class Application(dbus.service.Object):
- def __init__(self, bus):
- self.path = "/dev/baldav/baro"
- self.services = []
- dbus.service.Object.__init__(self, bus, self.path)
- def get_path(self): return dbus.ObjectPath(self.path)
- def add_service(self, s): self.services.append(s)
- @dbus.service.method(DBUS_OM, out_signature="a{oa{sa{sv}}}")
- def GetManagedObjects(self):
- out = {}
- for s in self.services:
- out[s.get_path()] = s.get_properties()
- for c in s.chars:
- out[c.get_path()] = c.get_properties()
- return out
-
-class Service(dbus.service.Object):
- def __init__(self, bus, index, uuid, primary=True):
- self.path = "/dev/baldav/baro/service%d" % index
- self.uuid = uuid; self.primary = primary; self.chars = []
- dbus.service.Object.__init__(self, bus, self.path)
- def get_path(self): return dbus.ObjectPath(self.path)
- def add_char(self, c): self.chars.append(c)
- def get_properties(self):
- return {"org.bluez.GattService1": {
- "UUID": self.uuid, "Primary": self.primary,
- "Characteristics": dbus.Array([c.get_path() for c in self.chars], signature="o")}}
-
-class Characteristic(dbus.service.Object):
- def __init__(self, bus, index, uuid, flags, service):
- self.path = service.path + "/char%d" % index
- self.uuid = uuid; self.flags = flags; self.service = service
- self.notifying = False; self.value = []
- dbus.service.Object.__init__(self, bus, self.path)
- def get_path(self): return dbus.ObjectPath(self.path)
- def get_properties(self):
- return {"org.bluez.GattCharacteristic1": {
- "Service": self.service.get_path(), "UUID": self.uuid, "Flags": self.flags}}
- @dbus.service.method(DBUS_PROP, in_signature="s", out_signature="a{sv}")
- def GetAll(self, iface):
- if iface != "org.bluez.GattCharacteristic1":
- raise dbus.exceptions.DBusException("org.bluez.Error.InvalidArguments")
- return self.get_properties()["org.bluez.GattCharacteristic1"]
- @dbus.service.method("org.bluez.GattCharacteristic1", in_signature="a{sv}", out_signature="ay")
- def ReadValue(self, options): return dbus.Array(self.value, signature="y")
- @dbus.service.method("org.bluez.GattCharacteristic1")
- def StartNotify(self):
- self.notifying = True
- print(" [%s] StartNotify" % self.uuid[4:8])
- @dbus.service.method("org.bluez.GattCharacteristic1")
- def StopNotify(self):
- self.notifying = False
- print(" [%s] StopNotify" % self.uuid[4:8])
- @dbus.service.signal(DBUS_PROP, signature="sa{sv}as")
- def PropertiesChanged(self, iface, changed, invalidated): pass
- def set_value(self, raw):
- self.value = [dbus.Byte(b) for b in raw]
- if self.notifying:
- self.PropertiesChanged("org.bluez.GattCharacteristic1",
- {"Value": dbus.Array(self.value, signature="y")}, [])
-
-# ---- LE advertisement ----
-class Advertisement(dbus.service.Object):
- def __init__(self, bus, index):
- self.path = "/dev/baldav/baro/adv%d" % index
- dbus.service.Object.__init__(self, bus, self.path)
- def get_path(self): return dbus.ObjectPath(self.path)
- @dbus.service.method(DBUS_PROP, in_signature="s", out_signature="a{sv}")
- def GetAll(self, iface):
- if iface != "org.bluez.LEAdvertisement1":
- raise dbus.exceptions.DBusException("org.bluez.Error.InvalidArguments")
- return {
- "Type": "peripheral",
- "ServiceUUIDs": dbus.Array([ESS_UUID], signature="s"),
- "LocalName": dbus.String("BaroBalDav"),
- "Includes": dbus.Array(["tx-power"], signature="s"),
- }
- @dbus.service.method("org.bluez.LEAdvertisement1")
- def Release(self): print("Advertisement released")
-
-# ---- pressure/temperature simulation ----
-def enc_pressure(pa): return struct.pack(" it enters download mode, then retry upload.
-
-[env:esp32-c3-supermini]
-platform = espressif32
-board = esp32-c3-devkitm-1
-framework = arduino
-monitor_speed = 115200
-; native USB-CDC so the board enumerates as a serial port over its own USB-C
-build_flags =
- -D ARDUINO_USB_MODE=1
- -D ARDUINO_USB_CDC_ON_BOOT=1
-lib_deps =
- adafruit/Adafruit BMP280 Library @ ^2.6.8
- h2zero/NimBLE-Arduino @ ^1.4.1
diff --git a/tools/baro-sensor/src/main.cpp b/tools/baro-sensor/src/main.cpp
deleted file mode 100644
index 94a341c..0000000
--- a/tools/baro-sensor/src/main.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-// BalDav BLE barometer: ESP32-C3 SuperMini + BMP280.
-// Reads the BMP280 over I2C at max oversampling (+IIR filter) and broadcasts pressure and
-// temperature over BLE as the standard Environmental Sensing service, ~1 Hz. baldav reads it
-// via noble like the HR strap and turns pressure into altitude (using the temperature for the
-// hypsometric correction). It advertises continuously (no deep sleep) so a USB power bank does
-// not cut off on an idle load; current is dominated by the radio, the barometer is negligible.
-#include
-#include
-#include
-
-static const int SDA_PIN = 3; // BMP280 SDA -> GPIO3
-static const int SCL_PIN = 4; // BMP280 SCL -> GPIO4
-static const uint8_t BMP_ADDR_A = 0x76; // SDO->GND
-static const uint8_t BMP_ADDR_B = 0x77; // SDO->3V3 (fallback)
-
-Adafruit_BMP280 bmp;
-NimBLECharacteristic* chPress; // 0x2A6D Pressure, uint32, units 0.1 Pa
-NimBLECharacteristic* chTemp; // 0x2A6E Temperature, int16, units 0.01 C
-
-void setup() {
- Serial.begin(115200);
- Wire.begin(SDA_PIN, SCL_PIN);
- if (!bmp.begin(BMP_ADDR_A) && !bmp.begin(BMP_ADDR_B)) {
- Serial.println("BMP280 not found - check wiring (VCC/GND/SDA/SCL, CSB->3V3, SDO->GND)");
- }
- // Max pressure oversampling + max IIR filter = lowest noise. We sample ~1 Hz, so the extra
- // conversion time costs microamps - nothing next to the BLE radio.
- bmp.setSampling(Adafruit_BMP280::MODE_NORMAL,
- Adafruit_BMP280::SAMPLING_X2, // temperature oversampling
- Adafruit_BMP280::SAMPLING_X16, // pressure oversampling (max)
- Adafruit_BMP280::FILTER_X16, // IIR filter (max smoothing)
- Adafruit_BMP280::STANDBY_MS_250);
-
- NimBLEDevice::init("BaroBalDav");
- NimBLEServer* srv = NimBLEDevice::createServer();
- NimBLEService* ess = srv->createService("181A"); // Environmental Sensing
- chPress = ess->createCharacteristic("2A6D",
- NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY); // Pressure
- chTemp = ess->createCharacteristic("2A6E",
- NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY); // Temperature
- ess->start();
-
- NimBLEAdvertising* adv = NimBLEDevice::getAdvertising();
- adv->addServiceUUID("181A");
- adv->setName("BaroBalDav");
- adv->start();
-}
-
-void loop() {
- float pa = bmp.readPressure(); // Pa
- float tc = bmp.readTemperature(); // deg C (chip temperature)
-
- uint32_t pv = (uint32_t)lroundf(pa * 10.0f); // 0.1 Pa units per BLE spec
- int16_t tv = (int16_t)lroundf(tc * 100.0f); // 0.01 C units per BLE spec
-
- chPress->setValue((uint8_t*)&pv, sizeof(pv)); chPress->notify();
- chTemp->setValue((uint8_t*)&tv, sizeof(tv)); chTemp->notify();
-
- Serial.printf("P=%.2f hPa T=%.2f C\n", pa / 100.0f, tc);
- delay(1000);
-}