Skip to content

Commit 2d17cd3

Browse files
author
Emilio Pavia
committed
Fix code indentation
1 parent edb24a6 commit 2d17cd3

File tree

2 files changed

+105
-65
lines changed

2 files changed

+105
-65
lines changed

‎ScienceJournal/BLEArduino/MKRWiFi1010ServiceInterface.swift‎

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,29 @@ class MKRWiFi1010ServiceInterface: BLEServiceInterface {
3939
class func sensor(for spec: SensorSpec) -> BLESensorInterface? {
4040
switch spec.gadgetInfo.address {
4141
case BLEScienceKitVoltageSensor.identifier:
42-
return BLEScienceKitSensorInterface(spec: spec, sensor: BLEScienceKitVoltageSensor(),
43-
serviceId: MKRWiFi1010Ids.serviceUUID)
42+
return BLEScienceKitSensorInterface(spec: spec,
43+
sensor: BLEScienceKitVoltageSensor(),
44+
serviceId: MKRWiFi1010Ids.serviceUUID)
4445
case BLEScienceKitCurrentSensor.identifier:
45-
return BLEScienceKitSensorInterface(spec: spec, sensor: BLEScienceKitCurrentSensor(),
46-
serviceId: MKRWiFi1010Ids.serviceUUID)
46+
return BLEScienceKitSensorInterface(spec: spec,
47+
sensor: BLEScienceKitCurrentSensor(),
48+
serviceId: MKRWiFi1010Ids.serviceUUID)
4749
case BLEScienceKitResistanceSensor.identifier:
48-
return BLEScienceKitSensorInterface(spec: spec, sensor: BLEScienceKitResistanceSensor(),
49-
serviceId: MKRWiFi1010Ids.serviceUUID)
50+
return BLEScienceKitSensorInterface(spec: spec,
51+
sensor: BLEScienceKitResistanceSensor(),
52+
serviceId: MKRWiFi1010Ids.serviceUUID)
5053
case BLEScienceKitInput1Sensor.identifier:
51-
return BLEScienceKitSensorInterface(spec: spec, sensor: BLEScienceKitInput1Sensor(),
52-
serviceId: MKRWiFi1010Ids.serviceUUID)
54+
return BLEScienceKitSensorInterface(spec: spec,
55+
sensor: BLEScienceKitInput1Sensor(),
56+
serviceId: MKRWiFi1010Ids.serviceUUID)
5357
case BLEScienceKitInput2Sensor.identifier:
54-
return BLEScienceKitSensorInterface(spec: spec, sensor: BLEScienceKitInput2Sensor(),
55-
serviceId: MKRWiFi1010Ids.serviceUUID)
58+
return BLEScienceKitSensorInterface(spec: spec,
59+
sensor: BLEScienceKitInput2Sensor(),
60+
serviceId: MKRWiFi1010Ids.serviceUUID)
5661
case BLEScienceKitInput3Sensor.identifier:
57-
return BLEScienceKitSensorInterface(spec: spec, sensor: BLEScienceKitInput3Sensor(),
58-
serviceId: MKRWiFi1010Ids.serviceUUID)
62+
return BLEScienceKitSensorInterface(spec: spec,
63+
sensor: BLEScienceKitInput3Sensor(),
64+
serviceId: MKRWiFi1010Ids.serviceUUID)
5965
case BLEScienceKitLinearAccelerometerSensor.identifier:
6066
return BLEScienceKitSensorInterface(spec: spec,
6167
sensor: BLEScienceKitLinearAccelerometerSensor(),
@@ -95,18 +101,24 @@ class MKRWiFi1010ServiceInterface: BLEServiceInterface {
95101

96102
func devicesForPeripheral(_ peripheral: CBPeripheral) -> [BLESensorInterface] {
97103
return [
98-
BLEScienceKitSensorInterface(peripheral: peripheral, sensor: BLEScienceKitVoltageSensor(),
99-
serviceId: MKRWiFi1010Ids.serviceUUID),
100-
BLEScienceKitSensorInterface(peripheral: peripheral, sensor: BLEScienceKitCurrentSensor(),
101-
serviceId: MKRWiFi1010Ids.serviceUUID),
102-
BLEScienceKitSensorInterface(peripheral: peripheral, sensor: BLEScienceKitResistanceSensor(),
103-
serviceId: MKRWiFi1010Ids.serviceUUID),
104-
BLEScienceKitSensorInterface(peripheral: peripheral, sensor: BLEScienceKitInput1Sensor(),
105-
serviceId: MKRWiFi1010Ids.serviceUUID),
106-
BLEScienceKitSensorInterface(peripheral: peripheral, sensor: BLEScienceKitInput2Sensor(),
107-
serviceId: MKRWiFi1010Ids.serviceUUID),
108-
BLEScienceKitSensorInterface(peripheral: peripheral, sensor: BLEScienceKitInput3Sensor(),
109-
serviceId: MKRWiFi1010Ids.serviceUUID),
104+
BLEScienceKitSensorInterface(peripheral: peripheral,
105+
sensor: BLEScienceKitVoltageSensor(),
106+
serviceId: MKRWiFi1010Ids.serviceUUID),
107+
BLEScienceKitSensorInterface(peripheral: peripheral,
108+
sensor: BLEScienceKitCurrentSensor(),
109+
serviceId: MKRWiFi1010Ids.serviceUUID),
110+
BLEScienceKitSensorInterface(peripheral: peripheral,
111+
sensor: BLEScienceKitResistanceSensor(),
112+
serviceId: MKRWiFi1010Ids.serviceUUID),
113+
BLEScienceKitSensorInterface(peripheral: peripheral,
114+
sensor: BLEScienceKitInput1Sensor(),
115+
serviceId: MKRWiFi1010Ids.serviceUUID),
116+
BLEScienceKitSensorInterface(peripheral: peripheral,
117+
sensor: BLEScienceKitInput2Sensor(),
118+
serviceId: MKRWiFi1010Ids.serviceUUID),
119+
BLEScienceKitSensorInterface(peripheral: peripheral,
120+
sensor: BLEScienceKitInput3Sensor(),
121+
serviceId: MKRWiFi1010Ids.serviceUUID),
110122
BLEScienceKitSensorInterface(peripheral: peripheral,
111123
sensor: BLEScienceKitLinearAccelerometerSensor(),
112124
serviceId: MKRWiFi1010Ids.serviceUUID),

‎ScienceJournal/BLEArduino/Nano33BLESenseServiceInterface.swift‎

Lines changed: 69 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -39,47 +39,61 @@ class Nano33BLESenseServiceInterface: BLEServiceInterface {
3939
class func sensor(for spec: SensorSpec) -> BLESensorInterface? {
4040
switch spec.gadgetInfo.address {
4141
case Nano33BLESenseTemperatureSensor.identifier:
42-
return BLEScienceKitSensorInterface(spec: spec, sensor: Nano33BLESenseTemperatureSensor(),
42+
return BLEScienceKitSensorInterface(spec: spec,
43+
sensor: Nano33BLESenseTemperatureSensor(),
4344
serviceId: Nano33BLESenseIds.serviceUUID)
4445
case Nano33BLESenseAccelerometerXSensor.identifier:
45-
return BLEScienceKitSensorInterface(spec: spec, sensor: Nano33BLESenseAccelerometerXSensor(),
46-
serviceId: Nano33BLESenseIds.serviceUUID)
46+
return BLEScienceKitSensorInterface(spec: spec,
47+
sensor: Nano33BLESenseAccelerometerXSensor(),
48+
serviceId: Nano33BLESenseIds.serviceUUID)
4749
case Nano33BLESenseAccelerometerYSensor.identifier:
48-
return BLEScienceKitSensorInterface(spec: spec, sensor: Nano33BLESenseAccelerometerYSensor(),
49-
serviceId: Nano33BLESenseIds.serviceUUID)
50+
return BLEScienceKitSensorInterface(spec: spec,
51+
sensor: Nano33BLESenseAccelerometerYSensor(),
52+
serviceId: Nano33BLESenseIds.serviceUUID)
5053
case Nano33BLESenseAccelerometerZSensor.identifier:
51-
return BLEScienceKitSensorInterface(spec: spec, sensor: Nano33BLESenseAccelerometerZSensor(),
52-
serviceId: Nano33BLESenseIds.serviceUUID)
54+
return BLEScienceKitSensorInterface(spec: spec,
55+
sensor: Nano33BLESenseAccelerometerZSensor(),
56+
serviceId: Nano33BLESenseIds.serviceUUID)
5357
case Nano33BLESenseLinearAccelerometerSensor.identifier:
54-
return BLEScienceKitSensorInterface(spec: spec, sensor: Nano33BLESenseLinearAccelerometerSensor(),
55-
serviceId: Nano33BLESenseIds.serviceUUID)
58+
return BLEScienceKitSensorInterface(spec: spec,
59+
sensor: Nano33BLESenseLinearAccelerometerSensor(),
60+
serviceId: Nano33BLESenseIds.serviceUUID)
5661
case Nano33BLESenseGyroscopeXSensor.identifier:
57-
return BLEScienceKitSensorInterface(spec: spec, sensor: Nano33BLESenseGyroscopeXSensor(),
58-
serviceId: Nano33BLESenseIds.serviceUUID)
62+
return BLEScienceKitSensorInterface(spec: spec,
63+
sensor: Nano33BLESenseGyroscopeXSensor(),
64+
serviceId: Nano33BLESenseIds.serviceUUID)
5965
case Nano33BLESenseGyroscopeYSensor.identifier:
60-
return BLEScienceKitSensorInterface(spec: spec, sensor: Nano33BLESenseGyroscopeYSensor(),
61-
serviceId: Nano33BLESenseIds.serviceUUID)
66+
return BLEScienceKitSensorInterface(spec: spec,
67+
sensor: Nano33BLESenseGyroscopeYSensor(),
68+
serviceId: Nano33BLESenseIds.serviceUUID)
6269
case Nano33BLESenseGyroscopeZSensor.identifier:
63-
return BLEScienceKitSensorInterface(spec: spec, sensor: Nano33BLESenseGyroscopeZSensor(),
64-
serviceId: Nano33BLESenseIds.serviceUUID)
70+
return BLEScienceKitSensorInterface(spec: spec,
71+
sensor: Nano33BLESenseGyroscopeZSensor(),
72+
serviceId: Nano33BLESenseIds.serviceUUID)
6573
case Nano33BLESenseMagnetometerSensor.identifier:
66-
return BLEScienceKitSensorInterface(spec: spec, sensor: Nano33BLESenseMagnetometerSensor(),
67-
serviceId: Nano33BLESenseIds.serviceUUID)
74+
return BLEScienceKitSensorInterface(spec: spec,
75+
sensor: Nano33BLESenseMagnetometerSensor(),
76+
serviceId: Nano33BLESenseIds.serviceUUID)
6877
case Nano33BLESenseBarometricPressureSensor.identifier:
69-
return BLEScienceKitSensorInterface(spec: spec, sensor: Nano33BLESenseBarometricPressureSensor(),
70-
serviceId: Nano33BLESenseIds.serviceUUID)
78+
return BLEScienceKitSensorInterface(spec: spec,
79+
sensor: Nano33BLESenseBarometricPressureSensor(),
80+
serviceId: Nano33BLESenseIds.serviceUUID)
7181
case Nano33BLESenseHumiditySensor.identifier:
72-
return BLEScienceKitSensorInterface(spec: spec, sensor: Nano33BLESenseHumiditySensor(),
73-
serviceId: Nano33BLESenseIds.serviceUUID)
82+
return BLEScienceKitSensorInterface(spec: spec,
83+
sensor: Nano33BLESenseHumiditySensor(),
84+
serviceId: Nano33BLESenseIds.serviceUUID)
7485
case Nano33BLESenseProximitySensor.identifier:
75-
return BLEScienceKitSensorInterface(spec: spec, sensor: Nano33BLESenseProximitySensor(),
76-
serviceId: Nano33BLESenseIds.serviceUUID)
86+
return BLEScienceKitSensorInterface(spec: spec,
87+
sensor: Nano33BLESenseProximitySensor(),
88+
serviceId: Nano33BLESenseIds.serviceUUID)
7789
case Nano33BLESenseColorIlluminanceSensor.identifier:
78-
return BLEScienceKitSensorInterface(spec: spec, sensor: Nano33BLESenseColorIlluminanceSensor(),
79-
serviceId: Nano33BLESenseIds.serviceUUID)
90+
return BLEScienceKitSensorInterface(spec: spec,
91+
sensor: Nano33BLESenseColorIlluminanceSensor(),
92+
serviceId: Nano33BLESenseIds.serviceUUID)
8093
case Nano33BLESenseColorTemperatureSensor.identifier:
81-
return BLEScienceKitSensorInterface(spec: spec, sensor: Nano33BLESenseColorTemperatureSensor(),
82-
serviceId: Nano33BLESenseIds.serviceUUID)
94+
return BLEScienceKitSensorInterface(spec: spec,
95+
sensor: Nano33BLESenseColorTemperatureSensor(),
96+
serviceId: Nano33BLESenseIds.serviceUUID)
8397
default:
8498
return nil
8599
}
@@ -88,33 +102,47 @@ class Nano33BLESenseServiceInterface: BLEServiceInterface {
88102
func devicesForPeripheral(_ peripheral: CBPeripheral) -> [BLESensorInterface] {
89103
return [
90104
BLEScienceKitSensorInterface(peripheral: peripheral,
91-
sensor: Nano33BLESenseTemperatureSensor(), serviceId: Nano33BLESenseIds.serviceUUID),
105+
sensor: Nano33BLESenseTemperatureSensor(),
106+
serviceId: Nano33BLESenseIds.serviceUUID),
92107
BLEScienceKitSensorInterface(peripheral: peripheral,
93-
sensor: Nano33BLESenseAccelerometerXSensor(), serviceId: Nano33BLESenseIds.serviceUUID),
108+
sensor: Nano33BLESenseAccelerometerXSensor(),
109+
serviceId: Nano33BLESenseIds.serviceUUID),
94110
BLEScienceKitSensorInterface(peripheral: peripheral,
95-
sensor: Nano33BLESenseAccelerometerYSensor(), serviceId: Nano33BLESenseIds.serviceUUID),
111+
sensor: Nano33BLESenseAccelerometerYSensor(),
112+
serviceId: Nano33BLESenseIds.serviceUUID),
96113
BLEScienceKitSensorInterface(peripheral: peripheral,
97-
sensor: Nano33BLESenseAccelerometerZSensor(), serviceId: Nano33BLESenseIds.serviceUUID),
114+
sensor: Nano33BLESenseAccelerometerZSensor(),
115+
serviceId: Nano33BLESenseIds.serviceUUID),
98116
BLEScienceKitSensorInterface(peripheral: peripheral,
99-
sensor: Nano33BLESenseLinearAccelerometerSensor(), serviceId: Nano33BLESenseIds.serviceUUID),
117+
sensor: Nano33BLESenseLinearAccelerometerSensor(),
118+
serviceId: Nano33BLESenseIds.serviceUUID),
100119
BLEScienceKitSensorInterface(peripheral: peripheral,
101-
sensor: Nano33BLESenseGyroscopeXSensor(), serviceId: Nano33BLESenseIds.serviceUUID),
120+
sensor: Nano33BLESenseGyroscopeXSensor(),
121+
serviceId: Nano33BLESenseIds.serviceUUID),
102122
BLEScienceKitSensorInterface(peripheral: peripheral,
103-
sensor: Nano33BLESenseGyroscopeYSensor(), serviceId: Nano33BLESenseIds.serviceUUID),
123+
sensor: Nano33BLESenseGyroscopeYSensor(),
124+
serviceId: Nano33BLESenseIds.serviceUUID),
104125
BLEScienceKitSensorInterface(peripheral: peripheral,
105-
sensor: Nano33BLESenseGyroscopeZSensor(), serviceId: Nano33BLESenseIds.serviceUUID),
126+
sensor: Nano33BLESenseGyroscopeZSensor(),
127+
serviceId: Nano33BLESenseIds.serviceUUID),
106128
BLEScienceKitSensorInterface(peripheral: peripheral,
107-
sensor: Nano33BLESenseMagnetometerSensor(), serviceId: Nano33BLESenseIds.serviceUUID),
129+
sensor: Nano33BLESenseMagnetometerSensor(),
130+
serviceId: Nano33BLESenseIds.serviceUUID),
108131
BLEScienceKitSensorInterface(peripheral: peripheral,
109-
sensor: Nano33BLESenseBarometricPressureSensor(), serviceId: Nano33BLESenseIds.serviceUUID),
132+
sensor: Nano33BLESenseBarometricPressureSensor(),
133+
serviceId: Nano33BLESenseIds.serviceUUID),
110134
BLEScienceKitSensorInterface(peripheral: peripheral,
111-
sensor: Nano33BLESenseHumiditySensor(), serviceId: Nano33BLESenseIds.serviceUUID),
135+
sensor: Nano33BLESenseHumiditySensor(),
136+
serviceId: Nano33BLESenseIds.serviceUUID),
112137
BLEScienceKitSensorInterface(peripheral: peripheral,
113-
sensor: Nano33BLESenseProximitySensor(), serviceId: Nano33BLESenseIds.serviceUUID),
138+
sensor: Nano33BLESenseProximitySensor(),
139+
serviceId: Nano33BLESenseIds.serviceUUID),
114140
BLEScienceKitSensorInterface(peripheral: peripheral,
115-
sensor: Nano33BLESenseColorIlluminanceSensor(), serviceId: Nano33BLESenseIds.serviceUUID),
141+
sensor: Nano33BLESenseColorIlluminanceSensor(),
142+
serviceId: Nano33BLESenseIds.serviceUUID),
116143
BLEScienceKitSensorInterface(peripheral: peripheral,
117-
sensor: Nano33BLESenseColorTemperatureSensor(), serviceId: Nano33BLESenseIds.serviceUUID)
144+
sensor: Nano33BLESenseColorTemperatureSensor(),
145+
serviceId: Nano33BLESenseIds.serviceUUID)
118146
]
119147
}
120148
}

0 commit comments

Comments
 (0)