Updated sequence diagrams again

WindyCityLab · Jun 25, 2015 · 594e2e3 · 594e2e3
1 parent 67a4bdb
commit 594e2e3
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 18 deletions.
diff --git a/Documentation/Sequence Diagrams/Standard Admin Scenario.png b/Documentation/Sequence Diagrams/Standard Admin Scenario.png
diff --git a/Documentation/Sequence Diagrams/Standard User Scenario.png b/Documentation/Sequence Diagrams/Standard User Scenario.png
diff --git a/Documentation/Sequence Diagrams/admin sequence.png b/Documentation/Sequence Diagrams/admin sequence.png
diff --git a/...ence Diagrams/Standard Admin Scenario.txt → ...tion/Sequence Diagrams/admin sequence.txt b/...ence Diagrams/Standard Admin Scenario.txt → ...tion/Sequence Diagrams/admin sequence.txt
@@ -1,25 +1,20 @@
 Title Standard Admin Scenario
-Participant RTC
-Participant Relay
 Participant Equipment
 Participant Phone
 Participant User
 Phone -> Parse: Login, is User Admin?
 Parse -> Phone: Is Admin
 Phone -> Phone: UI Setting: Admin
+Phone -> Parse: Change parse settings (users, equipment name, etc.)
 Equipment->Phone: Advertising Packet with Equipment ID & Status, etc.
 Phone -> Phone: update UI
 User -> Phone: Select GLD
 User -> Phone: Activate/Configure
-Phone -> Equipment: BLE Connect
+Phone -> Equipment: BLE Connect (with timeout)
 Equipment -> Phone: BLE Connection Successful
-Phone -> Equipment: DateTime
-Equipment -> RTC: Update DateTime
-Phone -> Equipment: MD5 Hash to Authorize
-Equipment -> Equipment: Generate MD5 and Compare
+Phone -> Equipment: See authorization sequence
 Equipment -> Phone: Authorized (Admin)
-Phone -> Equipment: Configure/Activate
-Equipment -> Relay: Power On/Off
+Phone -> Equipment: Configure/Activate (Device ID, etc.)
 Phone -> Equipment: BLE Disconnect
 Equipment -> Phone: Advertising Packet with Equipment ID & Status, etc.
 Phone -> Parse: Update usage log
diff --git a/Documentation/Sequence Diagrams/authorization sequence.txt b/Documentation/Sequence Diagrams/authorization sequence.txt
@@ -0,0 +1,21 @@
+Title Authorization
+Participant RTC
+Equipment->Phone: Advertising Packet with Equipment ID & Status
+Participant User
+Phone -> Parse: isEquipmentAuthorized?
+Parse -> Phone: isAuthorized
+Phone -> Phone: update UI
+User -> Phone: Enable Equipment/Other feature
+Phone -> Equipment: BLE Connect
+Equipment -> Phone: BLE Connection Successful
+Phone -> Equipment: DateTime
+Equipment -> RTC: Update DateTime on RTC
+RTC -> Equipment: Append UUID with DateTime = MD5 Input
+Equipment -> Equipment: Make MD5 Hash
+Phone -> Phone: Make MD5 Hash
+Phone -> Equipment: Send MD5 Hash
+Equipment -> Equipment: Compare MD5 Hashes made with same UUID and same general time
+Equipment -> Equipment: Match? Yes = Authorized, No = Force disconnect
+Equipment -> Phone: Authorized
+Phone -> Equipment: Send plaintext command
+Equipment -> Equipment: Execute command, disconnect
diff --git a/Documentation/Sequence Diagrams/authorization.png b/Documentation/Sequence Diagrams/authorization.png
diff --git a/Documentation/Sequence Diagrams/diagram.png → ...on/Sequence Diagrams/original diagram.png b/Documentation/Sequence Diagrams/diagram.png → ...on/Sequence Diagrams/original diagram.png
diff --git a/...entation/Sequence Diagrams/textSource.txt → ...Sequence Diagrams/original textSource.txt b/...entation/Sequence Diagrams/textSource.txt → ...Sequence Diagrams/original textSource.txt
diff --git a/...uence Diagrams/Standard User Scenario.txt → ...ation/Sequence Diagrams/user Sequence.txt b/...uence Diagrams/Standard User Scenario.txt → ...ation/Sequence Diagrams/user Sequence.txt
@@ -1,26 +1,22 @@
 Title Standard User Scenario
-Participant RTC
 Participant Relay
 Participant Equipment
 Participant Phone
 Participant User
 Phone -> Parse: Login, is User Admin?
 Parse -> Phone: No, is not Admin
 Phone -> Phone: UI Setting: User
+Phone -> Parse: Configure user settings (account settings, etc.)
 Equipment->Phone: Advertising Packet with Equipment ID & Status, etc.
 Phone -> Parse: isEquipmentAuthorized?
 Parse -> Phone: isAuthorized
 Phone -> Phone: update UI
 User -> Phone: Select/Activate GLD
 Phone -> Equipment: BLE Connect
 Equipment -> Phone: BLE Connection Successful
-Phone -> Equipment: DateTime
-Equipment -> RTC: Update DateTime
-Phone -> Equipment: MD5 Hash to Authorize
-Equipment -> Equipment: Generate MD5 and Compare
-Equipment -> Phone: Authorized
+Phone -> Equipment: See authorization sequence
 Phone -> Equipment: On/Off Command
 Equipment -> Relay: Power On/Off
-Phone -> Equipment: BLE Disconnect
+Phone -> Equipment: BLE Disconnect or receive other command
 Equipment -> Phone: Advertising Packet with Equipment ID & Status, etc.
 Phone -> Parse: Update usage log
diff --git a/Documentation/Sequence Diagrams/user sequence.png b/Documentation/Sequence Diagrams/user sequence.png
diff --git a/Firmware/initialAdvertisingTest/initialAdvertisingTest.ino b/Firmware/initialAdvertisingTest/initialAdvertisingTest.ino
@@ -125,7 +125,7 @@ void updateManufactureData()
 
 bool getAuthFromMD5Hash(char hashReceived[])
 {
-  char testString[]="6A2041DB-5942-44D7-844C-8C17D79261072015-06-14-10-03";
+  char testString[]="6A2041DB-5942-44D7-844C-8C17D7926107";
 
   unsigned char* hash=MD5::make_hash(testString);
   char *md5str = MD5::make_digest(hash, 10);

diff --git a/GetDibs/BLEDevice.swift b/GetDibs/BLEDevice.swift
@@ -186,7 +186,7 @@ class BLEDevice : NSObject, CBCentralManagerDelegate, CBPeripheralDelegate
     }
     func send(command : String, toPeripheral : BLEPeripheral)
     {
-        var actualCommand = "\(command)\(kMD5HashSalt)\(timeAsString())"
+        var actualCommand = kMD5HashSalt
         var md5Hash = actualCommand.MD5()
         println("sending: \(md5Hash)");
         self.commandToSend = md5Hash.dataUsingEncoding(NSUTF8StringEncoding)