Skip to content

Commit ff3b2bf

Browse files
author
Emilio Pavia
committed
Re-organize project
1 parent 2d17cd3 commit ff3b2bf

File tree

41 files changed

+487
-471
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+487
-471
lines changed

‎ScienceJournal.xcodeproj/project.pbxproj‎

Lines changed: 51 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@
623623
BCB6953A24C05A2B00CFCD9F /* BLEScienceKitInput1Sensor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCB6953924C05A2B00CFCD9F /* BLEScienceKitInput1Sensor.swift */; };
624624
BCB6953D24C08FBC00CFCD9F /* ScienceKitSensorConfigViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCB6953C24C08FBC00CFCD9F /* ScienceKitSensorConfigViewController.swift */; };
625625
BCB6953F24C0970D00CFCD9F /* ScienceKitSensorConfigSelectorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCB6953E24C0970D00CFCD9F /* ScienceKitSensorConfigSelectorView.swift */; };
626-
BCEC93A524C033D20041296C /* BLEScienceKitSensorInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCEC93A424C033D20041296C /* BLEScienceKitSensorInterface.swift */; };
626+
BCEC93A524C033D20041296C /* BLEArduinoSensorInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCEC93A424C033D20041296C /* BLEArduinoSensorInterface.swift */; };
627627
BCEC93A724C038400041296C /* BLEScienceKitVoltageSensor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCEC93A624C038400041296C /* BLEScienceKitVoltageSensor.swift */; };
628628
BCEC93A924C038D40041296C /* BLEScienceKitCurrentSensor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCEC93A824C038D40041296C /* BLEScienceKitCurrentSensor.swift */; };
629629
BCEC93AB24C0471A0041296C /* BLEScienceKitResistanceSensor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCEC93AA24C0471A0041296C /* BLEScienceKitResistanceSensor.swift */; };
@@ -1355,7 +1355,7 @@
13551355
BCB6953924C05A2B00CFCD9F /* BLEScienceKitInput1Sensor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEScienceKitInput1Sensor.swift; sourceTree = "<group>"; };
13561356
BCB6953C24C08FBC00CFCD9F /* ScienceKitSensorConfigViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScienceKitSensorConfigViewController.swift; sourceTree = "<group>"; };
13571357
BCB6953E24C0970D00CFCD9F /* ScienceKitSensorConfigSelectorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScienceKitSensorConfigSelectorView.swift; sourceTree = "<group>"; };
1358-
BCEC93A424C033D20041296C /* BLEScienceKitSensorInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEScienceKitSensorInterface.swift; sourceTree = "<group>"; };
1358+
BCEC93A424C033D20041296C /* BLEArduinoSensorInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEArduinoSensorInterface.swift; sourceTree = "<group>"; };
13591359
BCEC93A624C038400041296C /* BLEScienceKitVoltageSensor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEScienceKitVoltageSensor.swift; sourceTree = "<group>"; };
13601360
BCEC93A824C038D40041296C /* BLEScienceKitCurrentSensor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEScienceKitCurrentSensor.swift; sourceTree = "<group>"; };
13611361
BCEC93AA24C0471A0041296C /* BLEScienceKitResistanceSensor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEScienceKitResistanceSensor.swift; sourceTree = "<group>"; };
@@ -3031,26 +3031,15 @@
30313031
BC3B9634249A6A3E000D7646 /* BLEArduino */ = {
30323032
isa = PBXGroup;
30333033
children = (
3034-
F366759224FE542B004E567D /* Nano 33 BLE Sense Sensors */,
3035-
BCEC93A424C033D20041296C /* BLEScienceKitSensorInterface.swift */,
3036-
F384EA3F24FD82E100E1F1DE /* Nano33BLESenseServiceInterface.swift */,
3037-
BC3B9635249A6B6A000D7646 /* MKRWiFi1010ServiceInterface.swift */,
3038-
BCEC93AC24C0472E0041296C /* ScienceKit Sensors */,
3034+
BCEC93A424C033D20041296C /* BLEArduinoSensorInterface.swift */,
3035+
BCEC93AC24C0472E0041296C /* MKRWiFi1010 */,
3036+
F366759224FE542B004E567D /* Nano33BLE */,
30393037
BCB6953B24C08FA500CFCD9F /* UI */,
30403038
);
30413039
path = BLEArduino;
30423040
sourceTree = "<group>";
30433041
};
3044-
BCB6953B24C08FA500CFCD9F /* UI */ = {
3045-
isa = PBXGroup;
3046-
children = (
3047-
BCB6953C24C08FBC00CFCD9F /* ScienceKitSensorConfigViewController.swift */,
3048-
BCB6953E24C0970D00CFCD9F /* ScienceKitSensorConfigSelectorView.swift */,
3049-
);
3050-
path = UI;
3051-
sourceTree = "<group>";
3052-
};
3053-
BCEC93AC24C0472E0041296C /* ScienceKit Sensors */ = {
3042+
BC9D3E0A2513B7A4009ACA46 /* Sensors */ = {
30543043
isa = PBXGroup;
30553044
children = (
30563045
BC7AB0FB24D07A6500703B2E /* BLEScienceKitAccelerometerXSensor.swift */,
@@ -3068,7 +3057,46 @@
30683057
BCEC93AA24C0471A0041296C /* BLEScienceKitResistanceSensor.swift */,
30693058
BCEC93A624C038400041296C /* BLEScienceKitVoltageSensor.swift */,
30703059
);
3071-
path = "ScienceKit Sensors";
3060+
path = Sensors;
3061+
sourceTree = "<group>";
3062+
};
3063+
BC9D3E0E2513B7C3009ACA46 /* Sensors */ = {
3064+
isa = PBXGroup;
3065+
children = (
3066+
F32D236924FEE75900C7E8CE /* Nano33BLESenseColorIlluminanceSensor.swift */,
3067+
F32D236B24FEECC400C7E8CE /* Nano33BLESenseColorTemperatureSensor.swift */,
3068+
F32D236724FEDDAB00C7E8CE /* Nano33BLESenseProximitySensor.swift */,
3069+
F36675A524FEB18C004E567D /* Nano33BLESenseHumiditySensor.swift */,
3070+
F36675A324FE9D36004E567D /* Nano33BLESenseBarometricPressureSensor.swift */,
3071+
F36675A124FE5F5E004E567D /* Nano33BLESenseMagnetometerSensor.swift */,
3072+
F366759B24FE5B60004E567D /* Nano33BLESenseGyroscopeXSensor.swift */,
3073+
F366759D24FE5B60004E567D /* Nano33BLESenseGyroscopeYSensor.swift */,
3074+
F366759C24FE5B60004E567D /* Nano33BLESenseGyroscopeZSensor.swift */,
3075+
F366759924FE59C2004E567D /* Nano33BLESenseLinearAccelerometerSensor.swift */,
3076+
F366759524FE5697004E567D /* Nano33BLESenseAccelerometerXSensor.swift */,
3077+
F366759324FE5696004E567D /* Nano33BLESenseAccelerometerYSensor.swift */,
3078+
F366759424FE5696004E567D /* Nano33BLESenseAccelerometerZSensor.swift */,
3079+
F384EA4124FD833F00E1F1DE /* Nano33BLESenseTemperatureSensor.swift */,
3080+
);
3081+
path = Sensors;
3082+
sourceTree = "<group>";
3083+
};
3084+
BCB6953B24C08FA500CFCD9F /* UI */ = {
3085+
isa = PBXGroup;
3086+
children = (
3087+
BCB6953C24C08FBC00CFCD9F /* ScienceKitSensorConfigViewController.swift */,
3088+
BCB6953E24C0970D00CFCD9F /* ScienceKitSensorConfigSelectorView.swift */,
3089+
);
3090+
path = UI;
3091+
sourceTree = "<group>";
3092+
};
3093+
BCEC93AC24C0472E0041296C /* MKRWiFi1010 */ = {
3094+
isa = PBXGroup;
3095+
children = (
3096+
BC3B9635249A6B6A000D7646 /* MKRWiFi1010ServiceInterface.swift */,
3097+
BC9D3E0A2513B7A4009ACA46 /* Sensors */,
3098+
);
3099+
path = MKRWiFi1010;
30723100
sourceTree = "<group>";
30733101
};
30743102
D80999890678E0AFC0831674 /* Pods */ = {
@@ -3099,25 +3127,13 @@
30993127
path = Fonts;
31003128
sourceTree = "<group>";
31013129
};
3102-
F366759224FE542B004E567D /* Nano 33 BLE Sense Sensors */ = {
3130+
F366759224FE542B004E567D /* Nano33BLE */ = {
31033131
isa = PBXGroup;
31043132
children = (
3105-
F32D236924FEE75900C7E8CE /* Nano33BLESenseColorIlluminanceSensor.swift */,
3106-
F32D236B24FEECC400C7E8CE /* Nano33BLESenseColorTemperatureSensor.swift */,
3107-
F32D236724FEDDAB00C7E8CE /* Nano33BLESenseProximitySensor.swift */,
3108-
F36675A524FEB18C004E567D /* Nano33BLESenseHumiditySensor.swift */,
3109-
F36675A324FE9D36004E567D /* Nano33BLESenseBarometricPressureSensor.swift */,
3110-
F36675A124FE5F5E004E567D /* Nano33BLESenseMagnetometerSensor.swift */,
3111-
F366759B24FE5B60004E567D /* Nano33BLESenseGyroscopeXSensor.swift */,
3112-
F366759D24FE5B60004E567D /* Nano33BLESenseGyroscopeYSensor.swift */,
3113-
F366759C24FE5B60004E567D /* Nano33BLESenseGyroscopeZSensor.swift */,
3114-
F366759924FE59C2004E567D /* Nano33BLESenseLinearAccelerometerSensor.swift */,
3115-
F366759524FE5697004E567D /* Nano33BLESenseAccelerometerXSensor.swift */,
3116-
F366759324FE5696004E567D /* Nano33BLESenseAccelerometerYSensor.swift */,
3117-
F366759424FE5696004E567D /* Nano33BLESenseAccelerometerZSensor.swift */,
3118-
F384EA4124FD833F00E1F1DE /* Nano33BLESenseTemperatureSensor.swift */,
3133+
F384EA3F24FD82E100E1F1DE /* Nano33BLESenseServiceInterface.swift */,
3134+
BC9D3E0E2513B7C3009ACA46 /* Sensors */,
31193135
);
3120-
path = "Nano 33 BLE Sense Sensors";
3136+
path = Nano33BLE;
31213137
sourceTree = "<group>";
31223138
};
31233139
/* End PBXGroup section */
@@ -3773,7 +3789,7 @@
37733789
68A854F21ED3977C0010B28E /* ExperimentsListHeaderView.swift in Sources */,
37743790
5CBD9AAD1F6C836600D22D21 /* OptionSelectorView.swift in Sources */,
37753791
8B1791D11F140F22008C0B31 /* TriggerValueEntryView.swift in Sources */,
3776-
BCEC93A524C033D20041296C /* BLEScienceKitSensorInterface.swift in Sources */,
3792+
BCEC93A524C033D20041296C /* BLEArduinoSensorInterface.swift in Sources */,
37773793
5C2C2A2F20373014007F2FA5 /* UnzipOperation.swift in Sources */,
37783794
F366759724FE5697004E567D /* Nano33BLESenseAccelerometerXSensor.swift in Sources */,
37793795
687FAA0C202C1162004C1D04 /* SensorTrigger.pbobjc.m in Sources */,

‎ScienceJournal/BLEArduino/BLEScienceKitSensorInterface.swift‎ renamed to ‎ScienceJournal/BLEArduino/BLEArduinoSensorInterface.swift‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// BLEScienceKitSensorInterface.swift
2+
// BLEArduinoSensorInterface.swift
33
// ScienceJournal
44
//
55
// Created by Emilio Pavia on 16/07/2020.
@@ -23,87 +23,87 @@ import CoreBluetooth
2323
import third_party_objective_c_material_components_ios_components_Dialogs_Dialogs
2424
import third_party_sciencejournal_ios_ScienceJournalProtos
2525

26-
enum BLEScienceKitSensorConfig: Int, Codable {
26+
enum BLEArduinoSensorConfig: Int, Codable {
2727
case raw
2828
case temperatureCelsius
2929
case temperatureFahrenheit
3030
case light
3131
}
3232

33-
protocol BLEScienceKitSensor {
33+
protocol BLEArduinoSensor {
3434
static var identifier: String { get }
3535
static var uuid: CBUUID { get }
36-
36+
3737
var name: String { get }
3838
var iconName: String { get }
3939
var animatingIconName: String { get }
4040
var unitDescription: String? { get }
4141
var textDescription: String { get }
4242
var learnMoreInformation: Sensor.LearnMore { get }
43-
var options: [BLEScienceKitSensorConfig] { get }
44-
45-
var config: BLEScienceKitSensorConfig? { get set }
46-
43+
var options: [BLEArduinoSensorConfig] { get }
44+
45+
var config: BLEArduinoSensorConfig? { get set }
46+
4747
func point(for data: Data) -> Double
4848
}
4949

50-
extension BLEScienceKitSensor {
50+
extension BLEArduinoSensor {
5151
static var identifier: String { uuid.uuidString }
52-
53-
var options: [BLEScienceKitSensorConfig] { [] }
52+
53+
var options: [BLEArduinoSensorConfig] { [] }
5454
}
5555

56-
class BLEScienceKitSensorInterface: BLESensorInterface {
57-
var sensor: BLEScienceKitSensor
58-
56+
class BLEArduinoSensorInterface: BLESensorInterface {
57+
var sensor: BLEArduinoSensor
58+
5959
var identifier: String { type(of: sensor).identifier }
60-
60+
6161
var serviceId: CBUUID
62-
62+
6363
var providerId: String
64-
64+
6565
var peripheralName: String
66-
66+
6767
var name: String { sensor.name }
68-
68+
6969
var iconName: String { sensor.iconName }
70-
70+
7171
var animatingIconName: String { sensor.animatingIconName }
72-
72+
7373
var config: Data? {
7474
get {
7575
guard let config = sensor.config else { return nil }
7676
return try? JSONEncoder().encode(config)
7777
}
7878
set {
7979
guard let data = newValue else { return }
80-
let config = try? JSONDecoder().decode(BLEScienceKitSensorConfig.self,
80+
let config = try? JSONDecoder().decode(BLEArduinoSensorConfig.self,
8181
from: data)
8282
sensor.config = config
8383
}
8484
}
85-
85+
8686
var peripheral: CBPeripheral?
87-
87+
8888
var unitDescription: String? { sensor.unitDescription }
89-
89+
9090
var textDescription: String { sensor.textDescription }
91-
91+
9292
var hasOptions: Bool { !sensor.options.isEmpty }
93-
93+
9494
var learnMoreInformation: Sensor.LearnMore { sensor.learnMoreInformation }
95-
95+
9696
var characteristic: CBUUID { type(of: sensor).uuid }
97-
97+
9898
private var serviceScanner: BLEServiceScanner
9999
private var peripheralInterface: BLEPeripheralInterface?
100-
100+
101101
private lazy var clock = Clock()
102-
102+
103103
private var configViewController: ScienceKitSensorConfigViewController?
104104
private var configCompletionBlock: (() -> Void)?
105-
106-
required init(sensor: BLEScienceKitSensor,
105+
106+
required init(sensor: BLEArduinoSensor,
107107
providerId: String,
108108
serviceId: CBUUID,
109109
peripheralName: String) {
@@ -114,72 +114,72 @@ class BLEScienceKitSensorInterface: BLESensorInterface {
114114
self.serviceScanner = BLEServiceScanner(services: [serviceId])
115115
}
116116

117-
convenience init(peripheral: CBPeripheral, sensor: BLEScienceKitSensor, serviceId: CBUUID) {
117+
convenience init(peripheral: CBPeripheral, sensor: BLEArduinoSensor, serviceId: CBUUID) {
118118
self.init(sensor: sensor,
119119
providerId: peripheral.identifier.uuidString,
120120
serviceId: serviceId,
121121
peripheralName: peripheral.name ?? "")
122122
}
123-
124-
convenience init(spec: SensorSpec, sensor: BLEScienceKitSensor, serviceId: CBUUID) {
123+
124+
convenience init(spec: SensorSpec, sensor: BLEArduinoSensor, serviceId: CBUUID) {
125125
self.init(sensor: sensor,
126126
providerId: spec.gadgetInfo.providerID,
127127
serviceId: serviceId,
128128
peripheralName: spec.gadgetInfo.hostID)
129129
config = spec.config
130130
}
131-
131+
132132
func presentOptions(from viewController: UIViewController, completion: @escaping () -> Void) {
133133
guard sensor.options.count > 1 else {
134134
completion()
135135
return
136136
}
137-
137+
138138
configCompletionBlock = completion
139-
139+
140140
let dialogController = MDCDialogTransitionController()
141141
// swiftlint:disable force_cast
142142
let appDelegate = UIApplication.shared.delegate as! AppDelegate
143143
// swiftlint:enable force_cast
144144
let dialog =
145-
ScienceKitSensorConfigViewController(analyticsReporter: appDelegate.analyticsReporter)
145+
ScienceKitSensorConfigViewController(analyticsReporter: appDelegate.analyticsReporter)
146146
dialog.options = sensor.options
147147
dialog.config = sensor.config ?? .raw
148-
148+
149149
dialog.okButton.addTarget(self,
150150
action: #selector(sensorConfigOKButtonPressed),
151151
for: .touchUpInside)
152152
dialog.modalPresentationStyle = .custom
153153
dialog.transitioningDelegate = dialogController
154154
dialog.mdc_dialogPresentationController?.dismissOnBackgroundTap = false
155155
viewController.present(dialog, animated: true)
156-
156+
157157
configViewController = dialog
158158
}
159-
159+
160160
func connect(_ completion: @escaping (Bool) -> Void) {
161161
serviceScanner.connectToPeripheral(withIdentifier: providerId) { (peripheral, error) in
162162
// Stop scanning.
163163
self.serviceScanner.stopScanning()
164-
164+
165165
guard peripheral != nil else {
166166
print("[BluetoothSensor] Error connecting to " +
167-
"peripheral: \(String(describing: error?.peripheral.name)) " +
168-
"address: \(String(describing: error?.peripheral.identifier))")
167+
"peripheral: \(String(describing: error?.peripheral.name)) " +
168+
"address: \(String(describing: error?.peripheral.identifier))")
169169
// TODO: Pass along connection error http://b/64684813
170170
completion(false)
171171
return
172172
}
173-
173+
174174
self.peripheral = peripheral
175-
175+
176176
completion(true)
177177
}
178178
}
179-
179+
180180
func startObserving(_ listener: @escaping (DataPoint) -> Void) {
181181
guard let peripheral = peripheral else { return }
182-
182+
183183
let interface = BLEPeripheralInterface(peripheral: peripheral,
184184
serviceUUID: serviceId,
185185
characteristicUUIDs: [characteristic])
@@ -191,21 +191,21 @@ class BLEScienceKitSensorInterface: BLESensorInterface {
191191
})
192192
self.peripheralInterface = interface
193193
}
194-
194+
195195
func stopObserving() {
196196
peripheralInterface?.stopUpdatesForCharacteristic(characteristic)
197197
}
198198
}
199199

200-
private extension BLEScienceKitSensorInterface {
200+
private extension BLEArduinoSensorInterface {
201201
@objc
202202
func sensorConfigOKButtonPressed() {
203203
guard let configViewController = configViewController else {
204204
return
205205
}
206-
206+
207207
sensor.config = configViewController.config
208-
208+
209209
let completion = configCompletionBlock
210210
configCompletionBlock = nil
211211
configViewController.dismiss(animated: true, completion: completion)

0 commit comments

Comments
 (0)