Defined SMPServer as typedef of templated Server

Reorganized includes

Author: gabryelreyes

lib/ConvoyLeader/src/App.h

@@ -46,11 +46,11 @@
 #include <Arduino.h>
 #include <Board.h>
 #include <MqttClient.h>
-#include <SerialMuxProtServer.hpp>
-#include "SerialMuxChannels.h"
+#include <SimpleTimer.hpp>
+#include <StateMachine.h>
 #include <V2VClient.h>
+#include "SerialMuxChannels.h"
 #include "LongitudinalController.h"
-#include <SimpleTimer.hpp>
 
 /******************************************************************************
  * Macros
@@ -175,7 +175,7 @@ class App
      *
      * @tparam tMaxChannels set to MAX_CHANNELS, defined in SerialMuxChannels.h.
      */
-    SerialMuxProtServer<MAX_CHANNELS> m_smpServer;
+    SMPServer m_smpServer;
 
     /**
      * MQTTClient Instance

lib/ConvoyLeader/src/SerialMuxChannels.h

@@ -37,6 +37,7 @@
  *****************************************************************************/
 
 #include <Arduino.h>
+#include <SerialMuxProtServer.hpp>
 
 /******************************************************************************
  * Macros
@@ -73,6 +74,9 @@
  * Types and Classes
  *****************************************************************************/
 
+/** SerialMuxProt Server with fixed template argument. */
+typedef SerialMuxProtServer<MAX_CHANNELS> SMPServer;
+
 /** Struct of the "Command" channel payload. */
 typedef struct _Command
 {