Merge branch 'bluetooth'

Author: benma

api/firmware/bluetooth.go

@@ -19,7 +19,7 @@ import (
 	"github.com/BitBoxSwiss/bitbox02-api-go/util/errp"
 )
 
-// nonAtomicQueryBluetooth is like query, but nested one level deeper for Bluetooth.
+// nonAtomicQueryBluetooth is like nonAtomicQuery, but nested one level deeper for Bluetooth.
 func (device *Device) nonAtomicQueryBluetooth(request *messages.BluetoothRequest) (*messages.BluetoothResponse, error) {
 	if !device.SupportsBluetooth() {
 		return nil, errp.New("this device does not support Bluetooth")
@@ -39,6 +39,13 @@ func (device *Device) nonAtomicQueryBluetooth(request *messages.BluetoothRequest
 	return bluetoothResponse.Bluetooth, nil
 }
 
+// queryBluetooth is like query, but nested one level deeper for Bluetooth.
+func (device *Device) queryBluetooth(request *messages.BluetoothRequest) (*messages.BluetoothResponse, error) {
+	return atomicQueriesValue(device, func() (*messages.BluetoothResponse, error) {
+		return device.nonAtomicQueryBluetooth(request)
+	})
+}
+
 // BluetoothUpgrade attempts an upgrade of the Bluetooth firmware.
 func (device *Device) BluetoothUpgrade(firmware []byte) error {
 	return device.atomicQueries(func() error {
@@ -80,3 +87,20 @@ func (device *Device) BluetoothUpgrade(firmware []byte) error {
 		}
 	})
 }
+
+// BluetoothToggleEnabled enables/disables Bluetooth.
+func (device *Device) BluetoothToggleEnabled() error {
+	response, err := device.queryBluetooth(&messages.BluetoothRequest{
+		Request: &messages.BluetoothRequest_ToggleEnabled{
+			ToggleEnabled: &messages.BluetoothToggleEnabledRequest{},
+		},
+	})
+	if err != nil {
+		return err
+	}
+	_, ok := response.Response.(*messages.BluetoothResponse_Success)
+	if !ok {
+		return errp.New("unexpected response")
+	}
+	return nil
+}

api/firmware/device.go

@@ -116,6 +116,10 @@ type Device struct {
 type BluetoothInfo struct {
 	// FirmwareHash is the hex-encoded 32 byte Bluetooth firmware hash.
 	FirmwareHash string `json:"firmwareHash"`
+	// FirmwareVersion is the Bluetooth firmware version, formated as "major.minor.patch".
+	FirmwareVersion string `json:"firmwareVersion"`
+	// Enabled is true if Bluetooth is enabled.
+	Enabled bool `json:"enabled"`
 }
 
 // DeviceInfo is the data returned from the device info api call.

api/firmware/messages/bitbox02_system.pb.go

@@ -29,6 +29,10 @@ message DeviceInfoResponse {
   message Bluetooth {
     // Hash of the currently active Bluetooth firmware on the device.
     bytes firmware_hash = 1;
+    // Firmware version, formated as an unsigned integer "1", "2", etc.
+    string firmware_version = 2;
+    // True if Bluetooth is enabled
+    bool enabled = 3;
   }
   string name = 1;
   bool initialized = 2;