Adding some new rx messages (#47)

Author: loudnate

xDripG5.xcodeproj/project.pbxproj

@@ -11,6 +11,8 @@
 		43538C111D81220F0071CA5E /* NSData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CABE101C350B2800005705 /* NSData.swift */; };
 		43846AC61D8F896C00799272 /* CalibrationDataRxMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43846AC51D8F896C00799272 /* CalibrationDataRxMessage.swift */; };
 		43846AC81D8F89BE00799272 /* CalibrationDataRxMessageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43846AC71D8F89BE00799272 /* CalibrationDataRxMessageTests.swift */; };
+		43880F981D9E19FC009061A8 /* TransmitterVersionRxMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43880F971D9E19FC009061A8 /* TransmitterVersionRxMessage.swift */; };
+		43880F9A1D9E1BD7009061A8 /* TransmitterVersionRxMessageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43880F991D9E1BD7009061A8 /* TransmitterVersionRxMessageTests.swift */; };
 		43CABDF71C3506F100005705 /* xDripG5.h in Headers */ = {isa = PBXBuildFile; fileRef = 43CABDF61C3506F100005705 /* xDripG5.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		43CABDFE1C3506F100005705 /* xDripG5.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43CABDF31C3506F100005705 /* xDripG5.framework */; };
 		43CABE121C350B2800005705 /* BluetoothManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CABE0E1C350B2800005705 /* BluetoothManager.swift */; };
@@ -78,6 +80,8 @@
 		430D64C41CB7846A00FCA750 /* NSData+CRC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSData+CRC.swift"; sourceTree = "<group>"; };
 		43846AC51D8F896C00799272 /* CalibrationDataRxMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CalibrationDataRxMessage.swift; sourceTree = "<group>"; };
 		43846AC71D8F89BE00799272 /* CalibrationDataRxMessageTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CalibrationDataRxMessageTests.swift; sourceTree = "<group>"; };
+		43880F971D9E19FC009061A8 /* TransmitterVersionRxMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransmitterVersionRxMessage.swift; sourceTree = "<group>"; };
+		43880F991D9E1BD7009061A8 /* TransmitterVersionRxMessageTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransmitterVersionRxMessageTests.swift; sourceTree = "<group>"; };
 		43CABDF31C3506F100005705 /* xDripG5.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = xDripG5.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		43CABDF61C3506F100005705 /* xDripG5.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = xDripG5.h; sourceTree = "<group>"; };
 		43CABDF81C3506F100005705 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -194,6 +198,7 @@
 				43F82BD31D037227006F5DD7 /* SessionStartRxMessageTests.swift */,
 				43F82BD11D037040006F5DD7 /* SessionStopRxMessageTests.swift */,
 				43F82BCB1D035AA4006F5DD7 /* TransmitterTimeRxMessageTests.swift */,
+				43880F991D9E1BD7009061A8 /* TransmitterVersionRxMessageTests.swift */,
 			);
 			path = xDripG5Tests;
 			sourceTree = "<group>";
@@ -223,6 +228,7 @@
 				43CABE211C350B3D00005705 /* TransmitterTimeRxMessage.swift */,
 				43CABE221C350B3D00005705 /* TransmitterTimeTxMessage.swift */,
 				43CE7CC91CA73B94003CC1B0 /* TransmitterVersionTxMessage.swift */,
+				43880F971D9E19FC009061A8 /* TransmitterVersionRxMessage.swift */,
 			);
 			path = Messages;
 			sourceTree = "<group>";
@@ -357,6 +363,7 @@
 				43EEA7121D14DC0800CBBDA0 /* AESCrypt.m in Sources */,
 				43CE7CCE1CA73C22003CC1B0 /* SessionStartTxMessage.swift in Sources */,
 				43CABE2E1C350B3D00005705 /* TransmitterTimeTxMessage.swift in Sources */,
+				43880F981D9E19FC009061A8 /* TransmitterVersionRxMessage.swift in Sources */,
 				43538C111D81220F0071CA5E /* NSData.swift in Sources */,
 				43CABE2C1C350B3D00005705 /* TransmitterMessage.swift in Sources */,
 				43CABE131C350B2800005705 /* BluetoothServices.swift in Sources */,
@@ -384,6 +391,7 @@
 				43DC87C01C8B509B005BC30D /* NSData.swift in Sources */,
 				43F82BD21D037040006F5DD7 /* SessionStopRxMessageTests.swift in Sources */,
 				43E397911D5692080028E321 /* GlucoseTests.swift in Sources */,
+				43880F9A1D9E1BD7009061A8 /* TransmitterVersionRxMessageTests.swift in Sources */,
 				43DC87C21C8B520F005BC30D /* GlucoseRxMessageTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

xDripG5/Messages/BatteryStatusTxMessage.swift

@@ -11,4 +11,6 @@ import Foundation
 
 struct BatteryStatusTxMessage {
     let opcode: UInt8 = 0x22
+
+    // Response: 23003c012f01cd021f247bae
 }

xDripG5/Messages/TransmitterVersionRxMessage.swift

@@ -0,0 +1,30 @@
+//
+//  TransmitterVersionRxMessage.swift
+//  xDripG5
+//
+//  Created by Nate Racklyeft on 9/29/16.
+//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
+//
+
+import Foundation
+
+
+struct TransmitterVersionRxMessage: TransmitterRxMessage {
+    static let opcode: UInt8 = 0x4b
+    let status: UInt8
+    let firmwareVersion: [UInt8]
+
+    init?(data: Data) {
+        guard data.count == 19 && data.crcValid() else {
+            return nil
+        }
+
+        guard data[0] == type(of: self).opcode else {
+            return nil
+        }
+
+        status = data[1]
+        firmwareVersion = data[2..<6]
+    }
+
+}

xDripG5/NSData.swift

@@ -45,14 +45,14 @@ public extension Data {
 
         return dataArray
     }
-
+*/
     subscript(range: Range<Int>) -> [UInt8] {
         var dataArray = [UInt8](repeating: 0, count: range.count)
         self.copyBytes(to: &dataArray, from: range)
 
         return dataArray
     }
-
+/*
     subscript(range: Range<Int>) -> [UInt16] {
         var dataArray = [UInt16](repeating: 0, count: range.count / 2)
         let buffer = UnsafeMutableBufferPointer(start: &dataArray, count: range.count)

xDripG5Tests/TransmitterVersionRxMessageTests.swift

@@ -0,0 +1,22 @@
+//
+//  TransmitterVersionRxMessageTests.swift
+//  xDripG5
+//
+//  Created by Nate Racklyeft on 9/29/16.
+//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
+//
+
+import XCTest
+@testable import xDripG5
+
+class TransmitterVersionRxMessageTests: XCTestCase {
+    
+    func testRxMessage() {
+        let data = Data(hexadecimalString: "4b0001000011df2900005100037000f00009b6")!
+        let message = TransmitterVersionRxMessage(data: data)!
+
+        XCTAssertEqual(0, message.status)
+        XCTAssertEqual([1, 0, 0, 17], message.firmwareVersion)
+    }
+
+}