cn/miflorad
1
0
Fork 0
mirror of https://github.com/cmur2/miflorad.git synced 2026-04-02 16:18:34 +02:00
Code Releases Activity

reorga

Browse Source
This commit is contained in:
cn
2018-12-12 07:26:18 +01:00
parent 1fff831652
commit 11971e9274
8 changed files with 86 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/mifloractl/main.go → cmd/munin-miflora/main.go
View File

@@ -90,11 +90,11 @@ func onPeriphConnected(p gatt.Peripheral, err error) {
return
}
fmt.Fprintf(os.Stdout, "%s.miflora.%s.battery_level %d %d\n", prefix, id, metaData.BatteryLevel, time.Now().Unix())
// fmt.Fprintf(os.Stdout, "Battery level: %d%%\n", metaData.BatteryLevel)
// fmt.Fprintf(os.Stdout, "%s.miflora.%s.firmware_version %s %d\n", prefix, id, metaData.FirmwareVersion, time.Now().Unix())
fmt.Fprintf(os.Stderr, "Firmware version: %s\n", metaData.FirmwareVersion)
fmt.Fprintf(os.Stdout, "%s.miflora.%s.battery_level %d %d\n", prefix, id, metaData.BatteryLevel, time.Now().Unix())
fmt.Fprintf(os.Stdout, "%s.miflora.%s.firmware_version %s %d\n", prefix, id, metaData.NumericFirmwareVersion(), time.Now().Unix())
// for the newer models a magic number must be written before we can read the current data
if metaData.FirmwareVersion >= "2.6.6" {
err2 := common.MifloraRequestModeChange(p)
@@ -113,10 +113,6 @@ func onPeriphConnected(p gatt.Peripheral, err error) {
fmt.Fprintf(os.Stdout, "%s.miflora.%s.brightness %d %d\n", prefix, id, sensorData.Brightness, time.Now().Unix())
fmt.Fprintf(os.Stdout, "%s.miflora.%s.moisture %d %d\n", prefix, id, sensorData.Moisture, time.Now().Unix())
fmt.Fprintf(os.Stdout, "%s.miflora.%s.conductivity %d %d\n", prefix, id, sensorData.Conductivity, time.Now().Unix())
// fmt.Fprintf(os.Stdout, "Temperature: %.1f °C\n", sensorData.Temperature)
// fmt.Fprintf(os.Stdout, "Brightness: %d lux\n", sensorData.Brightness)
// fmt.Fprintf(os.Stdout, "Moisture: %d %%\n", sensorData.Moisture)
// fmt.Fprintf(os.Stdout, "Conductivity: %d µS/cm\n", sensorData.Conductivity)
}
func onPeriphDisconnected(p gatt.Peripheral, err error) {
@@ -171,6 +167,7 @@ func main() {
fmt.Fprintln(os.Stderr, "Connection timed out")
// TODO: can hang due when device has terminated the connection on it's own already
// device.CancelConnection(discoveryResult.p)
os.Exit(1)
}
// Note: calls CancelConnetcion() and thus suffers the same problem, kernel will cleanup after our process finishes