Client/Client.cs

@@ -16,6 +16,7 @@ namespace Client
         private int totalBufferReceived = 0;
         private EngineConnection engineConnection;
         private bool sessionRunning = false;
+        private IHandler handler = null;
 
 
         public Client() : this("localhost", 5555)
@@ -94,13 +95,23 @@ namespace Client
                             break;
                         case DataParser.START_SESSION:
                             this.sessionRunning = true;
-                            byte[] startSession = DataParser.getStartSessionJson();
+                            sendMessage(DataParser.getStartSessionJson());
-                            stream.BeginWrite(startSession, 0, startSession.Length, new AsyncCallback(OnWrite), null);
                             break;
                         case DataParser.STOP_SESSION:
                             this.sessionRunning = false;
-                            byte[] stopSession = DataParser.getStopSessionJson();
+                            sendMessage(DataParser.getStopSessionJson());
-                            stream.BeginWrite(stopSession, 0, stopSession.Length, new AsyncCallback(OnWrite), null);
+                            break;
+                        case DataParser.SET_RESISTANCE:
+                            if (this.handler == null)
+                            {
+                                Console.WriteLine("handler is null");
+                                sendMessage(DataParser.getSetResistanceResponseJson(false));
+                            }
+                            else
+                            {
+                                this.handler.setResistance(DataParser.getResistanceFromJson(payloadbytes));
+                                sendMessage(DataParser.getSetResistanceResponseJson(true));
+                            }
                             break;
                         default:
                             Console.WriteLine($"Received json with identifier {identifier}:\n{Encoding.ASCII.GetString(payloadbytes)}");
@@ -120,6 +131,11 @@ namespace Client
 
         }
 
+        private void sendMessage(byte[] message)
+        {
+            stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null);
+        }
+
         private void OnWrite(IAsyncResult ar)
         {
             this.stream.EndWrite(ar);
@@ -174,5 +190,10 @@ namespace Client
             initEngine();
             this.stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null);
         }
+
+        public void setHandler(IHandler handler)
+        {
+            this.handler = handler;
+        }
     }
 }

Client/DataParser.cs

@@ -182,11 +182,25 @@ namespace Client
             return getJsonMessage(SET_RESISTANCE, data);
         }
 
+        public static byte[] getSetResistanceResponseJson(bool mWorked)
+        {
+            dynamic data = new
+            {
+                worked = mWorked
+            };
+            return getJsonMessage(SET_RESISTANCE, data);
+        }
+
         public static float getResistanceFromJson(byte[] json)
         {
             return ((dynamic)JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json))).data.resistance;
         }
 
+        public static bool getResistanceFromResponseJson(byte[] json)
+        {
+            return ((dynamic)JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json))).data.worked;
+        }
+
 
     }
 }

Client/Program.cs

@@ -1,7 +1,6 @@
 using System;
 using Hardware;
 using Hardware.Simulators;
-using RH_Engine;
 
 namespace Client
 {
@@ -20,13 +19,18 @@ namespace Client
             {
 
             }
-            //BLEHandler bLEHandler = new BLEHandler(client);
+            BLEHandler bLEHandler = new BLEHandler(client);
 
-            //bLEHandler.Connect();
+            bLEHandler.Connect();
 
-            BikeSimulator bikeSimulator = new BikeSimulator(client);
+            client.setHandler(bLEHandler);
 
-            bikeSimulator.StartSimulation();
+
+            //BikeSimulator bikeSimulator = new BikeSimulator(client);
+
+            //bikeSimulator.StartSimulation();
+
+            //client.setHandler(bikeSimulator);
 
             while (true)
             {

ProftaakRH/BLEHandler.cs

@@ -25,11 +25,13 @@ namespace Hardware
         public BLEHandler(IDataReceiver dataReceiver)
         {
             this.dataReceivers = new List<IDataReceiver> { dataReceiver };
+
         }
 
         public BLEHandler(List<IDataReceiver> dataReceivers)
         {
             this.dataReceivers = dataReceivers;
+
         }
 
         public void addDataReceiver(IDataReceiver dataReceiver)
@@ -43,6 +45,7 @@ namespace Hardware
         public void Connect()
         {
             BLE bleBike = new BLE();
+
             Thread.Sleep(1000); // We need some time to list available devices
 
             // List available devices
@@ -170,6 +173,11 @@ namespace Hardware
         /// <param name="percentage">The precentage of resistance to set</param>
         public void setResistance(float percentage)
         {
+            if (!this.Running)
+            {
+                Console.WriteLine("BLE is not running");
+                return;
+            }
             byte[] antMessage = new byte[13];
             antMessage[0] = 0x4A;
             antMessage[1] = 0x09;

ProftaakRH/IHandler.cs

@@ -4,7 +4,7 @@ using System.Text;
 
 namespace ProftaakRH
 {
-    interface IHandler
+    public interface IHandler
     {
         void setResistance(float percentage);
     }

ProftaakRH/Main.cs

@@ -14,7 +14,7 @@ namespace ProftaakRH
             IDataReceiver dataReceiver = new DataConverter();
             BLEHandler bLEHandler = new BLEHandler(dataReceiver);
             BikeSimulator bikeSimulator = new BikeSimulator(dataReceiver);
-            bikeSimulator.setResistance(bikeSimulator.GenerateResistance(1f));
+            bikeSimulator.setResistance(1);
             bikeSimulator.StartSimulation();
 
 

Server/Client.cs

@@ -103,21 +103,17 @@ namespace Server
                             {
                                 Console.WriteLine("Log in");
                                 this.username = username;
-                                byte[] response = DataParser.getLoginResponse("OK");
+                                sendMessage(DataParser.getLoginResponse("OK"));
-                                stream.BeginWrite(response, 0, response.Length, new AsyncCallback(OnWrite), null);
+                                sendMessage(DataParser.getStartSessionJson());
-                                byte[] startSession = DataParser.getStartSessionJson();
-                                stream.BeginWrite(startSession, 0, startSession.Length, new AsyncCallback(OnWrite), null);
                             }
                             else
                             {
-                                byte[] response = DataParser.getLoginResponse("wrong username or password");
+                                sendMessage(DataParser.getLoginResponse("wrong username or password"));
-                                stream.BeginWrite(response, 0, response.Length, new AsyncCallback(OnWrite), null);
                             }
                         }
                         else
                         {
-                            byte[] response = DataParser.getLoginResponse("invalid json");
+                            sendMessage(DataParser.getLoginResponse("invalid json"));
-                            stream.BeginWrite(response, 0, response.Length, new AsyncCallback(OnWrite), null);
                         }
                         break;
                     case DataParser.START_SESSION:
@@ -126,6 +122,11 @@ namespace Server
                     case DataParser.STOP_SESSION:
                         this.saveData = null;
                         break;
+                    case DataParser.SET_RESISTANCE:
+                        worked = DataParser.getResistanceFromResponseJson(payloadbytes);
+                        Console.WriteLine($"set resistance worked is " + worked);
+                        //set resistance on doctor GUI
+                        break;
                     default:
                         Console.WriteLine($"Received json with identifier {identifier}:\n{Encoding.ASCII.GetString(payloadbytes)}");
                         break;
@@ -152,6 +153,11 @@ namespace Server
 
         }
 
+        private void sendMessage(byte[] message)
+        {
+            stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null);
+        }
+
         private bool verifyLogin(string username, string password)
         {
             return username == password;