From 45f3f23f25389f768d0241f8f2e9dde6989eddd5 Mon Sep 17 00:00:00 2001 From: Patrick Perron Date: Thu, 16 Mar 2017 08:49:51 -0400 Subject: [PATCH] Updated keypadRequest to send Accept/Reject messages Added variables to accept/reject to replace lock/unlock as it is more semantically correct in terms of what is being sent to the door. --- Server/src/Server.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Server/src/Server.java b/Server/src/Server.java index cab099f..25f331c 100644 --- a/Server/src/Server.java +++ b/Server/src/Server.java @@ -54,6 +54,8 @@ private class ControlThread extends Thread { private DatagramSocket sendReceiveSocket; final byte UNLOCK = (byte) 0xFF; final byte LOCK = 0x00; + final byte ACCEPT = (byte)0x00; + final byte REJECT = (byte) 0xFF; final byte PASS_MSG = 0; final byte IMG_MSG = 1; final byte D_STAT_MSG = 2; @@ -102,10 +104,10 @@ private void keypadRequest(byte[] msg){ System.out.println("CONTROL: ServerPass: " + Arrays.toString(serverPass) + ", PasswordReceived: " + Arrays.toString(passcode)); if(Arrays.equals(passcode, serverPass)){ System.out.println("CONTROL: unlock building"); - buildResponse(UNLOCK, msg); + buildResponse(ACCEPT, msg); } else{ System.out.println("CONTROL: lock building"); - buildResponse(LOCK, msg); + buildResponse(REJECT, msg); } try { System.out.println("CONTROL: Sending response : " + Arrays.toString(packet.getData()));