Continue working on stubs...

98 files changed, 3551 insertions, 1761 deletions

diff --git a/Software/Code_Composer/twine_usblib_demo/.cproject b/Software/Code_Composer/twine_usblib_demo/.cproject
index 7b159a061..863662ebe 100644
--- a/Software/Code_Composer/twine_usblib_demo/.cproject
+++ b/Software/Code_Composer/twine_usblib_demo/.cproject
@@ -69,6 +69,10 @@
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.compilerID.DIAG_WARNING.1635443754" name="Treat diagnostic &lt;id&gt; as warning (--diag_warning, -pdsw)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.compilerID.DIAG_WARNING" useByScannerDiscovery="false" valueType="stringList">
 									<listOptionValue builtIn="false" value="225"/>
 								</option>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.compilerID.DIAG_SUPPRESS.258694144" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.compilerID.DIAG_SUPPRESS" valueType="stringList">
+									<listOptionValue builtIn="false" value="190"/>
+									<listOptionValue builtIn="false" value="169"/>
+								</option>
 								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.compiler.inputType__C_SRCS.145301055" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.compiler.inputType__C_SRCS"/>
 								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.compiler.inputType__CPP_SRCS.502409561" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.compiler.inputType__CPP_SRCS"/>
 								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.compiler.inputType__ASM_SRCS.133682737" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.compiler.inputType__ASM_SRCS"/>
@@ -76,9 +80,9 @@
 							</tool>
 							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.exe.linkerDebug.1077953619" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.exe.linkerDebug">
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.MAP_FILE.696875197" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.MAP_FILE" useByScannerDiscovery="false" value="&quot;${ProjName}.map&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.STACK_SIZE.571525378" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.STACK_SIZE" useByScannerDiscovery="false" value="2048" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.STACK_SIZE.571525378" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.STACK_SIZE" useByScannerDiscovery="false" value="4096" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.HEAP_SIZE.776477645" name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.HEAP_SIZE" useByScannerDiscovery="false" value="87574" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.OUTPUT_FILE.1189225441" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.OUTPUT_FILE" useByScannerDiscovery="false" value="&quot;${ProjName}.out&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.OUTPUT_FILE.1189225441" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.OUTPUT_FILE" useByScannerDiscovery="false" value="${ProjName}.out" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.LIBRARY.1158315701" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.LIBRARY" useByScannerDiscovery="false" valueType="libs">
 									<listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSTIVAC_LIBRARIES}"/>
 									<listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_LIBRARIES}"/>
@@ -187,7 +191,7 @@
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.MAP_FILE.1242670691" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.MAP_FILE" useByScannerDiscovery="false" value="&quot;${ProjName}.map&quot;" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.STACK_SIZE.400174233" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.STACK_SIZE" useByScannerDiscovery="false" value="512" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.HEAP_SIZE.208444456" name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.HEAP_SIZE" useByScannerDiscovery="false" value="0" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.OUTPUT_FILE.512369812" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.OUTPUT_FILE" useByScannerDiscovery="false" value="&quot;${ProjName}.out&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.OUTPUT_FILE.512369812" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.OUTPUT_FILE" useByScannerDiscovery="false" value="${ProjName}.out" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.LIBRARY.2116096543" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.3.linkerID.LIBRARY" useByScannerDiscovery="false" valueType="libs">
 									<listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSTIVAC_LIBRARIES}"/>
 									<listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_LIBRARIES}"/>
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.c
index b4a52d09f..6416e1fcd 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.c
@@ -7,7 +7,7 @@
 #endif
 
 #include "MessageType.pb-c.h"
-static const ProtobufCEnumValue message_type__enum_values_by_number[31] =
+static const ProtobufCEnumValue message_type__enum_values_by_number[33] =
 {
   { "RGB", "MESSAGE_TYPE__RGB", 0 },
   { "Job", "MESSAGE_TYPE__Job", 1 },
@@ -16,35 +16,37 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[31] =
   { "CalculateResponse", "MESSAGE_TYPE__CalculateResponse", 4 },
   { "ProgressRequest", "MESSAGE_TYPE__ProgressRequest", 5 },
   { "ProgressResponse", "MESSAGE_TYPE__ProgressResponse", 6 },
-  { "Stub_CartridgeReadRequest", "MESSAGE_TYPE__Stub_CartridgeReadRequest", 7 },
-  { "Stub_CartridgeReadResponse", "MESSAGE_TYPE__Stub_CartridgeReadResponse", 8 },
-  { "Stub_CartridgeWriteRequest", "MESSAGE_TYPE__Stub_CartridgeWriteRequest", 9 },
-  { "Stub_CartridgeWriteResponse", "MESSAGE_TYPE__Stub_CartridgeWriteResponse", 10 },
-  { "Stub_DispenserRequest", "MESSAGE_TYPE__Stub_DispenserRequest", 11 },
-  { "Stub_DispenserResponse", "MESSAGE_TYPE__Stub_DispenserResponse", 12 },
-  { "Stub_GPIOReadBitRequest", "MESSAGE_TYPE__Stub_GPIOReadBitRequest", 13 },
-  { "Stub_GPIOReadBitResponse", "MESSAGE_TYPE__Stub_GPIOReadBitResponse", 14 },
-  { "Stub_GPIOReadByteRequest", "MESSAGE_TYPE__Stub_GPIOReadByteRequest", 15 },
-  { "Stub_GPIOReadByteResponse", "MESSAGE_TYPE__Stub_GPIOReadByteResponse", 16 },
-  { "Stub_GPIOWriteBitRequest", "MESSAGE_TYPE__Stub_GPIOWriteBitRequest", 17 },
-  { "Stub_GPIOWriteBitResponse", "MESSAGE_TYPE__Stub_GPIOWriteBitResponse", 18 },
-  { "Stub_GPIOWriteByteRequest", "MESSAGE_TYPE__Stub_GPIOWriteByteRequest", 19 },
-  { "Stub_GPIOWriteByteResponse", "MESSAGE_TYPE__Stub_GPIOWriteByteResponse", 20 },
-  { "Stub_HeaterRequest", "MESSAGE_TYPE__Stub_HeaterRequest", 21 },
-  { "Stub_HeaterResponse", "MESSAGE_TYPE__Stub_HeaterResponse", 22 },
-  { "Stub_MotorEncoderRequest", "MESSAGE_TYPE__Stub_MotorEncoderRequest", 23 },
-  { "Stub_MotorEncoderResponse", "MESSAGE_TYPE__Stub_MotorEncoderResponse", 24 },
-  { "Stub_OptLimitSwitchRequest", "MESSAGE_TYPE__Stub_OptLimitSwitchRequest", 25 },
-  { "Stub_OptLimitSwitchResponse", "MESSAGE_TYPE__Stub_OptLimitSwitchResponse", 26 },
-  { "Stub_SteperMotorRequest", "MESSAGE_TYPE__Stub_SteperMotorRequest", 27 },
-  { "Stub_SteperMotorResponse", "MESSAGE_TYPE__Stub_SteperMotorResponse", 28 },
-  { "Stub_ValveRequest", "MESSAGE_TYPE__Stub_ValveRequest", 29 },
-  { "Stub_ValveResponse", "MESSAGE_TYPE__Stub_ValveResponse", 30 },
+  { "StubCartridgeReadRequest", "MESSAGE_TYPE__StubCartridgeReadRequest", 7 },
+  { "StubCartridgeReadResponse", "MESSAGE_TYPE__StubCartridgeReadResponse", 8 },
+  { "StubCartridgeWriteRequest", "MESSAGE_TYPE__StubCartridgeWriteRequest", 9 },
+  { "StubCartridgeWriteResponse", "MESSAGE_TYPE__StubCartridgeWriteResponse", 10 },
+  { "StubDispenserRequest", "MESSAGE_TYPE__StubDispenserRequest", 11 },
+  { "StubDispenserResponse", "MESSAGE_TYPE__StubDispenserResponse", 12 },
+  { "StubGPIOInputSetupRequest", "MESSAGE_TYPE__StubGPIOInputSetupRequest", 13 },
+  { "StubGPIOInputSetupResponse", "MESSAGE_TYPE__StubGPIOInputSetupResponse", 14 },
+  { "StubGPIOReadBitRequest", "MESSAGE_TYPE__StubGPIOReadBitRequest", 15 },
+  { "StubGPIOReadBitResponse", "MESSAGE_TYPE__StubGPIOReadBitResponse", 16 },
+  { "StubGPIOReadByteRequest", "MESSAGE_TYPE__StubGPIOReadByteRequest", 17 },
+  { "StubGPIOReadByteResponse", "MESSAGE_TYPE__StubGPIOReadByteResponse", 18 },
+  { "StubGPIOWriteBitRequest", "MESSAGE_TYPE__StubGPIOWriteBitRequest", 19 },
+  { "StubGPIOWriteBitResponse", "MESSAGE_TYPE__StubGPIOWriteBitResponse", 20 },
+  { "StubGPIOWriteByteRequest", "MESSAGE_TYPE__StubGPIOWriteByteRequest", 21 },
+  { "StubGPIOWriteByteResponse", "MESSAGE_TYPE__StubGPIOWriteByteResponse", 22 },
+  { "StubHeaterRequest", "MESSAGE_TYPE__StubHeaterRequest", 23 },
+  { "StubHeaterResponse", "MESSAGE_TYPE__StubHeaterResponse", 24 },
+  { "StubMotorEncoderRequest", "MESSAGE_TYPE__StubMotorEncoderRequest", 25 },
+  { "StubMotorEncoderResponse", "MESSAGE_TYPE__StubMotorEncoderResponse", 26 },
+  { "StubOptLimitSwitchRequest", "MESSAGE_TYPE__StubOptLimitSwitchRequest", 27 },
+  { "StubOptLimitSwitchResponse", "MESSAGE_TYPE__StubOptLimitSwitchResponse", 28 },
+  { "StubSteperMotorRequest", "MESSAGE_TYPE__StubSteperMotorRequest", 29 },
+  { "StubSteperMotorResponse", "MESSAGE_TYPE__StubSteperMotorResponse", 30 },
+  { "StubValveRequest", "MESSAGE_TYPE__StubValveRequest", 31 },
+  { "StubValveResponse", "MESSAGE_TYPE__StubValveResponse", 32 },
 };
 static const ProtobufCIntRange message_type__value_ranges[] = {
-{0, 0},{0, 31}
+{0, 0},{0, 33}
 };
-static const ProtobufCEnumValueIndex message_type__enum_values_by_name[31] =
+static const ProtobufCEnumValueIndex message_type__enum_values_by_name[33] =
 {
   { "CalculateRequest", 3 },
   { "CalculateResponse", 4 },
@@ -53,30 +55,32 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[31] =
   { "ProgressResponse", 6 },
   { "RGB", 0 },
   { "Segment", 2 },
-  { "Stub_CartridgeReadRequest", 7 },
-  { "Stub_CartridgeReadResponse", 8 },
-  { "Stub_CartridgeWriteRequest", 9 },
-  { "Stub_CartridgeWriteResponse", 10 },
-  { "Stub_DispenserRequest", 11 },
-  { "Stub_DispenserResponse", 12 },
-  { "Stub_GPIOReadBitRequest", 13 },
-  { "Stub_GPIOReadBitResponse", 14 },
-  { "Stub_GPIOReadByteRequest", 15 },
-  { "Stub_GPIOReadByteResponse", 16 },
-  { "Stub_GPIOWriteBitRequest", 17 },
-  { "Stub_GPIOWriteBitResponse", 18 },
-  { "Stub_GPIOWriteByteRequest", 19 },
-  { "Stub_GPIOWriteByteResponse", 20 },
-  { "Stub_HeaterRequest", 21 },
-  { "Stub_HeaterResponse", 22 },
-  { "Stub_MotorEncoderRequest", 23 },
-  { "Stub_MotorEncoderResponse", 24 },
-  { "Stub_OptLimitSwitchRequest", 25 },
-  { "Stub_OptLimitSwitchResponse", 26 },
-  { "Stub_SteperMotorRequest", 27 },
-  { "Stub_SteperMotorResponse", 28 },
-  { "Stub_ValveRequest", 29 },
-  { "Stub_ValveResponse", 30 },
+  { "StubCartridgeReadRequest", 7 },
+  { "StubCartridgeReadResponse", 8 },
+  { "StubCartridgeWriteRequest", 9 },
+  { "StubCartridgeWriteResponse", 10 },
+  { "StubDispenserRequest", 11 },
+  { "StubDispenserResponse", 12 },
+  { "StubGPIOInputSetupRequest", 13 },
+  { "StubGPIOInputSetupResponse", 14 },
+  { "StubGPIOReadBitRequest", 15 },
+  { "StubGPIOReadBitResponse", 16 },
+  { "StubGPIOReadByteRequest", 17 },
+  { "StubGPIOReadByteResponse", 18 },
+  { "StubGPIOWriteBitRequest", 19 },
+  { "StubGPIOWriteBitResponse", 20 },
+  { "StubGPIOWriteByteRequest", 21 },
+  { "StubGPIOWriteByteResponse", 22 },
+  { "StubHeaterRequest", 23 },
+  { "StubHeaterResponse", 24 },
+  { "StubMotorEncoderRequest", 25 },
+  { "StubMotorEncoderResponse", 26 },
+  { "StubOptLimitSwitchRequest", 27 },
+  { "StubOptLimitSwitchResponse", 28 },
+  { "StubSteperMotorRequest", 29 },
+  { "StubSteperMotorResponse", 30 },
+  { "StubValveRequest", 31 },
+  { "StubValveResponse", 32 },
 };
 const ProtobufCEnumDescriptor message_type__descriptor =
 {
@@ -85,9 +89,9 @@ const ProtobufCEnumDescriptor message_type__descriptor =
   "MessageType",
   "MessageType",
   "",
-  31,
+  33,
   message_type__enum_values_by_number,
-  31,
+  33,
   message_type__enum_values_by_name,
   1,
   message_type__value_ranges,
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.h
index 359611f11..56f9af6ca 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.h
@@ -27,30 +27,32 @@ typedef enum _MessageType {
   MESSAGE_TYPE__CalculateResponse = 4,
   MESSAGE_TYPE__ProgressRequest = 5,
   MESSAGE_TYPE__ProgressResponse = 6,
-  MESSAGE_TYPE__Stub_CartridgeReadRequest = 7,
-  MESSAGE_TYPE__Stub_CartridgeReadResponse = 8,
-  MESSAGE_TYPE__Stub_CartridgeWriteRequest = 9,
-  MESSAGE_TYPE__Stub_CartridgeWriteResponse = 10,
-  MESSAGE_TYPE__Stub_DispenserRequest = 11,
-  MESSAGE_TYPE__Stub_DispenserResponse = 12,
-  MESSAGE_TYPE__Stub_GPIOReadBitRequest = 13,
-  MESSAGE_TYPE__Stub_GPIOReadBitResponse = 14,
-  MESSAGE_TYPE__Stub_GPIOReadByteRequest = 15,
-  MESSAGE_TYPE__Stub_GPIOReadByteResponse = 16,
-  MESSAGE_TYPE__Stub_GPIOWriteBitRequest = 17,
-  MESSAGE_TYPE__Stub_GPIOWriteBitResponse = 18,
-  MESSAGE_TYPE__Stub_GPIOWriteByteRequest = 19,
-  MESSAGE_TYPE__Stub_GPIOWriteByteResponse = 20,
-  MESSAGE_TYPE__Stub_HeaterRequest = 21,
-  MESSAGE_TYPE__Stub_HeaterResponse = 22,
-  MESSAGE_TYPE__Stub_MotorEncoderRequest = 23,
-  MESSAGE_TYPE__Stub_MotorEncoderResponse = 24,
-  MESSAGE_TYPE__Stub_OptLimitSwitchRequest = 25,
-  MESSAGE_TYPE__Stub_OptLimitSwitchResponse = 26,
-  MESSAGE_TYPE__Stub_SteperMotorRequest = 27,
-  MESSAGE_TYPE__Stub_SteperMotorResponse = 28,
-  MESSAGE_TYPE__Stub_ValveRequest = 29,
-  MESSAGE_TYPE__Stub_ValveResponse = 30
+  MESSAGE_TYPE__StubCartridgeReadRequest = 7,
+  MESSAGE_TYPE__StubCartridgeReadResponse = 8,
+  MESSAGE_TYPE__StubCartridgeWriteRequest = 9,
+  MESSAGE_TYPE__StubCartridgeWriteResponse = 10,
+  MESSAGE_TYPE__StubDispenserRequest = 11,
+  MESSAGE_TYPE__StubDispenserResponse = 12,
+  MESSAGE_TYPE__StubGPIOInputSetupRequest = 13,
+  MESSAGE_TYPE__StubGPIOInputSetupResponse = 14,
+  MESSAGE_TYPE__StubGPIOReadBitRequest = 15,
+  MESSAGE_TYPE__StubGPIOReadBitResponse = 16,
+  MESSAGE_TYPE__StubGPIOReadByteRequest = 17,
+  MESSAGE_TYPE__StubGPIOReadByteResponse = 18,
+  MESSAGE_TYPE__StubGPIOWriteBitRequest = 19,
+  MESSAGE_TYPE__StubGPIOWriteBitResponse = 20,
+  MESSAGE_TYPE__StubGPIOWriteByteRequest = 21,
+  MESSAGE_TYPE__StubGPIOWriteByteResponse = 22,
+  MESSAGE_TYPE__StubHeaterRequest = 23,
+  MESSAGE_TYPE__StubHeaterResponse = 24,
+  MESSAGE_TYPE__StubMotorEncoderRequest = 25,
+  MESSAGE_TYPE__StubMotorEncoderResponse = 26,
+  MESSAGE_TYPE__StubOptLimitSwitchRequest = 27,
+  MESSAGE_TYPE__StubOptLimitSwitchResponse = 28,
+  MESSAGE_TYPE__StubSteperMotorRequest = 29,
+  MESSAGE_TYPE__StubSteperMotorResponse = 30,
+  MESSAGE_TYPE__StubValveRequest = 31,
+  MESSAGE_TYPE__StubValveResponse = 32
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(MESSAGE_TYPE)
 } MessageType;
 
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_CartridgeReadRequest.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubCartridgeReadRequest.pb-c.c
index 10b72bcfb..6ecf34fcd 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_CartridgeReadRequest.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubCartridgeReadRequest.pb-c.c
@@ -1,58 +1,58 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_CartridgeReadRequest.proto */
+/* Generated from: StubCartridgeReadRequest.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_CartridgeReadRequest.pb-c.h"
-void   stub__cartridge_read_request__init
+#include "StubCartridgeReadRequest.pb-c.h"
+void   stub_cartridge_read_request__init
                      (StubCartridgeReadRequest         *message)
 {
-  static const StubCartridgeReadRequest init_value = STUB__CARTRIDGE_READ_REQUEST__INIT;
+  static const StubCartridgeReadRequest init_value = STUB_CARTRIDGE_READ_REQUEST__INIT;
   *message = init_value;
 }
-size_t stub__cartridge_read_request__get_packed_size
+size_t stub_cartridge_read_request__get_packed_size
                      (const StubCartridgeReadRequest *message)
 {
-  assert(message->base.descriptor == &stub__cartridge_read_request__descriptor);
+  assert(message->base.descriptor == &stub_cartridge_read_request__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__cartridge_read_request__pack
+size_t stub_cartridge_read_request__pack
                      (const StubCartridgeReadRequest *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__cartridge_read_request__descriptor);
+  assert(message->base.descriptor == &stub_cartridge_read_request__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__cartridge_read_request__pack_to_buffer
+size_t stub_cartridge_read_request__pack_to_buffer
                      (const StubCartridgeReadRequest *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__cartridge_read_request__descriptor);
+  assert(message->base.descriptor == &stub_cartridge_read_request__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubCartridgeReadRequest *
-       stub__cartridge_read_request__unpack
+       stub_cartridge_read_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubCartridgeReadRequest *)
-     protobuf_c_message_unpack (&stub__cartridge_read_request__descriptor,
+     protobuf_c_message_unpack (&stub_cartridge_read_request__descriptor,
                                 allocator, len, data);
 }
-void   stub__cartridge_read_request__free_unpacked
+void   stub_cartridge_read_request__free_unpacked
                      (StubCartridgeReadRequest *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__cartridge_read_request__descriptor);
+  assert(message->base.descriptor == &stub_cartridge_read_request__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__cartridge_read_request__field_descriptors[1] =
+static const ProtobufCFieldDescriptor stub_cartridge_read_request__field_descriptors[1] =
 {
   {
     "CartridgeId",
@@ -67,26 +67,26 @@ static const ProtobufCFieldDescriptor stub__cartridge_read_request__field_descri
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__cartridge_read_request__field_indices_by_name[] = {
+static const unsigned stub_cartridge_read_request__field_indices_by_name[] = {
   0,   /* field[0] = CartridgeId */
 };
-static const ProtobufCIntRange stub__cartridge_read_request__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_cartridge_read_request__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 1 }
 };
-const ProtobufCMessageDescriptor stub__cartridge_read_request__descriptor =
+const ProtobufCMessageDescriptor stub_cartridge_read_request__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_CartridgeReadRequest",
+  "StubCartridgeReadRequest",
   "StubCartridgeReadRequest",
   "StubCartridgeReadRequest",
   "",
   sizeof(StubCartridgeReadRequest),
   1,
-  stub__cartridge_read_request__field_descriptors,
-  stub__cartridge_read_request__field_indices_by_name,
-  1,  stub__cartridge_read_request__number_ranges,
-  (ProtobufCMessageInit) stub__cartridge_read_request__init,
+  stub_cartridge_read_request__field_descriptors,
+  stub_cartridge_read_request__field_indices_by_name,
+  1,  stub_cartridge_read_request__number_ranges,
+  (ProtobufCMessageInit) stub_cartridge_read_request__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_CartridgeReadRequest.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubCartridgeReadRequest.pb-c.h
index 3cd7f8398..12ea3b514 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_CartridgeReadRequest.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubCartridgeReadRequest.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_CartridgeReadRequest.proto */
+/* Generated from: StubCartridgeReadRequest.proto */
 
-#ifndef PROTOBUF_C_Stub_5fCartridgeReadRequest_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fCartridgeReadRequest_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubCartridgeReadRequest_2eproto__INCLUDED
+#define PROTOBUF_C_StubCartridgeReadRequest_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -32,28 +32,28 @@ struct  _StubCartridgeReadRequest
   protobuf_c_boolean has_cartridgeid;
   uint32_t cartridgeid;
 };
-#define STUB__CARTRIDGE_READ_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__cartridge_read_request__descriptor) \
+#define STUB_CARTRIDGE_READ_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_cartridge_read_request__descriptor) \
     , 0, 0 }
 
 
 /* StubCartridgeReadRequest methods */
-void   stub__cartridge_read_request__init
+void   stub_cartridge_read_request__init
                      (StubCartridgeReadRequest         *message);
-size_t stub__cartridge_read_request__get_packed_size
+size_t stub_cartridge_read_request__get_packed_size
                      (const StubCartridgeReadRequest   *message);
-size_t stub__cartridge_read_request__pack
+size_t stub_cartridge_read_request__pack
                      (const StubCartridgeReadRequest   *message,
                       uint8_t             *out);
-size_t stub__cartridge_read_request__pack_to_buffer
+size_t stub_cartridge_read_request__pack_to_buffer
                      (const StubCartridgeReadRequest   *message,
                       ProtobufCBuffer     *buffer);
 StubCartridgeReadRequest *
-       stub__cartridge_read_request__unpack
+       stub_cartridge_read_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__cartridge_read_request__free_unpacked
+void   stub_cartridge_read_request__free_unpacked
                      (StubCartridgeReadRequest *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -67,9 +67,9 @@ typedef void (*StubCartridgeReadRequest_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__cartridge_read_request__descriptor;
+extern const ProtobufCMessageDescriptor stub_cartridge_read_request__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fCartridgeReadRequest_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubCartridgeReadRequest_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_CartridgeReadResponse.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubCartridgeReadResponse.pb-c.c
index 95b7e352b..7c23c1ffa 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_CartridgeReadResponse.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubCartridgeReadResponse.pb-c.c
@@ -1,58 +1,58 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_CartridgeReadResponse.proto */
+/* Generated from: StubCartridgeReadResponse.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_CartridgeReadResponse.pb-c.h"
-void   stub__cartridge_read_response__init
+#include "StubCartridgeReadResponse.pb-c.h"
+void   stub_cartridge_read_response__init
                      (StubCartridgeReadResponse         *message)
 {
-  static const StubCartridgeReadResponse init_value = STUB__CARTRIDGE_READ_RESPONSE__INIT;
+  static const StubCartridgeReadResponse init_value = STUB_CARTRIDGE_READ_RESPONSE__INIT;
   *message = init_value;
 }
-size_t stub__cartridge_read_response__get_packed_size
+size_t stub_cartridge_read_response__get_packed_size
                      (const StubCartridgeReadResponse *message)
 {
-  assert(message->base.descriptor == &stub__cartridge_read_response__descriptor);
+  assert(message->base.descriptor == &stub_cartridge_read_response__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__cartridge_read_response__pack
+size_t stub_cartridge_read_response__pack
                      (const StubCartridgeReadResponse *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__cartridge_read_response__descriptor);
+  assert(message->base.descriptor == &stub_cartridge_read_response__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__cartridge_read_response__pack_to_buffer
+size_t stub_cartridge_read_response__pack_to_buffer
                      (const StubCartridgeReadResponse *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__cartridge_read_response__descriptor);
+  assert(message->base.descriptor == &stub_cartridge_read_response__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubCartridgeReadResponse *
-       stub__cartridge_read_response__unpack
+       stub_cartridge_read_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubCartridgeReadResponse *)
-     protobuf_c_message_unpack (&stub__cartridge_read_response__descriptor,
+     protobuf_c_message_unpack (&stub_cartridge_read_response__descriptor,
                                 allocator, len, data);
 }
-void   stub__cartridge_read_response__free_unpacked
+void   stub_cartridge_read_response__free_unpacked
                      (StubCartridgeReadResponse *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__cartridge_read_response__descriptor);
+  assert(message->base.descriptor == &stub_cartridge_read_response__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__cartridge_read_response__field_descriptors[6] =
+static const ProtobufCFieldDescriptor stub_cartridge_read_response__field_descriptors[6] =
 {
   {
     "CartridgeId",
@@ -94,7 +94,7 @@ static const ProtobufCFieldDescriptor stub__cartridge_read_response__field_descr
     "CartridgeData",
     5,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
+    PROTOBUF_C_TYPE_INT32,
     offsetof(StubCartridgeReadResponse, has_cartridgedata),
     offsetof(StubCartridgeReadResponse, cartridgedata),
     NULL,
@@ -127,7 +127,7 @@ static const ProtobufCFieldDescriptor stub__cartridge_read_response__field_descr
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__cartridge_read_response__field_indices_by_name[] = {
+static const unsigned stub_cartridge_read_response__field_indices_by_name[] = {
   1,   /* field[1] = CartridgeColor */
   3,   /* field[3] = CartridgeData */
   0,   /* field[0] = CartridgeId */
@@ -135,25 +135,25 @@ static const unsigned stub__cartridge_read_response__field_indices_by_name[] = {
   2,   /* field[2] = CartridgeVersion */
   5,   /* field[5] = Status */
 };
-static const ProtobufCIntRange stub__cartridge_read_response__number_ranges[3 + 1] =
+static const ProtobufCIntRange stub_cartridge_read_response__number_ranges[3 + 1] =
 {
   { 1, 0 },
   { 3, 1 },
   { 8, 5 },
   { 0, 6 }
 };
-const ProtobufCMessageDescriptor stub__cartridge_read_response__descriptor =
+const ProtobufCMessageDescriptor stub_cartridge_read_response__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_CartridgeReadResponse",
+  "StubCartridgeReadResponse",
   "StubCartridgeReadResponse",
   "StubCartridgeReadResponse",
   "",
   sizeof(StubCartridgeReadResponse),
   6,
-  stub__cartridge_read_response__field_descriptors,
-  stub__cartridge_read_response__field_indices_by_name,
-  3,  stub__cartridge_read_response__number_ranges,
-  (ProtobufCMessageInit) stub__cartridge_read_response__init,
+  stub_cartridge_read_response__field_descriptors,
+  stub_cartridge_read_response__field_indices_by_name,
+  3,  stub_cartridge_read_response__number_ranges,
+  (ProtobufCMessageInit) stub_cartridge_read_response__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_CartridgeReadResponse.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubCartridgeReadResponse.pb-c.h
index efc00923a..3b82ef645 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_CartridgeReadResponse.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubCartridgeReadResponse.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_CartridgeReadResponse.proto */
+/* Generated from: StubCartridgeReadResponse.proto */
 
-#ifndef PROTOBUF_C_Stub_5fCartridgeReadResponse_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fCartridgeReadResponse_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubCartridgeReadResponse_2eproto__INCLUDED
+#define PROTOBUF_C_StubCartridgeReadResponse_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -33,34 +33,34 @@ struct  _StubCartridgeReadResponse
   protobuf_c_boolean has_cartridgeversion;
   uint32_t cartridgeversion;
   protobuf_c_boolean has_cartridgedata;
-  uint32_t cartridgedata;
+  int32_t cartridgedata;
   protobuf_c_boolean has_cartridgeused;
   protobuf_c_boolean cartridgeused;
   protobuf_c_boolean has_status;
   uint32_t status;
 };
-#define STUB__CARTRIDGE_READ_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__cartridge_read_response__descriptor) \
+#define STUB_CARTRIDGE_READ_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_cartridge_read_response__descriptor) \
     , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 /* StubCartridgeReadResponse methods */
-void   stub__cartridge_read_response__init
+void   stub_cartridge_read_response__init
                      (StubCartridgeReadResponse         *message);
-size_t stub__cartridge_read_response__get_packed_size
+size_t stub_cartridge_read_response__get_packed_size
                      (const StubCartridgeReadResponse   *message);
-size_t stub__cartridge_read_response__pack
+size_t stub_cartridge_read_response__pack
                      (const StubCartridgeReadResponse   *message,
                       uint8_t             *out);
-size_t stub__cartridge_read_response__pack_to_buffer
+size_t stub_cartridge_read_response__pack_to_buffer
                      (const StubCartridgeReadResponse   *message,
                       ProtobufCBuffer     *buffer);
 StubCartridgeReadResponse *
-       stub__cartridge_read_response__unpack
+       stub_cartridge_read_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__cartridge_read_response__free_unpacked
+void   stub_cartridge_read_response__free_unpacked
                      (StubCartridgeReadResponse *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -74,9 +74,9 @@ typedef void (*StubCartridgeReadResponse_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__cartridge_read_response__descriptor;
+extern const ProtobufCMessageDescriptor stub_cartridge_read_response__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fCartridgeReadResponse_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubCartridgeReadResponse_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_CartridgeWriteRequest.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubCartridgeWriteRequest.pb-c.c
index 23f2b88af..fe528a34e 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_CartridgeWriteRequest.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubCartridgeWriteRequest.pb-c.c
@@ -1,58 +1,58 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_CartridgeWriteRequest.proto */
+/* Generated from: StubCartridgeWriteRequest.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_CartridgeWriteRequest.pb-c.h"
-void   stub__cartridge_write_request__init
+#include "StubCartridgeWriteRequest.pb-c.h"
+void   stub_cartridge_write_request__init
                      (StubCartridgeWriteRequest         *message)
 {
-  static const StubCartridgeWriteRequest init_value = STUB__CARTRIDGE_WRITE_REQUEST__INIT;
+  static const StubCartridgeWriteRequest init_value = STUB_CARTRIDGE_WRITE_REQUEST__INIT;
   *message = init_value;
 }
-size_t stub__cartridge_write_request__get_packed_size
+size_t stub_cartridge_write_request__get_packed_size
                      (const StubCartridgeWriteRequest *message)
 {
-  assert(message->base.descriptor == &stub__cartridge_write_request__descriptor);
+  assert(message->base.descriptor == &stub_cartridge_write_request__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__cartridge_write_request__pack
+size_t stub_cartridge_write_request__pack
                      (const StubCartridgeWriteRequest *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__cartridge_write_request__descriptor);
+  assert(message->base.descriptor == &stub_cartridge_write_request__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__cartridge_write_request__pack_to_buffer
+size_t stub_cartridge_write_request__pack_to_buffer
                      (const StubCartridgeWriteRequest *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__cartridge_write_request__descriptor);
+  assert(message->base.descriptor == &stub_cartridge_write_request__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubCartridgeWriteRequest *
-       stub__cartridge_write_request__unpack
+       stub_cartridge_write_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubCartridgeWriteRequest *)
-     protobuf_c_message_unpack (&stub__cartridge_write_request__descriptor,
+     protobuf_c_message_unpack (&stub_cartridge_write_request__descriptor,
                                 allocator, len, data);
 }
-void   stub__cartridge_write_request__free_unpacked
+void   stub_cartridge_write_request__free_unpacked
                      (StubCartridgeWriteRequest *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__cartridge_write_request__descriptor);
+  assert(message->base.descriptor == &stub_cartridge_write_request__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__cartridge_write_request__field_descriptors[5] =
+static const ProtobufCFieldDescriptor stub_cartridge_write_request__field_descriptors[5] =
 {
   {
     "CartridgeId",
@@ -115,30 +115,30 @@ static const ProtobufCFieldDescriptor stub__cartridge_write_request__field_descr
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__cartridge_write_request__field_indices_by_name[] = {
+static const unsigned stub_cartridge_write_request__field_indices_by_name[] = {
   1,   /* field[1] = CartridgeColor */
   3,   /* field[3] = CartridgeData */
   0,   /* field[0] = CartridgeId */
   4,   /* field[4] = CartridgeUsed */
   2,   /* field[2] = CartridgeVersion */
 };
-static const ProtobufCIntRange stub__cartridge_write_request__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_cartridge_write_request__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 5 }
 };
-const ProtobufCMessageDescriptor stub__cartridge_write_request__descriptor =
+const ProtobufCMessageDescriptor stub_cartridge_write_request__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_CartridgeWriteRequest",
+  "StubCartridgeWriteRequest",
   "StubCartridgeWriteRequest",
   "StubCartridgeWriteRequest",
   "",
   sizeof(StubCartridgeWriteRequest),
   5,
-  stub__cartridge_write_request__field_descriptors,
-  stub__cartridge_write_request__field_indices_by_name,
-  1,  stub__cartridge_write_request__number_ranges,
-  (ProtobufCMessageInit) stub__cartridge_write_request__init,
+  stub_cartridge_write_request__field_descriptors,
+  stub_cartridge_write_request__field_indices_by_name,
+  1,  stub_cartridge_write_request__number_ranges,
+  (ProtobufCMessageInit) stub_cartridge_write_request__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_CartridgeWriteRequest.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubCartridgeWriteRequest.pb-c.h
index b179d5d37..ead0d6b2d 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_CartridgeWriteRequest.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubCartridgeWriteRequest.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_CartridgeWriteRequest.proto */
+/* Generated from: StubCartridgeWriteRequest.proto */
 
-#ifndef PROTOBUF_C_Stub_5fCartridgeWriteRequest_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fCartridgeWriteRequest_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubCartridgeWriteRequest_2eproto__INCLUDED
+#define PROTOBUF_C_StubCartridgeWriteRequest_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -45,28 +45,28 @@ struct  _StubCartridgeWriteRequest
   protobuf_c_boolean has_cartridgeused;
   protobuf_c_boolean cartridgeused;
 };
-#define STUB__CARTRIDGE_WRITE_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__cartridge_write_request__descriptor) \
+#define STUB_CARTRIDGE_WRITE_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_cartridge_write_request__descriptor) \
     , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 /* StubCartridgeWriteRequest methods */
-void   stub__cartridge_write_request__init
+void   stub_cartridge_write_request__init
                      (StubCartridgeWriteRequest         *message);
-size_t stub__cartridge_write_request__get_packed_size
+size_t stub_cartridge_write_request__get_packed_size
                      (const StubCartridgeWriteRequest   *message);
-size_t stub__cartridge_write_request__pack
+size_t stub_cartridge_write_request__pack
                      (const StubCartridgeWriteRequest   *message,
                       uint8_t             *out);
-size_t stub__cartridge_write_request__pack_to_buffer
+size_t stub_cartridge_write_request__pack_to_buffer
                      (const StubCartridgeWriteRequest   *message,
                       ProtobufCBuffer     *buffer);
 StubCartridgeWriteRequest *
-       stub__cartridge_write_request__unpack
+       stub_cartridge_write_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__cartridge_write_request__free_unpacked
+void   stub_cartridge_write_request__free_unpacked
                      (StubCartridgeWriteRequest *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -80,9 +80,9 @@ typedef void (*StubCartridgeWriteRequest_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__cartridge_write_request__descriptor;
+extern const ProtobufCMessageDescriptor stub_cartridge_write_request__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fCartridgeWriteRequest_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubCartridgeWriteRequest_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_CartridgeWriteResponse.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubCartridgeWriteResponse.pb-c.c
index 98cd45956..66454c20a 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_CartridgeWriteResponse.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubCartridgeWriteResponse.pb-c.c
@@ -1,58 +1,58 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_CartridgeWriteResponse.proto */
+/* Generated from: StubCartridgeWriteResponse.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_CartridgeWriteResponse.pb-c.h"
-void   stub__cartridge_write_response__init
+#include "StubCartridgeWriteResponse.pb-c.h"
+void   stub_cartridge_write_response__init
                      (StubCartridgeWriteResponse         *message)
 {
-  static const StubCartridgeWriteResponse init_value = STUB__CARTRIDGE_WRITE_RESPONSE__INIT;
+  static const StubCartridgeWriteResponse init_value = STUB_CARTRIDGE_WRITE_RESPONSE__INIT;
   *message = init_value;
 }
-size_t stub__cartridge_write_response__get_packed_size
+size_t stub_cartridge_write_response__get_packed_size
                      (const StubCartridgeWriteResponse *message)
 {
-  assert(message->base.descriptor == &stub__cartridge_write_response__descriptor);
+  assert(message->base.descriptor == &stub_cartridge_write_response__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__cartridge_write_response__pack
+size_t stub_cartridge_write_response__pack
                      (const StubCartridgeWriteResponse *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__cartridge_write_response__descriptor);
+  assert(message->base.descriptor == &stub_cartridge_write_response__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__cartridge_write_response__pack_to_buffer
+size_t stub_cartridge_write_response__pack_to_buffer
                      (const StubCartridgeWriteResponse *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__cartridge_write_response__descriptor);
+  assert(message->base.descriptor == &stub_cartridge_write_response__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubCartridgeWriteResponse *
-       stub__cartridge_write_response__unpack
+       stub_cartridge_write_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubCartridgeWriteResponse *)
-     protobuf_c_message_unpack (&stub__cartridge_write_response__descriptor,
+     protobuf_c_message_unpack (&stub_cartridge_write_response__descriptor,
                                 allocator, len, data);
 }
-void   stub__cartridge_write_response__free_unpacked
+void   stub_cartridge_write_response__free_unpacked
                      (StubCartridgeWriteResponse *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__cartridge_write_response__descriptor);
+  assert(message->base.descriptor == &stub_cartridge_write_response__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__cartridge_write_response__field_descriptors[2] =
+static const ProtobufCFieldDescriptor stub_cartridge_write_response__field_descriptors[2] =
 {
   {
     "CartridgeId",
@@ -79,28 +79,28 @@ static const ProtobufCFieldDescriptor stub__cartridge_write_response__field_desc
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__cartridge_write_response__field_indices_by_name[] = {
+static const unsigned stub_cartridge_write_response__field_indices_by_name[] = {
   0,   /* field[0] = CartridgeId */
   1,   /* field[1] = Status */
 };
-static const ProtobufCIntRange stub__cartridge_write_response__number_ranges[2 + 1] =
+static const ProtobufCIntRange stub_cartridge_write_response__number_ranges[2 + 1] =
 {
   { 1, 0 },
   { 8, 1 },
   { 0, 2 }
 };
-const ProtobufCMessageDescriptor stub__cartridge_write_response__descriptor =
+const ProtobufCMessageDescriptor stub_cartridge_write_response__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_CartridgeWriteResponse",
+  "StubCartridgeWriteResponse",
   "StubCartridgeWriteResponse",
   "StubCartridgeWriteResponse",
   "",
   sizeof(StubCartridgeWriteResponse),
   2,
-  stub__cartridge_write_response__field_descriptors,
-  stub__cartridge_write_response__field_indices_by_name,
-  2,  stub__cartridge_write_response__number_ranges,
-  (ProtobufCMessageInit) stub__cartridge_write_response__init,
+  stub_cartridge_write_response__field_descriptors,
+  stub_cartridge_write_response__field_indices_by_name,
+  2,  stub_cartridge_write_response__number_ranges,
+  (ProtobufCMessageInit) stub_cartridge_write_response__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_CartridgeWriteResponse.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubCartridgeWriteResponse.pb-c.h
index 89b9b4cee..5ba0eb28c 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_CartridgeWriteResponse.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubCartridgeWriteResponse.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_CartridgeWriteResponse.proto */
+/* Generated from: StubCartridgeWriteResponse.proto */
 
-#ifndef PROTOBUF_C_Stub_5fCartridgeWriteResponse_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fCartridgeWriteResponse_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubCartridgeWriteResponse_2eproto__INCLUDED
+#define PROTOBUF_C_StubCartridgeWriteResponse_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -31,28 +31,28 @@ struct  _StubCartridgeWriteResponse
   protobuf_c_boolean has_status;
   uint32_t status;
 };
-#define STUB__CARTRIDGE_WRITE_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__cartridge_write_response__descriptor) \
+#define STUB_CARTRIDGE_WRITE_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_cartridge_write_response__descriptor) \
     , 0, 0, 0, 0 }
 
 
 /* StubCartridgeWriteResponse methods */
-void   stub__cartridge_write_response__init
+void   stub_cartridge_write_response__init
                      (StubCartridgeWriteResponse         *message);
-size_t stub__cartridge_write_response__get_packed_size
+size_t stub_cartridge_write_response__get_packed_size
                      (const StubCartridgeWriteResponse   *message);
-size_t stub__cartridge_write_response__pack
+size_t stub_cartridge_write_response__pack
                      (const StubCartridgeWriteResponse   *message,
                       uint8_t             *out);
-size_t stub__cartridge_write_response__pack_to_buffer
+size_t stub_cartridge_write_response__pack_to_buffer
                      (const StubCartridgeWriteResponse   *message,
                       ProtobufCBuffer     *buffer);
 StubCartridgeWriteResponse *
-       stub__cartridge_write_response__unpack
+       stub_cartridge_write_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__cartridge_write_response__free_unpacked
+void   stub_cartridge_write_response__free_unpacked
                      (StubCartridgeWriteResponse *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -66,9 +66,9 @@ typedef void (*StubCartridgeWriteResponse_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__cartridge_write_response__descriptor;
+extern const ProtobufCMessageDescriptor stub_cartridge_write_response__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fCartridgeWriteResponse_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubCartridgeWriteResponse_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_DispenserRequest.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubDispenserRequest.pb-c.c
index 6763976cf..d8cdbdd8b 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_DispenserRequest.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubDispenserRequest.pb-c.c
@@ -1,58 +1,58 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_DispenserRequest.proto */
+/* Generated from: StubDispenserRequest.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_DispenserRequest.pb-c.h"
-void   stub__dispenser_request__init
+#include "StubDispenserRequest.pb-c.h"
+void   stub_dispenser_request__init
                      (StubDispenserRequest         *message)
 {
-  static const StubDispenserRequest init_value = STUB__DISPENSER_REQUEST__INIT;
+  static const StubDispenserRequest init_value = STUB_DISPENSER_REQUEST__INIT;
   *message = init_value;
 }
-size_t stub__dispenser_request__get_packed_size
+size_t stub_dispenser_request__get_packed_size
                      (const StubDispenserRequest *message)
 {
-  assert(message->base.descriptor == &stub__dispenser_request__descriptor);
+  assert(message->base.descriptor == &stub_dispenser_request__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__dispenser_request__pack
+size_t stub_dispenser_request__pack
                      (const StubDispenserRequest *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__dispenser_request__descriptor);
+  assert(message->base.descriptor == &stub_dispenser_request__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__dispenser_request__pack_to_buffer
+size_t stub_dispenser_request__pack_to_buffer
                      (const StubDispenserRequest *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__dispenser_request__descriptor);
+  assert(message->base.descriptor == &stub_dispenser_request__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubDispenserRequest *
-       stub__dispenser_request__unpack
+       stub_dispenser_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubDispenserRequest *)
-     protobuf_c_message_unpack (&stub__dispenser_request__descriptor,
+     protobuf_c_message_unpack (&stub_dispenser_request__descriptor,
                                 allocator, len, data);
 }
-void   stub__dispenser_request__free_unpacked
+void   stub_dispenser_request__free_unpacked
                      (StubDispenserRequest *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__dispenser_request__descriptor);
+  assert(message->base.descriptor == &stub_dispenser_request__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__dispenser_request__field_descriptors[5] =
+static const ProtobufCFieldDescriptor stub_dispenser_request__field_descriptors[5] =
 {
   {
     "DispenserId",
@@ -94,7 +94,7 @@ static const ProtobufCFieldDescriptor stub__dispenser_request__field_descriptors
     "SetMicrostepDivision",
     4,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_INT32,
+    PROTOBUF_C_TYPE_UINT32,
     offsetof(StubDispenserRequest, has_setmicrostepdivision),
     offsetof(StubDispenserRequest, setmicrostepdivision),
     NULL,
@@ -115,30 +115,30 @@ static const ProtobufCFieldDescriptor stub__dispenser_request__field_descriptors
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__dispenser_request__field_indices_by_name[] = {
+static const unsigned stub_dispenser_request__field_indices_by_name[] = {
   0,   /* field[0] = DispenserId */
   2,   /* field[2] = SetDirection */
   3,   /* field[3] = SetMicrostepDivision */
   4,   /* field[4] = SetSpeed */
   1,   /* field[1] = Start */
 };
-static const ProtobufCIntRange stub__dispenser_request__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_dispenser_request__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 5 }
 };
-const ProtobufCMessageDescriptor stub__dispenser_request__descriptor =
+const ProtobufCMessageDescriptor stub_dispenser_request__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_DispenserRequest",
+  "StubDispenserRequest",
   "StubDispenserRequest",
   "StubDispenserRequest",
   "",
   sizeof(StubDispenserRequest),
   5,
-  stub__dispenser_request__field_descriptors,
-  stub__dispenser_request__field_indices_by_name,
-  1,  stub__dispenser_request__number_ranges,
-  (ProtobufCMessageInit) stub__dispenser_request__init,
+  stub_dispenser_request__field_descriptors,
+  stub_dispenser_request__field_indices_by_name,
+  1,  stub_dispenser_request__number_ranges,
+  (ProtobufCMessageInit) stub_dispenser_request__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_DispenserRequest.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubDispenserRequest.pb-c.h
index e45e3f1f4..8f99287a9 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_DispenserRequest.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubDispenserRequest.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_DispenserRequest.proto */
+/* Generated from: StubDispenserRequest.proto */
 
-#ifndef PROTOBUF_C_Stub_5fDispenserRequest_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fDispenserRequest_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubDispenserRequest_2eproto__INCLUDED
+#define PROTOBUF_C_StubDispenserRequest_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -45,32 +45,32 @@ struct  _StubDispenserRequest
    * No. of steps for 360 deg.
    */
   protobuf_c_boolean has_setmicrostepdivision;
-  int32_t setmicrostepdivision;
+  uint32_t setmicrostepdivision;
   protobuf_c_boolean has_setspeed;
   int32_t setspeed;
 };
-#define STUB__DISPENSER_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__dispenser_request__descriptor) \
+#define STUB_DISPENSER_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_dispenser_request__descriptor) \
     , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 /* StubDispenserRequest methods */
-void   stub__dispenser_request__init
+void   stub_dispenser_request__init
                      (StubDispenserRequest         *message);
-size_t stub__dispenser_request__get_packed_size
+size_t stub_dispenser_request__get_packed_size
                      (const StubDispenserRequest   *message);
-size_t stub__dispenser_request__pack
+size_t stub_dispenser_request__pack
                      (const StubDispenserRequest   *message,
                       uint8_t             *out);
-size_t stub__dispenser_request__pack_to_buffer
+size_t stub_dispenser_request__pack_to_buffer
                      (const StubDispenserRequest   *message,
                       ProtobufCBuffer     *buffer);
 StubDispenserRequest *
-       stub__dispenser_request__unpack
+       stub_dispenser_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__dispenser_request__free_unpacked
+void   stub_dispenser_request__free_unpacked
                      (StubDispenserRequest *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -84,9 +84,9 @@ typedef void (*StubDispenserRequest_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__dispenser_request__descriptor;
+extern const ProtobufCMessageDescriptor stub_dispenser_request__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fDispenserRequest_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubDispenserRequest_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_DispenserResponse.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubDispenserResponse.pb-c.c
index 8fcc49027..de699971a 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_DispenserResponse.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubDispenserResponse.pb-c.c
@@ -1,58 +1,58 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_DispenserResponse.proto */
+/* Generated from: StubDispenserResponse.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_DispenserResponse.pb-c.h"
-void   stub__dispenser_response__init
+#include "StubDispenserResponse.pb-c.h"
+void   stub_dispenser_response__init
                      (StubDispenserResponse         *message)
 {
-  static const StubDispenserResponse init_value = STUB__DISPENSER_RESPONSE__INIT;
+  static const StubDispenserResponse init_value = STUB_DISPENSER_RESPONSE__INIT;
   *message = init_value;
 }
-size_t stub__dispenser_response__get_packed_size
+size_t stub_dispenser_response__get_packed_size
                      (const StubDispenserResponse *message)
 {
-  assert(message->base.descriptor == &stub__dispenser_response__descriptor);
+  assert(message->base.descriptor == &stub_dispenser_response__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__dispenser_response__pack
+size_t stub_dispenser_response__pack
                      (const StubDispenserResponse *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__dispenser_response__descriptor);
+  assert(message->base.descriptor == &stub_dispenser_response__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__dispenser_response__pack_to_buffer
+size_t stub_dispenser_response__pack_to_buffer
                      (const StubDispenserResponse *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__dispenser_response__descriptor);
+  assert(message->base.descriptor == &stub_dispenser_response__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubDispenserResponse *
-       stub__dispenser_response__unpack
+       stub_dispenser_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubDispenserResponse *)
-     protobuf_c_message_unpack (&stub__dispenser_response__descriptor,
+     protobuf_c_message_unpack (&stub_dispenser_response__descriptor,
                                 allocator, len, data);
 }
-void   stub__dispenser_response__free_unpacked
+void   stub_dispenser_response__free_unpacked
                      (StubDispenserResponse *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__dispenser_response__descriptor);
+  assert(message->base.descriptor == &stub_dispenser_response__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__dispenser_response__field_descriptors[4] =
+static const ProtobufCFieldDescriptor stub_dispenser_response__field_descriptors[4] =
 {
   {
     "DispenserId",
@@ -103,29 +103,29 @@ static const ProtobufCFieldDescriptor stub__dispenser_response__field_descriptor
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__dispenser_response__field_indices_by_name[] = {
+static const unsigned stub_dispenser_response__field_indices_by_name[] = {
   0,   /* field[0] = DispenserId */
   1,   /* field[1] = DispenserPosition */
   2,   /* field[2] = InkWorningLevel */
   3,   /* field[3] = Status */
 };
-static const ProtobufCIntRange stub__dispenser_response__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_dispenser_response__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 4 }
 };
-const ProtobufCMessageDescriptor stub__dispenser_response__descriptor =
+const ProtobufCMessageDescriptor stub_dispenser_response__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_DispenserResponse",
+  "StubDispenserResponse",
   "StubDispenserResponse",
   "StubDispenserResponse",
   "",
   sizeof(StubDispenserResponse),
   4,
-  stub__dispenser_response__field_descriptors,
-  stub__dispenser_response__field_indices_by_name,
-  1,  stub__dispenser_response__number_ranges,
-  (ProtobufCMessageInit) stub__dispenser_response__init,
+  stub_dispenser_response__field_descriptors,
+  stub_dispenser_response__field_indices_by_name,
+  1,  stub_dispenser_response__number_ranges,
+  (ProtobufCMessageInit) stub_dispenser_response__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_DispenserResponse.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubDispenserResponse.pb-c.h
index 71c174d4d..7598720df 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_DispenserResponse.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubDispenserResponse.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_DispenserResponse.proto */
+/* Generated from: StubDispenserResponse.proto */
 
-#ifndef PROTOBUF_C_Stub_5fDispenserResponse_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fDispenserResponse_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubDispenserResponse_2eproto__INCLUDED
+#define PROTOBUF_C_StubDispenserResponse_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -46,28 +46,28 @@ struct  _StubDispenserResponse
   protobuf_c_boolean has_status;
   protobuf_c_boolean status;
 };
-#define STUB__DISPENSER_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__dispenser_response__descriptor) \
+#define STUB_DISPENSER_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_dispenser_response__descriptor) \
     , 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 /* StubDispenserResponse methods */
-void   stub__dispenser_response__init
+void   stub_dispenser_response__init
                      (StubDispenserResponse         *message);
-size_t stub__dispenser_response__get_packed_size
+size_t stub_dispenser_response__get_packed_size
                      (const StubDispenserResponse   *message);
-size_t stub__dispenser_response__pack
+size_t stub_dispenser_response__pack
                      (const StubDispenserResponse   *message,
                       uint8_t             *out);
-size_t stub__dispenser_response__pack_to_buffer
+size_t stub_dispenser_response__pack_to_buffer
                      (const StubDispenserResponse   *message,
                       ProtobufCBuffer     *buffer);
 StubDispenserResponse *
-       stub__dispenser_response__unpack
+       stub_dispenser_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__dispenser_response__free_unpacked
+void   stub_dispenser_response__free_unpacked
                      (StubDispenserResponse *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -81,9 +81,9 @@ typedef void (*StubDispenserResponse_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__dispenser_response__descriptor;
+extern const ProtobufCMessageDescriptor stub_dispenser_response__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fDispenserResponse_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubDispenserResponse_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOInputSetupRequest.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOInputSetupRequest.pb-c.c
new file mode 100644
index 000000000..9ea597eeb
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOInputSetupRequest.pb-c.c
@@ -0,0 +1,131 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: StubGPIOInputSetupRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "StubGPIOInputSetupRequest.pb-c.h"
+void   stub_gpioinput_setup_request__init
+                     (StubGPIOInputSetupRequest         *message)
+{
+  static const StubGPIOInputSetupRequest init_value = STUB_GPIOINPUT_SETUP_REQUEST__INIT;
+  *message = init_value;
+}
+size_t stub_gpioinput_setup_request__get_packed_size
+                     (const StubGPIOInputSetupRequest *message)
+{
+  assert(message->base.descriptor == &stub_gpioinput_setup_request__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t stub_gpioinput_setup_request__pack
+                     (const StubGPIOInputSetupRequest *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &stub_gpioinput_setup_request__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t stub_gpioinput_setup_request__pack_to_buffer
+                     (const StubGPIOInputSetupRequest *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &stub_gpioinput_setup_request__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+StubGPIOInputSetupRequest *
+       stub_gpioinput_setup_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (StubGPIOInputSetupRequest *)
+     protobuf_c_message_unpack (&stub_gpioinput_setup_request__descriptor,
+                                allocator, len, data);
+}
+void   stub_gpioinput_setup_request__free_unpacked
+                     (StubGPIOInputSetupRequest *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &stub_gpioinput_setup_request__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor stub_gpioinput_setup_request__field_descriptors[4] =
+{
+  {
+    "PortId",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_STRING,
+    0,   /* quantifier_offset */
+    offsetof(StubGPIOInputSetupRequest, portid),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "PinId",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(StubGPIOInputSetupRequest, has_pinid),
+    offsetof(StubGPIOInputSetupRequest, pinid),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "SetInput",
+    3,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(StubGPIOInputSetupRequest, has_setinput),
+    offsetof(StubGPIOInputSetupRequest, setinput),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "SetPullUP",
+    4,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(StubGPIOInputSetupRequest, has_setpullup),
+    offsetof(StubGPIOInputSetupRequest, setpullup),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned stub_gpioinput_setup_request__field_indices_by_name[] = {
+  1,   /* field[1] = PinId */
+  0,   /* field[0] = PortId */
+  2,   /* field[2] = SetInput */
+  3,   /* field[3] = SetPullUP */
+};
+static const ProtobufCIntRange stub_gpioinput_setup_request__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 4 }
+};
+const ProtobufCMessageDescriptor stub_gpioinput_setup_request__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "StubGPIOInputSetupRequest",
+  "StubGPIOInputSetupRequest",
+  "StubGPIOInputSetupRequest",
+  "",
+  sizeof(StubGPIOInputSetupRequest),
+  4,
+  stub_gpioinput_setup_request__field_descriptors,
+  stub_gpioinput_setup_request__field_indices_by_name,
+  1,  stub_gpioinput_setup_request__number_ranges,
+  (ProtobufCMessageInit) stub_gpioinput_setup_request__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOInputSetupRequest.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOInputSetupRequest.pb-c.h
new file mode 100644
index 000000000..3e515a650
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOInputSetupRequest.pb-c.h
@@ -0,0 +1,89 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: StubGPIOInputSetupRequest.proto */
+
+#ifndef PROTOBUF_C_StubGPIOInputSetupRequest_2eproto__INCLUDED
+#define PROTOBUF_C_StubGPIOInputSetupRequest_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
+#endif
+
+
+typedef struct _StubGPIOInputSetupRequest StubGPIOInputSetupRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _StubGPIOInputSetupRequest
+{
+  ProtobufCMessage base;
+  /*
+   * A..
+   */
+  char *portid;
+  /*
+   * 0..7
+   */
+  protobuf_c_boolean has_pinid;
+  uint32_t pinid;
+  /*
+   * 0 - Set OUTPUT, 1 - Set INPUT,
+   */
+  protobuf_c_boolean has_setinput;
+  uint32_t setinput;
+  /*
+   *0 - Down, 1 - Up
+   */
+  protobuf_c_boolean has_setpullup;
+  uint32_t setpullup;
+};
+#define STUB_GPIOINPUT_SETUP_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_gpioinput_setup_request__descriptor) \
+    , NULL, 0, 0, 0, 0, 0, 0 }
+
+
+/* StubGPIOInputSetupRequest methods */
+void   stub_gpioinput_setup_request__init
+                     (StubGPIOInputSetupRequest         *message);
+size_t stub_gpioinput_setup_request__get_packed_size
+                     (const StubGPIOInputSetupRequest   *message);
+size_t stub_gpioinput_setup_request__pack
+                     (const StubGPIOInputSetupRequest   *message,
+                      uint8_t             *out);
+size_t stub_gpioinput_setup_request__pack_to_buffer
+                     (const StubGPIOInputSetupRequest   *message,
+                      ProtobufCBuffer     *buffer);
+StubGPIOInputSetupRequest *
+       stub_gpioinput_setup_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   stub_gpioinput_setup_request__free_unpacked
+                     (StubGPIOInputSetupRequest *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*StubGPIOInputSetupRequest_Closure)
+                 (const StubGPIOInputSetupRequest *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor stub_gpioinput_setup_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_StubGPIOInputSetupRequest_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOInputSetupResponse.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOInputSetupResponse.pb-c.c
new file mode 100644
index 000000000..d9d10ab20
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOInputSetupResponse.pb-c.c
@@ -0,0 +1,118 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: StubGPIOInputSetupResponse.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "StubGPIOInputSetupResponse.pb-c.h"
+void   stub_gpioinput_setup_response__init
+                     (StubGPIOInputSetupResponse         *message)
+{
+  static const StubGPIOInputSetupResponse init_value = STUB_GPIOINPUT_SETUP_RESPONSE__INIT;
+  *message = init_value;
+}
+size_t stub_gpioinput_setup_response__get_packed_size
+                     (const StubGPIOInputSetupResponse *message)
+{
+  assert(message->base.descriptor == &stub_gpioinput_setup_response__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t stub_gpioinput_setup_response__pack
+                     (const StubGPIOInputSetupResponse *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &stub_gpioinput_setup_response__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t stub_gpioinput_setup_response__pack_to_buffer
+                     (const StubGPIOInputSetupResponse *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &stub_gpioinput_setup_response__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+StubGPIOInputSetupResponse *
+       stub_gpioinput_setup_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (StubGPIOInputSetupResponse *)
+     protobuf_c_message_unpack (&stub_gpioinput_setup_response__descriptor,
+                                allocator, len, data);
+}
+void   stub_gpioinput_setup_response__free_unpacked
+                     (StubGPIOInputSetupResponse *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &stub_gpioinput_setup_response__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor stub_gpioinput_setup_response__field_descriptors[3] =
+{
+  {
+    "PortId",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_STRING,
+    0,   /* quantifier_offset */
+    offsetof(StubGPIOInputSetupResponse, portid),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "PinId",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(StubGPIOInputSetupResponse, has_pinid),
+    offsetof(StubGPIOInputSetupResponse, pinid),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Status",
+    3,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(StubGPIOInputSetupResponse, has_status),
+    offsetof(StubGPIOInputSetupResponse, status),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned stub_gpioinput_setup_response__field_indices_by_name[] = {
+  1,   /* field[1] = PinId */
+  0,   /* field[0] = PortId */
+  2,   /* field[2] = Status */
+};
+static const ProtobufCIntRange stub_gpioinput_setup_response__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 3 }
+};
+const ProtobufCMessageDescriptor stub_gpioinput_setup_response__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "StubGPIOInputSetupResponse",
+  "StubGPIOInputSetupResponse",
+  "StubGPIOInputSetupResponse",
+  "",
+  sizeof(StubGPIOInputSetupResponse),
+  3,
+  stub_gpioinput_setup_response__field_descriptors,
+  stub_gpioinput_setup_response__field_indices_by_name,
+  1,  stub_gpioinput_setup_response__number_ranges,
+  (ProtobufCMessageInit) stub_gpioinput_setup_response__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOInputSetupResponse.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOInputSetupResponse.pb-c.h
new file mode 100644
index 000000000..c0c18fa8c
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOInputSetupResponse.pb-c.h
@@ -0,0 +1,84 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: StubGPIOInputSetupResponse.proto */
+
+#ifndef PROTOBUF_C_StubGPIOInputSetupResponse_2eproto__INCLUDED
+#define PROTOBUF_C_StubGPIOInputSetupResponse_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
+#endif
+
+
+typedef struct _StubGPIOInputSetupResponse StubGPIOInputSetupResponse;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _StubGPIOInputSetupResponse
+{
+  ProtobufCMessage base;
+  /*
+   * A..
+   */
+  char *portid;
+  /*
+   * 0..7
+   */
+  protobuf_c_boolean has_pinid;
+  uint32_t pinid;
+  /*
+   * 0-OK 1-Failed
+   */
+  protobuf_c_boolean has_status;
+  uint32_t status;
+};
+#define STUB_GPIOINPUT_SETUP_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_gpioinput_setup_response__descriptor) \
+    , NULL, 0, 0, 0, 0 }
+
+
+/* StubGPIOInputSetupResponse methods */
+void   stub_gpioinput_setup_response__init
+                     (StubGPIOInputSetupResponse         *message);
+size_t stub_gpioinput_setup_response__get_packed_size
+                     (const StubGPIOInputSetupResponse   *message);
+size_t stub_gpioinput_setup_response__pack
+                     (const StubGPIOInputSetupResponse   *message,
+                      uint8_t             *out);
+size_t stub_gpioinput_setup_response__pack_to_buffer
+                     (const StubGPIOInputSetupResponse   *message,
+                      ProtobufCBuffer     *buffer);
+StubGPIOInputSetupResponse *
+       stub_gpioinput_setup_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   stub_gpioinput_setup_response__free_unpacked
+                     (StubGPIOInputSetupResponse *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*StubGPIOInputSetupResponse_Closure)
+                 (const StubGPIOInputSetupResponse *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor stub_gpioinput_setup_response__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_StubGPIOInputSetupResponse_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOReadBitRequest.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOReadBitRequest.pb-c.c
new file mode 100644
index 000000000..68826631e
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOReadBitRequest.pb-c.c
@@ -0,0 +1,131 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: StubGPIOReadBitRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "StubGPIOReadBitRequest.pb-c.h"
+void   stub_gpioread_bit_request__init
+                     (StubGPIOReadBitRequest         *message)
+{
+  static const StubGPIOReadBitRequest init_value = STUB_GPIOREAD_BIT_REQUEST__INIT;
+  *message = init_value;
+}
+size_t stub_gpioread_bit_request__get_packed_size
+                     (const StubGPIOReadBitRequest *message)
+{
+  assert(message->base.descriptor == &stub_gpioread_bit_request__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t stub_gpioread_bit_request__pack
+                     (const StubGPIOReadBitRequest *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &stub_gpioread_bit_request__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t stub_gpioread_bit_request__pack_to_buffer
+                     (const StubGPIOReadBitRequest *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &stub_gpioread_bit_request__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+StubGPIOReadBitRequest *
+       stub_gpioread_bit_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (StubGPIOReadBitRequest *)
+     protobuf_c_message_unpack (&stub_gpioread_bit_request__descriptor,
+                                allocator, len, data);
+}
+void   stub_gpioread_bit_request__free_unpacked
+                     (StubGPIOReadBitRequest *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &stub_gpioread_bit_request__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor stub_gpioread_bit_request__field_descriptors[4] =
+{
+  {
+    "PortId",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_STRING,
+    0,   /* quantifier_offset */
+    offsetof(StubGPIOReadBitRequest, portid),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "PinId",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(StubGPIOReadBitRequest, has_pinid),
+    offsetof(StubGPIOReadBitRequest, pinid),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Polling",
+    3,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(StubGPIOReadBitRequest, has_polling),
+    offsetof(StubGPIOReadBitRequest, polling),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "PollExpValue",
+    4,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(StubGPIOReadBitRequest, has_pollexpvalue),
+    offsetof(StubGPIOReadBitRequest, pollexpvalue),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned stub_gpioread_bit_request__field_indices_by_name[] = {
+  1,   /* field[1] = PinId */
+  3,   /* field[3] = PollExpValue */
+  2,   /* field[2] = Polling */
+  0,   /* field[0] = PortId */
+};
+static const ProtobufCIntRange stub_gpioread_bit_request__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 4 }
+};
+const ProtobufCMessageDescriptor stub_gpioread_bit_request__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "StubGPIOReadBitRequest",
+  "StubGPIOReadBitRequest",
+  "StubGPIOReadBitRequest",
+  "",
+  sizeof(StubGPIOReadBitRequest),
+  4,
+  stub_gpioread_bit_request__field_descriptors,
+  stub_gpioread_bit_request__field_indices_by_name,
+  1,  stub_gpioread_bit_request__number_ranges,
+  (ProtobufCMessageInit) stub_gpioread_bit_request__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOReadBitRequest.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOReadBitRequest.pb-c.h
index df5b795a7..263fb539e 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOReadBitRequest.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOReadBitRequest.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_GPIOReadBitRequest.proto */
+/* Generated from: StubGPIOReadBitRequest.proto */
 
-#ifndef PROTOBUF_C_Stub_5fGPIOReadBitRequest_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fGPIOReadBitRequest_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubGPIOReadBitRequest_2eproto__INCLUDED
+#define PROTOBUF_C_StubGPIOReadBitRequest_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -27,38 +27,47 @@ struct  _StubGPIOReadBitRequest
 {
   ProtobufCMessage base;
   /*
-   * 0..119
+   * A..
    */
-  protobuf_c_boolean has_portid;
-  uint32_t portid;
+  char *portid;
   /*
    * 0..7
    */
   protobuf_c_boolean has_pinid;
   uint32_t pinid;
+  /*
+   * 1 - Polling
+   */
+  protobuf_c_boolean has_polling;
+  protobuf_c_boolean polling;
+  /*
+   * 0/1
+   */
+  protobuf_c_boolean has_pollexpvalue;
+  protobuf_c_boolean pollexpvalue;
 };
-#define STUB__GPIOREAD_BIT_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__gpioread_bit_request__descriptor) \
-    , 0, 0, 0, 0 }
+#define STUB_GPIOREAD_BIT_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_gpioread_bit_request__descriptor) \
+    , NULL, 0, 0, 0, 0, 0, 0 }
 
 
 /* StubGPIOReadBitRequest methods */
-void   stub__gpioread_bit_request__init
+void   stub_gpioread_bit_request__init
                      (StubGPIOReadBitRequest         *message);
-size_t stub__gpioread_bit_request__get_packed_size
+size_t stub_gpioread_bit_request__get_packed_size
                      (const StubGPIOReadBitRequest   *message);
-size_t stub__gpioread_bit_request__pack
+size_t stub_gpioread_bit_request__pack
                      (const StubGPIOReadBitRequest   *message,
                       uint8_t             *out);
-size_t stub__gpioread_bit_request__pack_to_buffer
+size_t stub_gpioread_bit_request__pack_to_buffer
                      (const StubGPIOReadBitRequest   *message,
                       ProtobufCBuffer     *buffer);
 StubGPIOReadBitRequest *
-       stub__gpioread_bit_request__unpack
+       stub_gpioread_bit_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__gpioread_bit_request__free_unpacked
+void   stub_gpioread_bit_request__free_unpacked
                      (StubGPIOReadBitRequest *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -72,9 +81,9 @@ typedef void (*StubGPIOReadBitRequest_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__gpioread_bit_request__descriptor;
+extern const ProtobufCMessageDescriptor stub_gpioread_bit_request__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fGPIOReadBitRequest_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubGPIOReadBitRequest_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOReadBitResponse.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOReadBitResponse.pb-c.c
index 5f20857a3..95720a650 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOReadBitResponse.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOReadBitResponse.pb-c.c
@@ -1,65 +1,65 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_GPIOReadBitResponse.proto */
+/* Generated from: StubGPIOReadBitResponse.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_GPIOReadBitResponse.pb-c.h"
-void   stub__gpioread_bit_response__init
+#include "StubGPIOReadBitResponse.pb-c.h"
+void   stub_gpioread_bit_response__init
                      (StubGPIOReadBitResponse         *message)
 {
-  static const StubGPIOReadBitResponse init_value = STUB__GPIOREAD_BIT_RESPONSE__INIT;
+  static const StubGPIOReadBitResponse init_value = STUB_GPIOREAD_BIT_RESPONSE__INIT;
   *message = init_value;
 }
-size_t stub__gpioread_bit_response__get_packed_size
+size_t stub_gpioread_bit_response__get_packed_size
                      (const StubGPIOReadBitResponse *message)
 {
-  assert(message->base.descriptor == &stub__gpioread_bit_response__descriptor);
+  assert(message->base.descriptor == &stub_gpioread_bit_response__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__gpioread_bit_response__pack
+size_t stub_gpioread_bit_response__pack
                      (const StubGPIOReadBitResponse *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__gpioread_bit_response__descriptor);
+  assert(message->base.descriptor == &stub_gpioread_bit_response__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__gpioread_bit_response__pack_to_buffer
+size_t stub_gpioread_bit_response__pack_to_buffer
                      (const StubGPIOReadBitResponse *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__gpioread_bit_response__descriptor);
+  assert(message->base.descriptor == &stub_gpioread_bit_response__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubGPIOReadBitResponse *
-       stub__gpioread_bit_response__unpack
+       stub_gpioread_bit_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubGPIOReadBitResponse *)
-     protobuf_c_message_unpack (&stub__gpioread_bit_response__descriptor,
+     protobuf_c_message_unpack (&stub_gpioread_bit_response__descriptor,
                                 allocator, len, data);
 }
-void   stub__gpioread_bit_response__free_unpacked
+void   stub_gpioread_bit_response__free_unpacked
                      (StubGPIOReadBitResponse *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__gpioread_bit_response__descriptor);
+  assert(message->base.descriptor == &stub_gpioread_bit_response__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__gpioread_bit_response__field_descriptors[4] =
+static const ProtobufCFieldDescriptor stub_gpioread_bit_response__field_descriptors[4] =
 {
   {
     "PortId",
     1,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(StubGPIOReadBitResponse, has_portid),
+    PROTOBUF_C_TYPE_STRING,
+    0,   /* quantifier_offset */
     offsetof(StubGPIOReadBitResponse, portid),
     NULL,
     NULL,
@@ -94,7 +94,7 @@ static const ProtobufCFieldDescriptor stub__gpioread_bit_response__field_descrip
     "Status",
     4,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_BOOL,
+    PROTOBUF_C_TYPE_UINT32,
     offsetof(StubGPIOReadBitResponse, has_status),
     offsetof(StubGPIOReadBitResponse, status),
     NULL,
@@ -103,29 +103,29 @@ static const ProtobufCFieldDescriptor stub__gpioread_bit_response__field_descrip
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__gpioread_bit_response__field_indices_by_name[] = {
+static const unsigned stub_gpioread_bit_response__field_indices_by_name[] = {
   2,   /* field[2] = BitValue */
   1,   /* field[1] = PinId */
   0,   /* field[0] = PortId */
   3,   /* field[3] = Status */
 };
-static const ProtobufCIntRange stub__gpioread_bit_response__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_gpioread_bit_response__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 4 }
 };
-const ProtobufCMessageDescriptor stub__gpioread_bit_response__descriptor =
+const ProtobufCMessageDescriptor stub_gpioread_bit_response__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_GPIOReadBitResponse",
+  "StubGPIOReadBitResponse",
   "StubGPIOReadBitResponse",
   "StubGPIOReadBitResponse",
   "",
   sizeof(StubGPIOReadBitResponse),
   4,
-  stub__gpioread_bit_response__field_descriptors,
-  stub__gpioread_bit_response__field_indices_by_name,
-  1,  stub__gpioread_bit_response__number_ranges,
-  (ProtobufCMessageInit) stub__gpioread_bit_response__init,
+  stub_gpioread_bit_response__field_descriptors,
+  stub_gpioread_bit_response__field_indices_by_name,
+  1,  stub_gpioread_bit_response__number_ranges,
+  (ProtobufCMessageInit) stub_gpioread_bit_response__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOReadBitResponse.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOReadBitResponse.pb-c.h
index 3d7839939..09a7ea261 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOReadBitResponse.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOReadBitResponse.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_GPIOReadBitResponse.proto */
+/* Generated from: StubGPIOReadBitResponse.proto */
 
-#ifndef PROTOBUF_C_Stub_5fGPIOReadBitResponse_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fGPIOReadBitResponse_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubGPIOReadBitResponse_2eproto__INCLUDED
+#define PROTOBUF_C_StubGPIOReadBitResponse_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -27,10 +27,9 @@ struct  _StubGPIOReadBitResponse
 {
   ProtobufCMessage base;
   /*
-   * 0..119
+   * A..
    */
-  protobuf_c_boolean has_portid;
-  uint32_t portid;
+  char *portid;
   /*
    * 0..7
    */
@@ -42,30 +41,30 @@ struct  _StubGPIOReadBitResponse
    * 0-OK 1-Failed
    */
   protobuf_c_boolean has_status;
-  protobuf_c_boolean status;
+  uint32_t status;
 };
-#define STUB__GPIOREAD_BIT_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__gpioread_bit_response__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, 0 }
+#define STUB_GPIOREAD_BIT_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_gpioread_bit_response__descriptor) \
+    , NULL, 0, 0, 0, 0, 0, 0 }
 
 
 /* StubGPIOReadBitResponse methods */
-void   stub__gpioread_bit_response__init
+void   stub_gpioread_bit_response__init
                      (StubGPIOReadBitResponse         *message);
-size_t stub__gpioread_bit_response__get_packed_size
+size_t stub_gpioread_bit_response__get_packed_size
                      (const StubGPIOReadBitResponse   *message);
-size_t stub__gpioread_bit_response__pack
+size_t stub_gpioread_bit_response__pack
                      (const StubGPIOReadBitResponse   *message,
                       uint8_t             *out);
-size_t stub__gpioread_bit_response__pack_to_buffer
+size_t stub_gpioread_bit_response__pack_to_buffer
                      (const StubGPIOReadBitResponse   *message,
                       ProtobufCBuffer     *buffer);
 StubGPIOReadBitResponse *
-       stub__gpioread_bit_response__unpack
+       stub_gpioread_bit_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__gpioread_bit_response__free_unpacked
+void   stub_gpioread_bit_response__free_unpacked
                      (StubGPIOReadBitResponse *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -79,9 +78,9 @@ typedef void (*StubGPIOReadBitResponse_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__gpioread_bit_response__descriptor;
+extern const ProtobufCMessageDescriptor stub_gpioread_bit_response__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fGPIOReadBitResponse_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubGPIOReadBitResponse_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOReadByteRequest.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOReadByteRequest.pb-c.c
index 3d9818383..6707d7a6f 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOReadByteRequest.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOReadByteRequest.pb-c.c
@@ -1,65 +1,65 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_GPIOReadByteRequest.proto */
+/* Generated from: StubGPIOReadByteRequest.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_GPIOReadByteRequest.pb-c.h"
-void   stub__gpioread_byte_request__init
+#include "StubGPIOReadByteRequest.pb-c.h"
+void   stub_gpioread_byte_request__init
                      (StubGPIOReadByteRequest         *message)
 {
-  static const StubGPIOReadByteRequest init_value = STUB__GPIOREAD_BYTE_REQUEST__INIT;
+  static const StubGPIOReadByteRequest init_value = STUB_GPIOREAD_BYTE_REQUEST__INIT;
   *message = init_value;
 }
-size_t stub__gpioread_byte_request__get_packed_size
+size_t stub_gpioread_byte_request__get_packed_size
                      (const StubGPIOReadByteRequest *message)
 {
-  assert(message->base.descriptor == &stub__gpioread_byte_request__descriptor);
+  assert(message->base.descriptor == &stub_gpioread_byte_request__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__gpioread_byte_request__pack
+size_t stub_gpioread_byte_request__pack
                      (const StubGPIOReadByteRequest *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__gpioread_byte_request__descriptor);
+  assert(message->base.descriptor == &stub_gpioread_byte_request__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__gpioread_byte_request__pack_to_buffer
+size_t stub_gpioread_byte_request__pack_to_buffer
                      (const StubGPIOReadByteRequest *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__gpioread_byte_request__descriptor);
+  assert(message->base.descriptor == &stub_gpioread_byte_request__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubGPIOReadByteRequest *
-       stub__gpioread_byte_request__unpack
+       stub_gpioread_byte_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubGPIOReadByteRequest *)
-     protobuf_c_message_unpack (&stub__gpioread_byte_request__descriptor,
+     protobuf_c_message_unpack (&stub_gpioread_byte_request__descriptor,
                                 allocator, len, data);
 }
-void   stub__gpioread_byte_request__free_unpacked
+void   stub_gpioread_byte_request__free_unpacked
                      (StubGPIOReadByteRequest *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__gpioread_byte_request__descriptor);
+  assert(message->base.descriptor == &stub_gpioread_byte_request__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__gpioread_byte_request__field_descriptors[1] =
+static const ProtobufCFieldDescriptor stub_gpioread_byte_request__field_descriptors[1] =
 {
   {
     "PortId",
     1,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(StubGPIOReadByteRequest, has_portid),
+    PROTOBUF_C_TYPE_STRING,
+    0,   /* quantifier_offset */
     offsetof(StubGPIOReadByteRequest, portid),
     NULL,
     NULL,
@@ -67,26 +67,26 @@ static const ProtobufCFieldDescriptor stub__gpioread_byte_request__field_descrip
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__gpioread_byte_request__field_indices_by_name[] = {
+static const unsigned stub_gpioread_byte_request__field_indices_by_name[] = {
   0,   /* field[0] = PortId */
 };
-static const ProtobufCIntRange stub__gpioread_byte_request__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_gpioread_byte_request__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 1 }
 };
-const ProtobufCMessageDescriptor stub__gpioread_byte_request__descriptor =
+const ProtobufCMessageDescriptor stub_gpioread_byte_request__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_GPIOReadByteRequest",
+  "StubGPIOReadByteRequest",
   "StubGPIOReadByteRequest",
   "StubGPIOReadByteRequest",
   "",
   sizeof(StubGPIOReadByteRequest),
   1,
-  stub__gpioread_byte_request__field_descriptors,
-  stub__gpioread_byte_request__field_indices_by_name,
-  1,  stub__gpioread_byte_request__number_ranges,
-  (ProtobufCMessageInit) stub__gpioread_byte_request__init,
+  stub_gpioread_byte_request__field_descriptors,
+  stub_gpioread_byte_request__field_indices_by_name,
+  1,  stub_gpioread_byte_request__number_ranges,
+  (ProtobufCMessageInit) stub_gpioread_byte_request__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOReadByteRequest.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOReadByteRequest.pb-c.h
index 8537440ab..53e49de7f 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOReadByteRequest.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOReadByteRequest.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_GPIOReadByteRequest.proto */
+/* Generated from: StubGPIOReadByteRequest.proto */
 
-#ifndef PROTOBUF_C_Stub_5fGPIOReadByteRequest_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fGPIOReadByteRequest_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubGPIOReadByteRequest_2eproto__INCLUDED
+#define PROTOBUF_C_StubGPIOReadByteRequest_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -27,33 +27,32 @@ struct  _StubGPIOReadByteRequest
 {
   ProtobufCMessage base;
   /*
-   * 0..119
+   * A..
    */
-  protobuf_c_boolean has_portid;
-  uint32_t portid;
+  char *portid;
 };
-#define STUB__GPIOREAD_BYTE_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__gpioread_byte_request__descriptor) \
-    , 0, 0 }
+#define STUB_GPIOREAD_BYTE_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_gpioread_byte_request__descriptor) \
+    , NULL }
 
 
 /* StubGPIOReadByteRequest methods */
-void   stub__gpioread_byte_request__init
+void   stub_gpioread_byte_request__init
                      (StubGPIOReadByteRequest         *message);
-size_t stub__gpioread_byte_request__get_packed_size
+size_t stub_gpioread_byte_request__get_packed_size
                      (const StubGPIOReadByteRequest   *message);
-size_t stub__gpioread_byte_request__pack
+size_t stub_gpioread_byte_request__pack
                      (const StubGPIOReadByteRequest   *message,
                       uint8_t             *out);
-size_t stub__gpioread_byte_request__pack_to_buffer
+size_t stub_gpioread_byte_request__pack_to_buffer
                      (const StubGPIOReadByteRequest   *message,
                       ProtobufCBuffer     *buffer);
 StubGPIOReadByteRequest *
-       stub__gpioread_byte_request__unpack
+       stub_gpioread_byte_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__gpioread_byte_request__free_unpacked
+void   stub_gpioread_byte_request__free_unpacked
                      (StubGPIOReadByteRequest *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -67,9 +66,9 @@ typedef void (*StubGPIOReadByteRequest_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__gpioread_byte_request__descriptor;
+extern const ProtobufCMessageDescriptor stub_gpioread_byte_request__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fGPIOReadByteRequest_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubGPIOReadByteRequest_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOReadByteResponse.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOReadByteResponse.pb-c.c
index 34fb3bfd0..a6ca419de 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOReadByteResponse.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOReadByteResponse.pb-c.c
@@ -1,65 +1,65 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_GPIOReadByteResponse.proto */
+/* Generated from: StubGPIOReadByteResponse.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_GPIOReadByteResponse.pb-c.h"
-void   stub__gpioread_byte_response__init
+#include "StubGPIOReadByteResponse.pb-c.h"
+void   stub_gpioread_byte_response__init
                      (StubGPIOReadByteResponse         *message)
 {
-  static const StubGPIOReadByteResponse init_value = STUB__GPIOREAD_BYTE_RESPONSE__INIT;
+  static const StubGPIOReadByteResponse init_value = STUB_GPIOREAD_BYTE_RESPONSE__INIT;
   *message = init_value;
 }
-size_t stub__gpioread_byte_response__get_packed_size
+size_t stub_gpioread_byte_response__get_packed_size
                      (const StubGPIOReadByteResponse *message)
 {
-  assert(message->base.descriptor == &stub__gpioread_byte_response__descriptor);
+  assert(message->base.descriptor == &stub_gpioread_byte_response__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__gpioread_byte_response__pack
+size_t stub_gpioread_byte_response__pack
                      (const StubGPIOReadByteResponse *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__gpioread_byte_response__descriptor);
+  assert(message->base.descriptor == &stub_gpioread_byte_response__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__gpioread_byte_response__pack_to_buffer
+size_t stub_gpioread_byte_response__pack_to_buffer
                      (const StubGPIOReadByteResponse *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__gpioread_byte_response__descriptor);
+  assert(message->base.descriptor == &stub_gpioread_byte_response__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubGPIOReadByteResponse *
-       stub__gpioread_byte_response__unpack
+       stub_gpioread_byte_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubGPIOReadByteResponse *)
-     protobuf_c_message_unpack (&stub__gpioread_byte_response__descriptor,
+     protobuf_c_message_unpack (&stub_gpioread_byte_response__descriptor,
                                 allocator, len, data);
 }
-void   stub__gpioread_byte_response__free_unpacked
+void   stub_gpioread_byte_response__free_unpacked
                      (StubGPIOReadByteResponse *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__gpioread_byte_response__descriptor);
+  assert(message->base.descriptor == &stub_gpioread_byte_response__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__gpioread_byte_response__field_descriptors[3] =
+static const ProtobufCFieldDescriptor stub_gpioread_byte_response__field_descriptors[3] =
 {
   {
     "PortId",
     1,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(StubGPIOReadByteResponse, has_portid),
+    PROTOBUF_C_TYPE_STRING,
+    0,   /* quantifier_offset */
     offsetof(StubGPIOReadByteResponse, portid),
     NULL,
     NULL,
@@ -82,7 +82,7 @@ static const ProtobufCFieldDescriptor stub__gpioread_byte_response__field_descri
     "status",
     3,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_BOOL,
+    PROTOBUF_C_TYPE_UINT32,
     offsetof(StubGPIOReadByteResponse, has_status),
     offsetof(StubGPIOReadByteResponse, status),
     NULL,
@@ -91,28 +91,28 @@ static const ProtobufCFieldDescriptor stub__gpioread_byte_response__field_descri
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__gpioread_byte_response__field_indices_by_name[] = {
+static const unsigned stub_gpioread_byte_response__field_indices_by_name[] = {
   1,   /* field[1] = ByteValue */
   0,   /* field[0] = PortId */
   2,   /* field[2] = status */
 };
-static const ProtobufCIntRange stub__gpioread_byte_response__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_gpioread_byte_response__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 3 }
 };
-const ProtobufCMessageDescriptor stub__gpioread_byte_response__descriptor =
+const ProtobufCMessageDescriptor stub_gpioread_byte_response__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_GPIOReadByteResponse",
+  "StubGPIOReadByteResponse",
   "StubGPIOReadByteResponse",
   "StubGPIOReadByteResponse",
   "",
   sizeof(StubGPIOReadByteResponse),
   3,
-  stub__gpioread_byte_response__field_descriptors,
-  stub__gpioread_byte_response__field_indices_by_name,
-  1,  stub__gpioread_byte_response__number_ranges,
-  (ProtobufCMessageInit) stub__gpioread_byte_response__init,
+  stub_gpioread_byte_response__field_descriptors,
+  stub_gpioread_byte_response__field_indices_by_name,
+  1,  stub_gpioread_byte_response__number_ranges,
+  (ProtobufCMessageInit) stub_gpioread_byte_response__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOReadByteResponse.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOReadByteResponse.pb-c.h
index 93f82f2eb..a1a8fe399 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOReadByteResponse.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOReadByteResponse.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_GPIOReadByteResponse.proto */
+/* Generated from: StubGPIOReadByteResponse.proto */
 
-#ifndef PROTOBUF_C_Stub_5fGPIOReadByteResponse_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fGPIOReadByteResponse_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubGPIOReadByteResponse_2eproto__INCLUDED
+#define PROTOBUF_C_StubGPIOReadByteResponse_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -27,40 +27,39 @@ struct  _StubGPIOReadByteResponse
 {
   ProtobufCMessage base;
   /*
-   * 0..119
+   * A..
    */
-  protobuf_c_boolean has_portid;
-  uint32_t portid;
+  char *portid;
   protobuf_c_boolean has_bytevalue;
   uint32_t bytevalue;
   /*
    * 0-OK 1-Failed
    */
   protobuf_c_boolean has_status;
-  protobuf_c_boolean status;
+  uint32_t status;
 };
-#define STUB__GPIOREAD_BYTE_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__gpioread_byte_response__descriptor) \
-    , 0, 0, 0, 0, 0, 0 }
+#define STUB_GPIOREAD_BYTE_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_gpioread_byte_response__descriptor) \
+    , NULL, 0, 0, 0, 0 }
 
 
 /* StubGPIOReadByteResponse methods */
-void   stub__gpioread_byte_response__init
+void   stub_gpioread_byte_response__init
                      (StubGPIOReadByteResponse         *message);
-size_t stub__gpioread_byte_response__get_packed_size
+size_t stub_gpioread_byte_response__get_packed_size
                      (const StubGPIOReadByteResponse   *message);
-size_t stub__gpioread_byte_response__pack
+size_t stub_gpioread_byte_response__pack
                      (const StubGPIOReadByteResponse   *message,
                       uint8_t             *out);
-size_t stub__gpioread_byte_response__pack_to_buffer
+size_t stub_gpioread_byte_response__pack_to_buffer
                      (const StubGPIOReadByteResponse   *message,
                       ProtobufCBuffer     *buffer);
 StubGPIOReadByteResponse *
-       stub__gpioread_byte_response__unpack
+       stub_gpioread_byte_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__gpioread_byte_response__free_unpacked
+void   stub_gpioread_byte_response__free_unpacked
                      (StubGPIOReadByteResponse *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -74,9 +73,9 @@ typedef void (*StubGPIOReadByteResponse_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__gpioread_byte_response__descriptor;
+extern const ProtobufCMessageDescriptor stub_gpioread_byte_response__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fGPIOReadByteResponse_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubGPIOReadByteResponse_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOWriteBitRequest.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOWriteBitRequest.pb-c.c
index e0050a153..0e8670609 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOWriteBitRequest.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOWriteBitRequest.pb-c.c
@@ -1,65 +1,65 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_GPIOWriteBitRequest.proto */
+/* Generated from: StubGPIOWriteBitRequest.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_GPIOWriteBitRequest.pb-c.h"
-void   stub__gpiowrite_bit_request__init
+#include "StubGPIOWriteBitRequest.pb-c.h"
+void   stub_gpiowrite_bit_request__init
                      (StubGPIOWriteBitRequest         *message)
 {
-  static const StubGPIOWriteBitRequest init_value = STUB__GPIOWRITE_BIT_REQUEST__INIT;
+  static const StubGPIOWriteBitRequest init_value = STUB_GPIOWRITE_BIT_REQUEST__INIT;
   *message = init_value;
 }
-size_t stub__gpiowrite_bit_request__get_packed_size
+size_t stub_gpiowrite_bit_request__get_packed_size
                      (const StubGPIOWriteBitRequest *message)
 {
-  assert(message->base.descriptor == &stub__gpiowrite_bit_request__descriptor);
+  assert(message->base.descriptor == &stub_gpiowrite_bit_request__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__gpiowrite_bit_request__pack
+size_t stub_gpiowrite_bit_request__pack
                      (const StubGPIOWriteBitRequest *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__gpiowrite_bit_request__descriptor);
+  assert(message->base.descriptor == &stub_gpiowrite_bit_request__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__gpiowrite_bit_request__pack_to_buffer
+size_t stub_gpiowrite_bit_request__pack_to_buffer
                      (const StubGPIOWriteBitRequest *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__gpiowrite_bit_request__descriptor);
+  assert(message->base.descriptor == &stub_gpiowrite_bit_request__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubGPIOWriteBitRequest *
-       stub__gpiowrite_bit_request__unpack
+       stub_gpiowrite_bit_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubGPIOWriteBitRequest *)
-     protobuf_c_message_unpack (&stub__gpiowrite_bit_request__descriptor,
+     protobuf_c_message_unpack (&stub_gpiowrite_bit_request__descriptor,
                                 allocator, len, data);
 }
-void   stub__gpiowrite_bit_request__free_unpacked
+void   stub_gpiowrite_bit_request__free_unpacked
                      (StubGPIOWriteBitRequest *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__gpiowrite_bit_request__descriptor);
+  assert(message->base.descriptor == &stub_gpiowrite_bit_request__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__gpiowrite_bit_request__field_descriptors[3] =
+static const ProtobufCFieldDescriptor stub_gpiowrite_bit_request__field_descriptors[3] =
 {
   {
     "PortId",
     1,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(StubGPIOWriteBitRequest, has_portid),
+    PROTOBUF_C_TYPE_STRING,
+    0,   /* quantifier_offset */
     offsetof(StubGPIOWriteBitRequest, portid),
     NULL,
     NULL,
@@ -91,28 +91,28 @@ static const ProtobufCFieldDescriptor stub__gpiowrite_bit_request__field_descrip
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__gpiowrite_bit_request__field_indices_by_name[] = {
+static const unsigned stub_gpiowrite_bit_request__field_indices_by_name[] = {
   2,   /* field[2] = BitToWrite */
   1,   /* field[1] = PinId */
   0,   /* field[0] = PortId */
 };
-static const ProtobufCIntRange stub__gpiowrite_bit_request__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_gpiowrite_bit_request__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 3 }
 };
-const ProtobufCMessageDescriptor stub__gpiowrite_bit_request__descriptor =
+const ProtobufCMessageDescriptor stub_gpiowrite_bit_request__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_GPIOWriteBitRequest",
+  "StubGPIOWriteBitRequest",
   "StubGPIOWriteBitRequest",
   "StubGPIOWriteBitRequest",
   "",
   sizeof(StubGPIOWriteBitRequest),
   3,
-  stub__gpiowrite_bit_request__field_descriptors,
-  stub__gpiowrite_bit_request__field_indices_by_name,
-  1,  stub__gpiowrite_bit_request__number_ranges,
-  (ProtobufCMessageInit) stub__gpiowrite_bit_request__init,
+  stub_gpiowrite_bit_request__field_descriptors,
+  stub_gpiowrite_bit_request__field_indices_by_name,
+  1,  stub_gpiowrite_bit_request__number_ranges,
+  (ProtobufCMessageInit) stub_gpiowrite_bit_request__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOWriteBitRequest.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOWriteBitRequest.pb-c.h
index 560cc6790..705ca7d38 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOWriteBitRequest.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOWriteBitRequest.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_GPIOWriteBitRequest.proto */
+/* Generated from: StubGPIOWriteBitRequest.proto */
 
-#ifndef PROTOBUF_C_Stub_5fGPIOWriteBitRequest_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fGPIOWriteBitRequest_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubGPIOWriteBitRequest_2eproto__INCLUDED
+#define PROTOBUF_C_StubGPIOWriteBitRequest_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -27,10 +27,9 @@ struct  _StubGPIOWriteBitRequest
 {
   ProtobufCMessage base;
   /*
-   * 0..119
+   * A..
    */
-  protobuf_c_boolean has_portid;
-  uint32_t portid;
+  char *portid;
   /*
    * 0..7
    */
@@ -39,28 +38,28 @@ struct  _StubGPIOWriteBitRequest
   protobuf_c_boolean has_bittowrite;
   protobuf_c_boolean bittowrite;
 };
-#define STUB__GPIOWRITE_BIT_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__gpiowrite_bit_request__descriptor) \
-    , 0, 0, 0, 0, 0, 0 }
+#define STUB_GPIOWRITE_BIT_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_gpiowrite_bit_request__descriptor) \
+    , NULL, 0, 0, 0, 0 }
 
 
 /* StubGPIOWriteBitRequest methods */
-void   stub__gpiowrite_bit_request__init
+void   stub_gpiowrite_bit_request__init
                      (StubGPIOWriteBitRequest         *message);
-size_t stub__gpiowrite_bit_request__get_packed_size
+size_t stub_gpiowrite_bit_request__get_packed_size
                      (const StubGPIOWriteBitRequest   *message);
-size_t stub__gpiowrite_bit_request__pack
+size_t stub_gpiowrite_bit_request__pack
                      (const StubGPIOWriteBitRequest   *message,
                       uint8_t             *out);
-size_t stub__gpiowrite_bit_request__pack_to_buffer
+size_t stub_gpiowrite_bit_request__pack_to_buffer
                      (const StubGPIOWriteBitRequest   *message,
                       ProtobufCBuffer     *buffer);
 StubGPIOWriteBitRequest *
-       stub__gpiowrite_bit_request__unpack
+       stub_gpiowrite_bit_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__gpiowrite_bit_request__free_unpacked
+void   stub_gpiowrite_bit_request__free_unpacked
                      (StubGPIOWriteBitRequest *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -74,9 +73,9 @@ typedef void (*StubGPIOWriteBitRequest_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__gpiowrite_bit_request__descriptor;
+extern const ProtobufCMessageDescriptor stub_gpiowrite_bit_request__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fGPIOWriteBitRequest_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubGPIOWriteBitRequest_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOWriteBitResponse.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOWriteBitResponse.pb-c.c
index d58950b3d..f650dff67 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOWriteBitResponse.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOWriteBitResponse.pb-c.c
@@ -1,65 +1,65 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_GPIOWriteBitResponse.proto */
+/* Generated from: StubGPIOWriteBitResponse.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_GPIOWriteBitResponse.pb-c.h"
-void   stub__gpiowrite_bit_response__init
+#include "StubGPIOWriteBitResponse.pb-c.h"
+void   stub_gpiowrite_bit_response__init
                      (StubGPIOWriteBitResponse         *message)
 {
-  static const StubGPIOWriteBitResponse init_value = STUB__GPIOWRITE_BIT_RESPONSE__INIT;
+  static const StubGPIOWriteBitResponse init_value = STUB_GPIOWRITE_BIT_RESPONSE__INIT;
   *message = init_value;
 }
-size_t stub__gpiowrite_bit_response__get_packed_size
+size_t stub_gpiowrite_bit_response__get_packed_size
                      (const StubGPIOWriteBitResponse *message)
 {
-  assert(message->base.descriptor == &stub__gpiowrite_bit_response__descriptor);
+  assert(message->base.descriptor == &stub_gpiowrite_bit_response__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__gpiowrite_bit_response__pack
+size_t stub_gpiowrite_bit_response__pack
                      (const StubGPIOWriteBitResponse *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__gpiowrite_bit_response__descriptor);
+  assert(message->base.descriptor == &stub_gpiowrite_bit_response__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__gpiowrite_bit_response__pack_to_buffer
+size_t stub_gpiowrite_bit_response__pack_to_buffer
                      (const StubGPIOWriteBitResponse *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__gpiowrite_bit_response__descriptor);
+  assert(message->base.descriptor == &stub_gpiowrite_bit_response__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubGPIOWriteBitResponse *
-       stub__gpiowrite_bit_response__unpack
+       stub_gpiowrite_bit_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubGPIOWriteBitResponse *)
-     protobuf_c_message_unpack (&stub__gpiowrite_bit_response__descriptor,
+     protobuf_c_message_unpack (&stub_gpiowrite_bit_response__descriptor,
                                 allocator, len, data);
 }
-void   stub__gpiowrite_bit_response__free_unpacked
+void   stub_gpiowrite_bit_response__free_unpacked
                      (StubGPIOWriteBitResponse *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__gpiowrite_bit_response__descriptor);
+  assert(message->base.descriptor == &stub_gpiowrite_bit_response__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__gpiowrite_bit_response__field_descriptors[3] =
+static const ProtobufCFieldDescriptor stub_gpiowrite_bit_response__field_descriptors[3] =
 {
   {
     "PortId",
     1,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(StubGPIOWriteBitResponse, has_portid),
+    PROTOBUF_C_TYPE_STRING,
+    0,   /* quantifier_offset */
     offsetof(StubGPIOWriteBitResponse, portid),
     NULL,
     NULL,
@@ -82,7 +82,7 @@ static const ProtobufCFieldDescriptor stub__gpiowrite_bit_response__field_descri
     "Status",
     3,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_BOOL,
+    PROTOBUF_C_TYPE_UINT32,
     offsetof(StubGPIOWriteBitResponse, has_status),
     offsetof(StubGPIOWriteBitResponse, status),
     NULL,
@@ -91,28 +91,28 @@ static const ProtobufCFieldDescriptor stub__gpiowrite_bit_response__field_descri
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__gpiowrite_bit_response__field_indices_by_name[] = {
+static const unsigned stub_gpiowrite_bit_response__field_indices_by_name[] = {
   1,   /* field[1] = PinId */
   0,   /* field[0] = PortId */
   2,   /* field[2] = Status */
 };
-static const ProtobufCIntRange stub__gpiowrite_bit_response__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_gpiowrite_bit_response__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 3 }
 };
-const ProtobufCMessageDescriptor stub__gpiowrite_bit_response__descriptor =
+const ProtobufCMessageDescriptor stub_gpiowrite_bit_response__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_GPIOWriteBitResponse",
+  "StubGPIOWriteBitResponse",
   "StubGPIOWriteBitResponse",
   "StubGPIOWriteBitResponse",
   "",
   sizeof(StubGPIOWriteBitResponse),
   3,
-  stub__gpiowrite_bit_response__field_descriptors,
-  stub__gpiowrite_bit_response__field_indices_by_name,
-  1,  stub__gpiowrite_bit_response__number_ranges,
-  (ProtobufCMessageInit) stub__gpiowrite_bit_response__init,
+  stub_gpiowrite_bit_response__field_descriptors,
+  stub_gpiowrite_bit_response__field_indices_by_name,
+  1,  stub_gpiowrite_bit_response__number_ranges,
+  (ProtobufCMessageInit) stub_gpiowrite_bit_response__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOWriteBitResponse.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOWriteBitResponse.pb-c.h
index d9399f891..0516ad60e 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOWriteBitResponse.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOWriteBitResponse.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_GPIOWriteBitResponse.proto */
+/* Generated from: StubGPIOWriteBitResponse.proto */
 
-#ifndef PROTOBUF_C_Stub_5fGPIOWriteBitResponse_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fGPIOWriteBitResponse_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubGPIOWriteBitResponse_2eproto__INCLUDED
+#define PROTOBUF_C_StubGPIOWriteBitResponse_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -27,10 +27,9 @@ struct  _StubGPIOWriteBitResponse
 {
   ProtobufCMessage base;
   /*
-   * 0..119
+   * A..
    */
-  protobuf_c_boolean has_portid;
-  uint32_t portid;
+  char *portid;
   /*
    * 0..7
    */
@@ -40,30 +39,30 @@ struct  _StubGPIOWriteBitResponse
    * 0-OK 1-Failed
    */
   protobuf_c_boolean has_status;
-  protobuf_c_boolean status;
+  uint32_t status;
 };
-#define STUB__GPIOWRITE_BIT_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__gpiowrite_bit_response__descriptor) \
-    , 0, 0, 0, 0, 0, 0 }
+#define STUB_GPIOWRITE_BIT_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_gpiowrite_bit_response__descriptor) \
+    , NULL, 0, 0, 0, 0 }
 
 
 /* StubGPIOWriteBitResponse methods */
-void   stub__gpiowrite_bit_response__init
+void   stub_gpiowrite_bit_response__init
                      (StubGPIOWriteBitResponse         *message);
-size_t stub__gpiowrite_bit_response__get_packed_size
+size_t stub_gpiowrite_bit_response__get_packed_size
                      (const StubGPIOWriteBitResponse   *message);
-size_t stub__gpiowrite_bit_response__pack
+size_t stub_gpiowrite_bit_response__pack
                      (const StubGPIOWriteBitResponse   *message,
                       uint8_t             *out);
-size_t stub__gpiowrite_bit_response__pack_to_buffer
+size_t stub_gpiowrite_bit_response__pack_to_buffer
                      (const StubGPIOWriteBitResponse   *message,
                       ProtobufCBuffer     *buffer);
 StubGPIOWriteBitResponse *
-       stub__gpiowrite_bit_response__unpack
+       stub_gpiowrite_bit_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__gpiowrite_bit_response__free_unpacked
+void   stub_gpiowrite_bit_response__free_unpacked
                      (StubGPIOWriteBitResponse *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -77,9 +76,9 @@ typedef void (*StubGPIOWriteBitResponse_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__gpiowrite_bit_response__descriptor;
+extern const ProtobufCMessageDescriptor stub_gpiowrite_bit_response__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fGPIOWriteBitResponse_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubGPIOWriteBitResponse_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOWriteByteRequest.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOWriteByteRequest.pb-c.c
index c73327c71..fe4fe1981 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOWriteByteRequest.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOWriteByteRequest.pb-c.c
@@ -1,65 +1,65 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_GPIOWriteByteRequest.proto */
+/* Generated from: StubGPIOWriteByteRequest.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_GPIOWriteByteRequest.pb-c.h"
-void   stub__gpiowrite_byte_request__init
+#include "StubGPIOWriteByteRequest.pb-c.h"
+void   stub_gpiowrite_byte_request__init
                      (StubGPIOWriteByteRequest         *message)
 {
-  static const StubGPIOWriteByteRequest init_value = STUB__GPIOWRITE_BYTE_REQUEST__INIT;
+  static const StubGPIOWriteByteRequest init_value = STUB_GPIOWRITE_BYTE_REQUEST__INIT;
   *message = init_value;
 }
-size_t stub__gpiowrite_byte_request__get_packed_size
+size_t stub_gpiowrite_byte_request__get_packed_size
                      (const StubGPIOWriteByteRequest *message)
 {
-  assert(message->base.descriptor == &stub__gpiowrite_byte_request__descriptor);
+  assert(message->base.descriptor == &stub_gpiowrite_byte_request__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__gpiowrite_byte_request__pack
+size_t stub_gpiowrite_byte_request__pack
                      (const StubGPIOWriteByteRequest *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__gpiowrite_byte_request__descriptor);
+  assert(message->base.descriptor == &stub_gpiowrite_byte_request__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__gpiowrite_byte_request__pack_to_buffer
+size_t stub_gpiowrite_byte_request__pack_to_buffer
                      (const StubGPIOWriteByteRequest *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__gpiowrite_byte_request__descriptor);
+  assert(message->base.descriptor == &stub_gpiowrite_byte_request__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubGPIOWriteByteRequest *
-       stub__gpiowrite_byte_request__unpack
+       stub_gpiowrite_byte_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubGPIOWriteByteRequest *)
-     protobuf_c_message_unpack (&stub__gpiowrite_byte_request__descriptor,
+     protobuf_c_message_unpack (&stub_gpiowrite_byte_request__descriptor,
                                 allocator, len, data);
 }
-void   stub__gpiowrite_byte_request__free_unpacked
+void   stub_gpiowrite_byte_request__free_unpacked
                      (StubGPIOWriteByteRequest *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__gpiowrite_byte_request__descriptor);
+  assert(message->base.descriptor == &stub_gpiowrite_byte_request__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__gpiowrite_byte_request__field_descriptors[2] =
+static const ProtobufCFieldDescriptor stub_gpiowrite_byte_request__field_descriptors[2] =
 {
   {
     "PortId",
     1,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(StubGPIOWriteByteRequest, has_portid),
+    PROTOBUF_C_TYPE_STRING,
+    0,   /* quantifier_offset */
     offsetof(StubGPIOWriteByteRequest, portid),
     NULL,
     NULL,
@@ -79,28 +79,28 @@ static const ProtobufCFieldDescriptor stub__gpiowrite_byte_request__field_descri
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__gpiowrite_byte_request__field_indices_by_name[] = {
+static const unsigned stub_gpiowrite_byte_request__field_indices_by_name[] = {
   1,   /* field[1] = DataToWrite */
   0,   /* field[0] = PortId */
 };
-static const ProtobufCIntRange stub__gpiowrite_byte_request__number_ranges[2 + 1] =
+static const ProtobufCIntRange stub_gpiowrite_byte_request__number_ranges[2 + 1] =
 {
   { 1, 0 },
   { 3, 1 },
   { 0, 2 }
 };
-const ProtobufCMessageDescriptor stub__gpiowrite_byte_request__descriptor =
+const ProtobufCMessageDescriptor stub_gpiowrite_byte_request__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_GPIOWriteByteRequest",
+  "StubGPIOWriteByteRequest",
   "StubGPIOWriteByteRequest",
   "StubGPIOWriteByteRequest",
   "",
   sizeof(StubGPIOWriteByteRequest),
   2,
-  stub__gpiowrite_byte_request__field_descriptors,
-  stub__gpiowrite_byte_request__field_indices_by_name,
-  2,  stub__gpiowrite_byte_request__number_ranges,
-  (ProtobufCMessageInit) stub__gpiowrite_byte_request__init,
+  stub_gpiowrite_byte_request__field_descriptors,
+  stub_gpiowrite_byte_request__field_indices_by_name,
+  2,  stub_gpiowrite_byte_request__number_ranges,
+  (ProtobufCMessageInit) stub_gpiowrite_byte_request__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOWriteByteRequest.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOWriteByteRequest.pb-c.h
index fc8378ba3..a69934e01 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOWriteByteRequest.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOWriteByteRequest.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_GPIOWriteByteRequest.proto */
+/* Generated from: StubGPIOWriteByteRequest.proto */
 
-#ifndef PROTOBUF_C_Stub_5fGPIOWriteByteRequest_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fGPIOWriteByteRequest_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubGPIOWriteByteRequest_2eproto__INCLUDED
+#define PROTOBUF_C_StubGPIOWriteByteRequest_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -27,35 +27,34 @@ struct  _StubGPIOWriteByteRequest
 {
   ProtobufCMessage base;
   /*
-   * 0..119
+   * A..
    */
-  protobuf_c_boolean has_portid;
-  uint32_t portid;
+  char *portid;
   protobuf_c_boolean has_datatowrite;
   uint32_t datatowrite;
 };
-#define STUB__GPIOWRITE_BYTE_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__gpiowrite_byte_request__descriptor) \
-    , 0, 0, 0, 0 }
+#define STUB_GPIOWRITE_BYTE_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_gpiowrite_byte_request__descriptor) \
+    , NULL, 0, 0 }
 
 
 /* StubGPIOWriteByteRequest methods */
-void   stub__gpiowrite_byte_request__init
+void   stub_gpiowrite_byte_request__init
                      (StubGPIOWriteByteRequest         *message);
-size_t stub__gpiowrite_byte_request__get_packed_size
+size_t stub_gpiowrite_byte_request__get_packed_size
                      (const StubGPIOWriteByteRequest   *message);
-size_t stub__gpiowrite_byte_request__pack
+size_t stub_gpiowrite_byte_request__pack
                      (const StubGPIOWriteByteRequest   *message,
                       uint8_t             *out);
-size_t stub__gpiowrite_byte_request__pack_to_buffer
+size_t stub_gpiowrite_byte_request__pack_to_buffer
                      (const StubGPIOWriteByteRequest   *message,
                       ProtobufCBuffer     *buffer);
 StubGPIOWriteByteRequest *
-       stub__gpiowrite_byte_request__unpack
+       stub_gpiowrite_byte_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__gpiowrite_byte_request__free_unpacked
+void   stub_gpiowrite_byte_request__free_unpacked
                      (StubGPIOWriteByteRequest *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -69,9 +68,9 @@ typedef void (*StubGPIOWriteByteRequest_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__gpiowrite_byte_request__descriptor;
+extern const ProtobufCMessageDescriptor stub_gpiowrite_byte_request__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fGPIOWriteByteRequest_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubGPIOWriteByteRequest_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOWriteByteResponse.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOWriteByteResponse.pb-c.c
index eef9b938b..4a72207c7 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOWriteByteResponse.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOWriteByteResponse.pb-c.c
@@ -1,65 +1,65 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_GPIOWriteByteResponse.proto */
+/* Generated from: StubGPIOWriteByteResponse.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_GPIOWriteByteResponse.pb-c.h"
-void   stub__gpiowrite_byte_response__init
+#include "StubGPIOWriteByteResponse.pb-c.h"
+void   stub_gpiowrite_byte_response__init
                      (StubGPIOWriteByteResponse         *message)
 {
-  static const StubGPIOWriteByteResponse init_value = STUB__GPIOWRITE_BYTE_RESPONSE__INIT;
+  static const StubGPIOWriteByteResponse init_value = STUB_GPIOWRITE_BYTE_RESPONSE__INIT;
   *message = init_value;
 }
-size_t stub__gpiowrite_byte_response__get_packed_size
+size_t stub_gpiowrite_byte_response__get_packed_size
                      (const StubGPIOWriteByteResponse *message)
 {
-  assert(message->base.descriptor == &stub__gpiowrite_byte_response__descriptor);
+  assert(message->base.descriptor == &stub_gpiowrite_byte_response__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__gpiowrite_byte_response__pack
+size_t stub_gpiowrite_byte_response__pack
                      (const StubGPIOWriteByteResponse *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__gpiowrite_byte_response__descriptor);
+  assert(message->base.descriptor == &stub_gpiowrite_byte_response__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__gpiowrite_byte_response__pack_to_buffer
+size_t stub_gpiowrite_byte_response__pack_to_buffer
                      (const StubGPIOWriteByteResponse *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__gpiowrite_byte_response__descriptor);
+  assert(message->base.descriptor == &stub_gpiowrite_byte_response__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubGPIOWriteByteResponse *
-       stub__gpiowrite_byte_response__unpack
+       stub_gpiowrite_byte_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubGPIOWriteByteResponse *)
-     protobuf_c_message_unpack (&stub__gpiowrite_byte_response__descriptor,
+     protobuf_c_message_unpack (&stub_gpiowrite_byte_response__descriptor,
                                 allocator, len, data);
 }
-void   stub__gpiowrite_byte_response__free_unpacked
+void   stub_gpiowrite_byte_response__free_unpacked
                      (StubGPIOWriteByteResponse *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__gpiowrite_byte_response__descriptor);
+  assert(message->base.descriptor == &stub_gpiowrite_byte_response__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__gpiowrite_byte_response__field_descriptors[2] =
+static const ProtobufCFieldDescriptor stub_gpiowrite_byte_response__field_descriptors[2] =
 {
   {
     "PortId",
     1,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(StubGPIOWriteByteResponse, has_portid),
+    PROTOBUF_C_TYPE_STRING,
+    0,   /* quantifier_offset */
     offsetof(StubGPIOWriteByteResponse, portid),
     NULL,
     NULL,
@@ -70,7 +70,7 @@ static const ProtobufCFieldDescriptor stub__gpiowrite_byte_response__field_descr
     "status",
     3,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_BOOL,
+    PROTOBUF_C_TYPE_UINT32,
     offsetof(StubGPIOWriteByteResponse, has_status),
     offsetof(StubGPIOWriteByteResponse, status),
     NULL,
@@ -79,28 +79,28 @@ static const ProtobufCFieldDescriptor stub__gpiowrite_byte_response__field_descr
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__gpiowrite_byte_response__field_indices_by_name[] = {
+static const unsigned stub_gpiowrite_byte_response__field_indices_by_name[] = {
   0,   /* field[0] = PortId */
   1,   /* field[1] = status */
 };
-static const ProtobufCIntRange stub__gpiowrite_byte_response__number_ranges[2 + 1] =
+static const ProtobufCIntRange stub_gpiowrite_byte_response__number_ranges[2 + 1] =
 {
   { 1, 0 },
   { 3, 1 },
   { 0, 2 }
 };
-const ProtobufCMessageDescriptor stub__gpiowrite_byte_response__descriptor =
+const ProtobufCMessageDescriptor stub_gpiowrite_byte_response__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_GPIOWriteByteResponse",
+  "StubGPIOWriteByteResponse",
   "StubGPIOWriteByteResponse",
   "StubGPIOWriteByteResponse",
   "",
   sizeof(StubGPIOWriteByteResponse),
   2,
-  stub__gpiowrite_byte_response__field_descriptors,
-  stub__gpiowrite_byte_response__field_indices_by_name,
-  2,  stub__gpiowrite_byte_response__number_ranges,
-  (ProtobufCMessageInit) stub__gpiowrite_byte_response__init,
+  stub_gpiowrite_byte_response__field_descriptors,
+  stub_gpiowrite_byte_response__field_indices_by_name,
+  2,  stub_gpiowrite_byte_response__number_ranges,
+  (ProtobufCMessageInit) stub_gpiowrite_byte_response__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOWriteByteResponse.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOWriteByteResponse.pb-c.h
index 72c9754ea..f02ec9254 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOWriteByteResponse.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubGPIOWriteByteResponse.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_GPIOWriteByteResponse.proto */
+/* Generated from: StubGPIOWriteByteResponse.proto */
 
-#ifndef PROTOBUF_C_Stub_5fGPIOWriteByteResponse_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fGPIOWriteByteResponse_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubGPIOWriteByteResponse_2eproto__INCLUDED
+#define PROTOBUF_C_StubGPIOWriteByteResponse_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -27,38 +27,37 @@ struct  _StubGPIOWriteByteResponse
 {
   ProtobufCMessage base;
   /*
-   * 0..119
+   * A..
    */
-  protobuf_c_boolean has_portid;
-  uint32_t portid;
+  char *portid;
   /*
    * 0-OK 1-Failed
    */
   protobuf_c_boolean has_status;
-  protobuf_c_boolean status;
+  uint32_t status;
 };
-#define STUB__GPIOWRITE_BYTE_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__gpiowrite_byte_response__descriptor) \
-    , 0, 0, 0, 0 }
+#define STUB_GPIOWRITE_BYTE_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_gpiowrite_byte_response__descriptor) \
+    , NULL, 0, 0 }
 
 
 /* StubGPIOWriteByteResponse methods */
-void   stub__gpiowrite_byte_response__init
+void   stub_gpiowrite_byte_response__init
                      (StubGPIOWriteByteResponse         *message);
-size_t stub__gpiowrite_byte_response__get_packed_size
+size_t stub_gpiowrite_byte_response__get_packed_size
                      (const StubGPIOWriteByteResponse   *message);
-size_t stub__gpiowrite_byte_response__pack
+size_t stub_gpiowrite_byte_response__pack
                      (const StubGPIOWriteByteResponse   *message,
                       uint8_t             *out);
-size_t stub__gpiowrite_byte_response__pack_to_buffer
+size_t stub_gpiowrite_byte_response__pack_to_buffer
                      (const StubGPIOWriteByteResponse   *message,
                       ProtobufCBuffer     *buffer);
 StubGPIOWriteByteResponse *
-       stub__gpiowrite_byte_response__unpack
+       stub_gpiowrite_byte_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__gpiowrite_byte_response__free_unpacked
+void   stub_gpiowrite_byte_response__free_unpacked
                      (StubGPIOWriteByteResponse *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -72,9 +71,9 @@ typedef void (*StubGPIOWriteByteResponse_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__gpiowrite_byte_response__descriptor;
+extern const ProtobufCMessageDescriptor stub_gpiowrite_byte_response__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fGPIOWriteByteResponse_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubGPIOWriteByteResponse_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_HeaterRequest.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubHeaterRequest.pb-c.c
index 3169a9f55..f77207045 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_HeaterRequest.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubHeaterRequest.pb-c.c
@@ -1,58 +1,58 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_HeaterRequest.proto */
+/* Generated from: StubHeaterRequest.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_HeaterRequest.pb-c.h"
-void   stub__heater_request__init
+#include "StubHeaterRequest.pb-c.h"
+void   stub_heater_request__init
                      (StubHeaterRequest         *message)
 {
-  static const StubHeaterRequest init_value = STUB__HEATER_REQUEST__INIT;
+  static const StubHeaterRequest init_value = STUB_HEATER_REQUEST__INIT;
   *message = init_value;
 }
-size_t stub__heater_request__get_packed_size
+size_t stub_heater_request__get_packed_size
                      (const StubHeaterRequest *message)
 {
-  assert(message->base.descriptor == &stub__heater_request__descriptor);
+  assert(message->base.descriptor == &stub_heater_request__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__heater_request__pack
+size_t stub_heater_request__pack
                      (const StubHeaterRequest *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__heater_request__descriptor);
+  assert(message->base.descriptor == &stub_heater_request__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__heater_request__pack_to_buffer
+size_t stub_heater_request__pack_to_buffer
                      (const StubHeaterRequest *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__heater_request__descriptor);
+  assert(message->base.descriptor == &stub_heater_request__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubHeaterRequest *
-       stub__heater_request__unpack
+       stub_heater_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubHeaterRequest *)
-     protobuf_c_message_unpack (&stub__heater_request__descriptor,
+     protobuf_c_message_unpack (&stub_heater_request__descriptor,
                                 allocator, len, data);
 }
-void   stub__heater_request__free_unpacked
+void   stub_heater_request__free_unpacked
                      (StubHeaterRequest *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__heater_request__descriptor);
+  assert(message->base.descriptor == &stub_heater_request__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__heater_request__field_descriptors[3] =
+static const ProtobufCFieldDescriptor stub_heater_request__field_descriptors[3] =
 {
   {
     "HeaterGroupId",
@@ -91,28 +91,28 @@ static const ProtobufCFieldDescriptor stub__heater_request__field_descriptors[3]
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__heater_request__field_indices_by_name[] = {
+static const unsigned stub_heater_request__field_indices_by_name[] = {
   0,   /* field[0] = HeaterGroupId */
   1,   /* field[1] = HeaterGroupOn */
   2,   /* field[2] = HeaterTemperatureReq */
 };
-static const ProtobufCIntRange stub__heater_request__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_heater_request__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 3 }
 };
-const ProtobufCMessageDescriptor stub__heater_request__descriptor =
+const ProtobufCMessageDescriptor stub_heater_request__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_HeaterRequest",
+  "StubHeaterRequest",
   "StubHeaterRequest",
   "StubHeaterRequest",
   "",
   sizeof(StubHeaterRequest),
   3,
-  stub__heater_request__field_descriptors,
-  stub__heater_request__field_indices_by_name,
-  1,  stub__heater_request__number_ranges,
-  (ProtobufCMessageInit) stub__heater_request__init,
+  stub_heater_request__field_descriptors,
+  stub_heater_request__field_indices_by_name,
+  1,  stub_heater_request__number_ranges,
+  (ProtobufCMessageInit) stub_heater_request__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_HeaterRequest.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubHeaterRequest.pb-c.h
index 4fb904442..6d220df5d 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_HeaterRequest.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubHeaterRequest.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_HeaterRequest.proto */
+/* Generated from: StubHeaterRequest.proto */
 
-#ifndef PROTOBUF_C_Stub_5fHeaterRequest_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fHeaterRequest_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubHeaterRequest_2eproto__INCLUDED
+#define PROTOBUF_C_StubHeaterRequest_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -39,28 +39,28 @@ struct  _StubHeaterRequest
   protobuf_c_boolean has_heatertemperaturereq;
   uint32_t heatertemperaturereq;
 };
-#define STUB__HEATER_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__heater_request__descriptor) \
+#define STUB_HEATER_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_heater_request__descriptor) \
     , 0, 0, 0, 0, 0, 0 }
 
 
 /* StubHeaterRequest methods */
-void   stub__heater_request__init
+void   stub_heater_request__init
                      (StubHeaterRequest         *message);
-size_t stub__heater_request__get_packed_size
+size_t stub_heater_request__get_packed_size
                      (const StubHeaterRequest   *message);
-size_t stub__heater_request__pack
+size_t stub_heater_request__pack
                      (const StubHeaterRequest   *message,
                       uint8_t             *out);
-size_t stub__heater_request__pack_to_buffer
+size_t stub_heater_request__pack_to_buffer
                      (const StubHeaterRequest   *message,
                       ProtobufCBuffer     *buffer);
 StubHeaterRequest *
-       stub__heater_request__unpack
+       stub_heater_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__heater_request__free_unpacked
+void   stub_heater_request__free_unpacked
                      (StubHeaterRequest *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -74,9 +74,9 @@ typedef void (*StubHeaterRequest_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__heater_request__descriptor;
+extern const ProtobufCMessageDescriptor stub_heater_request__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fHeaterRequest_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubHeaterRequest_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_HeaterResponse.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubHeaterResponse.pb-c.c
index 9c482cee5..83586b8da 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_HeaterResponse.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubHeaterResponse.pb-c.c
@@ -1,58 +1,58 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_HeaterResponse.proto */
+/* Generated from: StubHeaterResponse.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_HeaterResponse.pb-c.h"
-void   stub__heater_response__init
+#include "StubHeaterResponse.pb-c.h"
+void   stub_heater_response__init
                      (StubHeaterResponse         *message)
 {
-  static const StubHeaterResponse init_value = STUB__HEATER_RESPONSE__INIT;
+  static const StubHeaterResponse init_value = STUB_HEATER_RESPONSE__INIT;
   *message = init_value;
 }
-size_t stub__heater_response__get_packed_size
+size_t stub_heater_response__get_packed_size
                      (const StubHeaterResponse *message)
 {
-  assert(message->base.descriptor == &stub__heater_response__descriptor);
+  assert(message->base.descriptor == &stub_heater_response__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__heater_response__pack
+size_t stub_heater_response__pack
                      (const StubHeaterResponse *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__heater_response__descriptor);
+  assert(message->base.descriptor == &stub_heater_response__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__heater_response__pack_to_buffer
+size_t stub_heater_response__pack_to_buffer
                      (const StubHeaterResponse *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__heater_response__descriptor);
+  assert(message->base.descriptor == &stub_heater_response__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubHeaterResponse *
-       stub__heater_response__unpack
+       stub_heater_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubHeaterResponse *)
-     protobuf_c_message_unpack (&stub__heater_response__descriptor,
+     protobuf_c_message_unpack (&stub_heater_response__descriptor,
                                 allocator, len, data);
 }
-void   stub__heater_response__free_unpacked
+void   stub_heater_response__free_unpacked
                      (StubHeaterResponse *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__heater_response__descriptor);
+  assert(message->base.descriptor == &stub_heater_response__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__heater_response__field_descriptors[3] =
+static const ProtobufCFieldDescriptor stub_heater_response__field_descriptors[3] =
 {
   {
     "HeaterGroupId",
@@ -91,28 +91,28 @@ static const ProtobufCFieldDescriptor stub__heater_response__field_descriptors[3
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__heater_response__field_indices_by_name[] = {
+static const unsigned stub_heater_response__field_indices_by_name[] = {
   0,   /* field[0] = HeaterGroupId */
   1,   /* field[1] = HeaterTemperatureSensor */
   2,   /* field[2] = Status */
 };
-static const ProtobufCIntRange stub__heater_response__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_heater_response__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 3 }
 };
-const ProtobufCMessageDescriptor stub__heater_response__descriptor =
+const ProtobufCMessageDescriptor stub_heater_response__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_HeaterResponse",
+  "StubHeaterResponse",
   "StubHeaterResponse",
   "StubHeaterResponse",
   "",
   sizeof(StubHeaterResponse),
   3,
-  stub__heater_response__field_descriptors,
-  stub__heater_response__field_indices_by_name,
-  1,  stub__heater_response__number_ranges,
-  (ProtobufCMessageInit) stub__heater_response__init,
+  stub_heater_response__field_descriptors,
+  stub_heater_response__field_indices_by_name,
+  1,  stub_heater_response__number_ranges,
+  (ProtobufCMessageInit) stub_heater_response__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_HeaterResponse.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubHeaterResponse.pb-c.h
index 91855aff8..c7b2d08d2 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_HeaterResponse.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubHeaterResponse.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_HeaterResponse.proto */
+/* Generated from: StubHeaterResponse.proto */
 
-#ifndef PROTOBUF_C_Stub_5fHeaterResponse_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fHeaterResponse_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubHeaterResponse_2eproto__INCLUDED
+#define PROTOBUF_C_StubHeaterResponse_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -39,28 +39,28 @@ struct  _StubHeaterResponse
   protobuf_c_boolean has_status;
   protobuf_c_boolean status;
 };
-#define STUB__HEATER_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__heater_response__descriptor) \
+#define STUB_HEATER_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_heater_response__descriptor) \
     , 0, 0, 0, 0, 0, 0 }
 
 
 /* StubHeaterResponse methods */
-void   stub__heater_response__init
+void   stub_heater_response__init
                      (StubHeaterResponse         *message);
-size_t stub__heater_response__get_packed_size
+size_t stub_heater_response__get_packed_size
                      (const StubHeaterResponse   *message);
-size_t stub__heater_response__pack
+size_t stub_heater_response__pack
                      (const StubHeaterResponse   *message,
                       uint8_t             *out);
-size_t stub__heater_response__pack_to_buffer
+size_t stub_heater_response__pack_to_buffer
                      (const StubHeaterResponse   *message,
                       ProtobufCBuffer     *buffer);
 StubHeaterResponse *
-       stub__heater_response__unpack
+       stub_heater_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__heater_response__free_unpacked
+void   stub_heater_response__free_unpacked
                      (StubHeaterResponse *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -74,9 +74,9 @@ typedef void (*StubHeaterResponse_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__heater_response__descriptor;
+extern const ProtobufCMessageDescriptor stub_heater_response__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fHeaterResponse_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubHeaterResponse_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_MotorEncoderRequest.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorEncoderRequest.pb-c.c
index 3a917e602..cb95c4718 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_MotorEncoderRequest.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorEncoderRequest.pb-c.c
@@ -1,58 +1,58 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_MotorEncoderRequest.proto */
+/* Generated from: StubMotorEncoderRequest.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_MotorEncoderRequest.pb-c.h"
-void   stub__motor_encoder_request__init
+#include "StubMotorEncoderRequest.pb-c.h"
+void   stub_motor_encoder_request__init
                      (StubMotorEncoderRequest         *message)
 {
-  static const StubMotorEncoderRequest init_value = STUB__MOTOR_ENCODER_REQUEST__INIT;
+  static const StubMotorEncoderRequest init_value = STUB_MOTOR_ENCODER_REQUEST__INIT;
   *message = init_value;
 }
-size_t stub__motor_encoder_request__get_packed_size
+size_t stub_motor_encoder_request__get_packed_size
                      (const StubMotorEncoderRequest *message)
 {
-  assert(message->base.descriptor == &stub__motor_encoder_request__descriptor);
+  assert(message->base.descriptor == &stub_motor_encoder_request__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__motor_encoder_request__pack
+size_t stub_motor_encoder_request__pack
                      (const StubMotorEncoderRequest *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__motor_encoder_request__descriptor);
+  assert(message->base.descriptor == &stub_motor_encoder_request__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__motor_encoder_request__pack_to_buffer
+size_t stub_motor_encoder_request__pack_to_buffer
                      (const StubMotorEncoderRequest *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__motor_encoder_request__descriptor);
+  assert(message->base.descriptor == &stub_motor_encoder_request__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubMotorEncoderRequest *
-       stub__motor_encoder_request__unpack
+       stub_motor_encoder_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubMotorEncoderRequest *)
-     protobuf_c_message_unpack (&stub__motor_encoder_request__descriptor,
+     protobuf_c_message_unpack (&stub_motor_encoder_request__descriptor,
                                 allocator, len, data);
 }
-void   stub__motor_encoder_request__free_unpacked
+void   stub_motor_encoder_request__free_unpacked
                      (StubMotorEncoderRequest *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__motor_encoder_request__descriptor);
+  assert(message->base.descriptor == &stub_motor_encoder_request__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__motor_encoder_request__field_descriptors[4] =
+static const ProtobufCFieldDescriptor stub_motor_encoder_request__field_descriptors[4] =
 {
   {
     "MotorId",
@@ -103,29 +103,29 @@ static const ProtobufCFieldDescriptor stub__motor_encoder_request__field_descrip
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__motor_encoder_request__field_indices_by_name[] = {
+static const unsigned stub_motor_encoder_request__field_indices_by_name[] = {
   3,   /* field[3] = Motion_Control */
   0,   /* field[0] = MotorId */
   2,   /* field[2] = ReadDirection */
   1,   /* field[1] = ReadEncSpeed */
 };
-static const ProtobufCIntRange stub__motor_encoder_request__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_motor_encoder_request__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 4 }
 };
-const ProtobufCMessageDescriptor stub__motor_encoder_request__descriptor =
+const ProtobufCMessageDescriptor stub_motor_encoder_request__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_MotorEncoderRequest",
+  "StubMotorEncoderRequest",
   "StubMotorEncoderRequest",
   "StubMotorEncoderRequest",
   "",
   sizeof(StubMotorEncoderRequest),
   4,
-  stub__motor_encoder_request__field_descriptors,
-  stub__motor_encoder_request__field_indices_by_name,
-  1,  stub__motor_encoder_request__number_ranges,
-  (ProtobufCMessageInit) stub__motor_encoder_request__init,
+  stub_motor_encoder_request__field_descriptors,
+  stub_motor_encoder_request__field_indices_by_name,
+  1,  stub_motor_encoder_request__number_ranges,
+  (ProtobufCMessageInit) stub_motor_encoder_request__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_MotorEncoderRequest.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorEncoderRequest.pb-c.h
index e07d3c91e..ba7151b89 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_MotorEncoderRequest.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorEncoderRequest.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_MotorEncoderRequest.proto */
+/* Generated from: StubMotorEncoderRequest.proto */
 
-#ifndef PROTOBUF_C_Stub_5fMotorEncoderRequest_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fMotorEncoderRequest_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubMotorEncoderRequest_2eproto__INCLUDED
+#define PROTOBUF_C_StubMotorEncoderRequest_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -44,28 +44,28 @@ struct  _StubMotorEncoderRequest
   protobuf_c_boolean has_motion_control;
   protobuf_c_boolean motion_control;
 };
-#define STUB__MOTOR_ENCODER_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__motor_encoder_request__descriptor) \
+#define STUB_MOTOR_ENCODER_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_motor_encoder_request__descriptor) \
     , 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 /* StubMotorEncoderRequest methods */
-void   stub__motor_encoder_request__init
+void   stub_motor_encoder_request__init
                      (StubMotorEncoderRequest         *message);
-size_t stub__motor_encoder_request__get_packed_size
+size_t stub_motor_encoder_request__get_packed_size
                      (const StubMotorEncoderRequest   *message);
-size_t stub__motor_encoder_request__pack
+size_t stub_motor_encoder_request__pack
                      (const StubMotorEncoderRequest   *message,
                       uint8_t             *out);
-size_t stub__motor_encoder_request__pack_to_buffer
+size_t stub_motor_encoder_request__pack_to_buffer
                      (const StubMotorEncoderRequest   *message,
                       ProtobufCBuffer     *buffer);
 StubMotorEncoderRequest *
-       stub__motor_encoder_request__unpack
+       stub_motor_encoder_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__motor_encoder_request__free_unpacked
+void   stub_motor_encoder_request__free_unpacked
                      (StubMotorEncoderRequest *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -79,9 +79,9 @@ typedef void (*StubMotorEncoderRequest_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__motor_encoder_request__descriptor;
+extern const ProtobufCMessageDescriptor stub_motor_encoder_request__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fMotorEncoderRequest_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubMotorEncoderRequest_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_MotorEncoderResponse.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorEncoderResponse.pb-c.c
index e5d69b685..c5eac4915 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_MotorEncoderResponse.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorEncoderResponse.pb-c.c
@@ -1,58 +1,58 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_MotorEncoderResponse.proto */
+/* Generated from: StubMotorEncoderResponse.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_MotorEncoderResponse.pb-c.h"
-void   stub__motor_encoder_response__init
+#include "StubMotorEncoderResponse.pb-c.h"
+void   stub_motor_encoder_response__init
                      (StubMotorEncoderResponse         *message)
 {
-  static const StubMotorEncoderResponse init_value = STUB__MOTOR_ENCODER_RESPONSE__INIT;
+  static const StubMotorEncoderResponse init_value = STUB_MOTOR_ENCODER_RESPONSE__INIT;
   *message = init_value;
 }
-size_t stub__motor_encoder_response__get_packed_size
+size_t stub_motor_encoder_response__get_packed_size
                      (const StubMotorEncoderResponse *message)
 {
-  assert(message->base.descriptor == &stub__motor_encoder_response__descriptor);
+  assert(message->base.descriptor == &stub_motor_encoder_response__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__motor_encoder_response__pack
+size_t stub_motor_encoder_response__pack
                      (const StubMotorEncoderResponse *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__motor_encoder_response__descriptor);
+  assert(message->base.descriptor == &stub_motor_encoder_response__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__motor_encoder_response__pack_to_buffer
+size_t stub_motor_encoder_response__pack_to_buffer
                      (const StubMotorEncoderResponse *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__motor_encoder_response__descriptor);
+  assert(message->base.descriptor == &stub_motor_encoder_response__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubMotorEncoderResponse *
-       stub__motor_encoder_response__unpack
+       stub_motor_encoder_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubMotorEncoderResponse *)
-     protobuf_c_message_unpack (&stub__motor_encoder_response__descriptor,
+     protobuf_c_message_unpack (&stub_motor_encoder_response__descriptor,
                                 allocator, len, data);
 }
-void   stub__motor_encoder_response__free_unpacked
+void   stub_motor_encoder_response__free_unpacked
                      (StubMotorEncoderResponse *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__motor_encoder_response__descriptor);
+  assert(message->base.descriptor == &stub_motor_encoder_response__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__motor_encoder_response__field_descriptors[5] =
+static const ProtobufCFieldDescriptor stub_motor_encoder_response__field_descriptors[5] =
 {
   {
     "EncoderId",
@@ -115,30 +115,30 @@ static const ProtobufCFieldDescriptor stub__motor_encoder_response__field_descri
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__motor_encoder_response__field_indices_by_name[] = {
+static const unsigned stub_motor_encoder_response__field_indices_by_name[] = {
   0,   /* field[0] = EncoderId */
   1,   /* field[1] = EncoderVersion */
   3,   /* field[3] = MotorDirection */
   2,   /* field[2] = MotorSpeed */
   4,   /* field[4] = Status */
 };
-static const ProtobufCIntRange stub__motor_encoder_response__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_motor_encoder_response__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 5 }
 };
-const ProtobufCMessageDescriptor stub__motor_encoder_response__descriptor =
+const ProtobufCMessageDescriptor stub_motor_encoder_response__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_MotorEncoderResponse",
+  "StubMotorEncoderResponse",
   "StubMotorEncoderResponse",
   "StubMotorEncoderResponse",
   "",
   sizeof(StubMotorEncoderResponse),
   5,
-  stub__motor_encoder_response__field_descriptors,
-  stub__motor_encoder_response__field_indices_by_name,
-  1,  stub__motor_encoder_response__number_ranges,
-  (ProtobufCMessageInit) stub__motor_encoder_response__init,
+  stub_motor_encoder_response__field_descriptors,
+  stub_motor_encoder_response__field_indices_by_name,
+  1,  stub_motor_encoder_response__number_ranges,
+  (ProtobufCMessageInit) stub_motor_encoder_response__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_MotorEncoderResponse.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorEncoderResponse.pb-c.h
index b9c359e53..cff4adfa4 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_MotorEncoderResponse.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubMotorEncoderResponse.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_MotorEncoderResponse.proto */
+/* Generated from: StubMotorEncoderResponse.proto */
 
-#ifndef PROTOBUF_C_Stub_5fMotorEncoderResponse_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fMotorEncoderResponse_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubMotorEncoderResponse_2eproto__INCLUDED
+#define PROTOBUF_C_StubMotorEncoderResponse_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -46,28 +46,28 @@ struct  _StubMotorEncoderResponse
   protobuf_c_boolean has_status;
   protobuf_c_boolean status;
 };
-#define STUB__MOTOR_ENCODER_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__motor_encoder_response__descriptor) \
+#define STUB_MOTOR_ENCODER_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_motor_encoder_response__descriptor) \
     , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 /* StubMotorEncoderResponse methods */
-void   stub__motor_encoder_response__init
+void   stub_motor_encoder_response__init
                      (StubMotorEncoderResponse         *message);
-size_t stub__motor_encoder_response__get_packed_size
+size_t stub_motor_encoder_response__get_packed_size
                      (const StubMotorEncoderResponse   *message);
-size_t stub__motor_encoder_response__pack
+size_t stub_motor_encoder_response__pack
                      (const StubMotorEncoderResponse   *message,
                       uint8_t             *out);
-size_t stub__motor_encoder_response__pack_to_buffer
+size_t stub_motor_encoder_response__pack_to_buffer
                      (const StubMotorEncoderResponse   *message,
                       ProtobufCBuffer     *buffer);
 StubMotorEncoderResponse *
-       stub__motor_encoder_response__unpack
+       stub_motor_encoder_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__motor_encoder_response__free_unpacked
+void   stub_motor_encoder_response__free_unpacked
                      (StubMotorEncoderResponse *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -81,9 +81,9 @@ typedef void (*StubMotorEncoderResponse_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__motor_encoder_response__descriptor;
+extern const ProtobufCMessageDescriptor stub_motor_encoder_response__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fMotorEncoderResponse_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubMotorEncoderResponse_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_OptLimitSwitchRequest.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubOptLimitSwitchRequest.pb-c.c
index 13030455f..bd4187588 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_OptLimitSwitchRequest.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubOptLimitSwitchRequest.pb-c.c
@@ -1,58 +1,58 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_OptLimitSwitchRequest.proto */
+/* Generated from: StubOptLimitSwitchRequest.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_OptLimitSwitchRequest.pb-c.h"
-void   stub__opt_limit_switch_request__init
+#include "StubOptLimitSwitchRequest.pb-c.h"
+void   stub_opt_limit_switch_request__init
                      (StubOptLimitSwitchRequest         *message)
 {
-  static const StubOptLimitSwitchRequest init_value = STUB__OPT_LIMIT_SWITCH_REQUEST__INIT;
+  static const StubOptLimitSwitchRequest init_value = STUB_OPT_LIMIT_SWITCH_REQUEST__INIT;
   *message = init_value;
 }
-size_t stub__opt_limit_switch_request__get_packed_size
+size_t stub_opt_limit_switch_request__get_packed_size
                      (const StubOptLimitSwitchRequest *message)
 {
-  assert(message->base.descriptor == &stub__opt_limit_switch_request__descriptor);
+  assert(message->base.descriptor == &stub_opt_limit_switch_request__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__opt_limit_switch_request__pack
+size_t stub_opt_limit_switch_request__pack
                      (const StubOptLimitSwitchRequest *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__opt_limit_switch_request__descriptor);
+  assert(message->base.descriptor == &stub_opt_limit_switch_request__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__opt_limit_switch_request__pack_to_buffer
+size_t stub_opt_limit_switch_request__pack_to_buffer
                      (const StubOptLimitSwitchRequest *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__opt_limit_switch_request__descriptor);
+  assert(message->base.descriptor == &stub_opt_limit_switch_request__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubOptLimitSwitchRequest *
-       stub__opt_limit_switch_request__unpack
+       stub_opt_limit_switch_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubOptLimitSwitchRequest *)
-     protobuf_c_message_unpack (&stub__opt_limit_switch_request__descriptor,
+     protobuf_c_message_unpack (&stub_opt_limit_switch_request__descriptor,
                                 allocator, len, data);
 }
-void   stub__opt_limit_switch_request__free_unpacked
+void   stub_opt_limit_switch_request__free_unpacked
                      (StubOptLimitSwitchRequest *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__opt_limit_switch_request__descriptor);
+  assert(message->base.descriptor == &stub_opt_limit_switch_request__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__opt_limit_switch_request__field_descriptors[2] =
+static const ProtobufCFieldDescriptor stub_opt_limit_switch_request__field_descriptors[2] =
 {
   {
     "LimitSwitchrId",
@@ -79,27 +79,27 @@ static const ProtobufCFieldDescriptor stub__opt_limit_switch_request__field_desc
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__opt_limit_switch_request__field_indices_by_name[] = {
+static const unsigned stub_opt_limit_switch_request__field_indices_by_name[] = {
   1,   /* field[1] = LimitSwitchrDisable */
   0,   /* field[0] = LimitSwitchrId */
 };
-static const ProtobufCIntRange stub__opt_limit_switch_request__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_opt_limit_switch_request__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 2 }
 };
-const ProtobufCMessageDescriptor stub__opt_limit_switch_request__descriptor =
+const ProtobufCMessageDescriptor stub_opt_limit_switch_request__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_OptLimitSwitchRequest",
+  "StubOptLimitSwitchRequest",
   "StubOptLimitSwitchRequest",
   "StubOptLimitSwitchRequest",
   "",
   sizeof(StubOptLimitSwitchRequest),
   2,
-  stub__opt_limit_switch_request__field_descriptors,
-  stub__opt_limit_switch_request__field_indices_by_name,
-  1,  stub__opt_limit_switch_request__number_ranges,
-  (ProtobufCMessageInit) stub__opt_limit_switch_request__init,
+  stub_opt_limit_switch_request__field_descriptors,
+  stub_opt_limit_switch_request__field_indices_by_name,
+  1,  stub_opt_limit_switch_request__number_ranges,
+  (ProtobufCMessageInit) stub_opt_limit_switch_request__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_OptLimitSwitchRequest.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubOptLimitSwitchRequest.pb-c.h
index 70668e033..2008bf5f9 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_OptLimitSwitchRequest.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubOptLimitSwitchRequest.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_OptLimitSwitchRequest.proto */
+/* Generated from: StubOptLimitSwitchRequest.proto */
 
-#ifndef PROTOBUF_C_Stub_5fOptLimitSwitchRequest_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fOptLimitSwitchRequest_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubOptLimitSwitchRequest_2eproto__INCLUDED
+#define PROTOBUF_C_StubOptLimitSwitchRequest_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -37,28 +37,28 @@ struct  _StubOptLimitSwitchRequest
   protobuf_c_boolean has_limitswitchrdisable;
   protobuf_c_boolean limitswitchrdisable;
 };
-#define STUB__OPT_LIMIT_SWITCH_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__opt_limit_switch_request__descriptor) \
+#define STUB_OPT_LIMIT_SWITCH_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_opt_limit_switch_request__descriptor) \
     , 0, 0, 0, 0 }
 
 
 /* StubOptLimitSwitchRequest methods */
-void   stub__opt_limit_switch_request__init
+void   stub_opt_limit_switch_request__init
                      (StubOptLimitSwitchRequest         *message);
-size_t stub__opt_limit_switch_request__get_packed_size
+size_t stub_opt_limit_switch_request__get_packed_size
                      (const StubOptLimitSwitchRequest   *message);
-size_t stub__opt_limit_switch_request__pack
+size_t stub_opt_limit_switch_request__pack
                      (const StubOptLimitSwitchRequest   *message,
                       uint8_t             *out);
-size_t stub__opt_limit_switch_request__pack_to_buffer
+size_t stub_opt_limit_switch_request__pack_to_buffer
                      (const StubOptLimitSwitchRequest   *message,
                       ProtobufCBuffer     *buffer);
 StubOptLimitSwitchRequest *
-       stub__opt_limit_switch_request__unpack
+       stub_opt_limit_switch_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__opt_limit_switch_request__free_unpacked
+void   stub_opt_limit_switch_request__free_unpacked
                      (StubOptLimitSwitchRequest *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -72,9 +72,9 @@ typedef void (*StubOptLimitSwitchRequest_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__opt_limit_switch_request__descriptor;
+extern const ProtobufCMessageDescriptor stub_opt_limit_switch_request__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fOptLimitSwitchRequest_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubOptLimitSwitchRequest_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_OptLimitSwitchResponse.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubOptLimitSwitchResponse.pb-c.c
index acaa44afd..a14fd9720 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_OptLimitSwitchResponse.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubOptLimitSwitchResponse.pb-c.c
@@ -1,58 +1,58 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_OptLimitSwitchResponse.proto */
+/* Generated from: StubOptLimitSwitchResponse.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_OptLimitSwitchResponse.pb-c.h"
-void   stub__opt_limit_switch_response__init
+#include "StubOptLimitSwitchResponse.pb-c.h"
+void   stub_opt_limit_switch_response__init
                      (StubOptLimitSwitchResponse         *message)
 {
-  static const StubOptLimitSwitchResponse init_value = STUB__OPT_LIMIT_SWITCH_RESPONSE__INIT;
+  static const StubOptLimitSwitchResponse init_value = STUB_OPT_LIMIT_SWITCH_RESPONSE__INIT;
   *message = init_value;
 }
-size_t stub__opt_limit_switch_response__get_packed_size
+size_t stub_opt_limit_switch_response__get_packed_size
                      (const StubOptLimitSwitchResponse *message)
 {
-  assert(message->base.descriptor == &stub__opt_limit_switch_response__descriptor);
+  assert(message->base.descriptor == &stub_opt_limit_switch_response__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__opt_limit_switch_response__pack
+size_t stub_opt_limit_switch_response__pack
                      (const StubOptLimitSwitchResponse *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__opt_limit_switch_response__descriptor);
+  assert(message->base.descriptor == &stub_opt_limit_switch_response__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__opt_limit_switch_response__pack_to_buffer
+size_t stub_opt_limit_switch_response__pack_to_buffer
                      (const StubOptLimitSwitchResponse *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__opt_limit_switch_response__descriptor);
+  assert(message->base.descriptor == &stub_opt_limit_switch_response__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubOptLimitSwitchResponse *
-       stub__opt_limit_switch_response__unpack
+       stub_opt_limit_switch_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubOptLimitSwitchResponse *)
-     protobuf_c_message_unpack (&stub__opt_limit_switch_response__descriptor,
+     protobuf_c_message_unpack (&stub_opt_limit_switch_response__descriptor,
                                 allocator, len, data);
 }
-void   stub__opt_limit_switch_response__free_unpacked
+void   stub_opt_limit_switch_response__free_unpacked
                      (StubOptLimitSwitchResponse *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__opt_limit_switch_response__descriptor);
+  assert(message->base.descriptor == &stub_opt_limit_switch_response__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__opt_limit_switch_response__field_descriptors[3] =
+static const ProtobufCFieldDescriptor stub_opt_limit_switch_response__field_descriptors[3] =
 {
   {
     "LimitSwitchrId",
@@ -91,28 +91,28 @@ static const ProtobufCFieldDescriptor stub__opt_limit_switch_response__field_des
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__opt_limit_switch_response__field_indices_by_name[] = {
+static const unsigned stub_opt_limit_switch_response__field_indices_by_name[] = {
   1,   /* field[1] = LimitSwitchDitection */
   0,   /* field[0] = LimitSwitchrId */
   2,   /* field[2] = Status */
 };
-static const ProtobufCIntRange stub__opt_limit_switch_response__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_opt_limit_switch_response__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 3 }
 };
-const ProtobufCMessageDescriptor stub__opt_limit_switch_response__descriptor =
+const ProtobufCMessageDescriptor stub_opt_limit_switch_response__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_OptLimitSwitchResponse",
+  "StubOptLimitSwitchResponse",
   "StubOptLimitSwitchResponse",
   "StubOptLimitSwitchResponse",
   "",
   sizeof(StubOptLimitSwitchResponse),
   3,
-  stub__opt_limit_switch_response__field_descriptors,
-  stub__opt_limit_switch_response__field_indices_by_name,
-  1,  stub__opt_limit_switch_response__number_ranges,
-  (ProtobufCMessageInit) stub__opt_limit_switch_response__init,
+  stub_opt_limit_switch_response__field_descriptors,
+  stub_opt_limit_switch_response__field_indices_by_name,
+  1,  stub_opt_limit_switch_response__number_ranges,
+  (ProtobufCMessageInit) stub_opt_limit_switch_response__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_OptLimitSwitchResponse.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubOptLimitSwitchResponse.pb-c.h
index 71d0c4266..61656ccde 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_OptLimitSwitchResponse.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubOptLimitSwitchResponse.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_OptLimitSwitchResponse.proto */
+/* Generated from: StubOptLimitSwitchResponse.proto */
 
-#ifndef PROTOBUF_C_Stub_5fOptLimitSwitchResponse_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fOptLimitSwitchResponse_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubOptLimitSwitchResponse_2eproto__INCLUDED
+#define PROTOBUF_C_StubOptLimitSwitchResponse_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -41,28 +41,28 @@ struct  _StubOptLimitSwitchResponse
   protobuf_c_boolean has_status;
   protobuf_c_boolean status;
 };
-#define STUB__OPT_LIMIT_SWITCH_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__opt_limit_switch_response__descriptor) \
+#define STUB_OPT_LIMIT_SWITCH_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_opt_limit_switch_response__descriptor) \
     , 0, 0, 0, 0, 0, 0 }
 
 
 /* StubOptLimitSwitchResponse methods */
-void   stub__opt_limit_switch_response__init
+void   stub_opt_limit_switch_response__init
                      (StubOptLimitSwitchResponse         *message);
-size_t stub__opt_limit_switch_response__get_packed_size
+size_t stub_opt_limit_switch_response__get_packed_size
                      (const StubOptLimitSwitchResponse   *message);
-size_t stub__opt_limit_switch_response__pack
+size_t stub_opt_limit_switch_response__pack
                      (const StubOptLimitSwitchResponse   *message,
                       uint8_t             *out);
-size_t stub__opt_limit_switch_response__pack_to_buffer
+size_t stub_opt_limit_switch_response__pack_to_buffer
                      (const StubOptLimitSwitchResponse   *message,
                       ProtobufCBuffer     *buffer);
 StubOptLimitSwitchResponse *
-       stub__opt_limit_switch_response__unpack
+       stub_opt_limit_switch_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__opt_limit_switch_response__free_unpacked
+void   stub_opt_limit_switch_response__free_unpacked
                      (StubOptLimitSwitchResponse *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -76,9 +76,9 @@ typedef void (*StubOptLimitSwitchResponse_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__opt_limit_switch_response__descriptor;
+extern const ProtobufCMessageDescriptor stub_opt_limit_switch_response__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fOptLimitSwitchResponse_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubOptLimitSwitchResponse_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_SteperMotorRequest.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubSteperMotorRequest.pb-c.c
index 4c4a246ea..7328bb692 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_SteperMotorRequest.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubSteperMotorRequest.pb-c.c
@@ -1,66 +1,66 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_SteperMotorRequest.proto */
+/* Generated from: StubSteperMotorRequest.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_SteperMotorRequest.pb-c.h"
-void   stub__stepe_motor_request__init
-                     (StubStepeMotorRequest         *message)
+#include "StubSteperMotorRequest.pb-c.h"
+void   stub_steper_motor_request__init
+                     (StubSteperMotorRequest         *message)
 {
-  static const StubStepeMotorRequest init_value = STUB__STEPE_MOTOR_REQUEST__INIT;
+  static const StubSteperMotorRequest init_value = STUB_STEPER_MOTOR_REQUEST__INIT;
   *message = init_value;
 }
-size_t stub__stepe_motor_request__get_packed_size
-                     (const StubStepeMotorRequest *message)
+size_t stub_steper_motor_request__get_packed_size
+                     (const StubSteperMotorRequest *message)
 {
-  assert(message->base.descriptor == &stub__stepe_motor_request__descriptor);
+  assert(message->base.descriptor == &stub_steper_motor_request__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__stepe_motor_request__pack
-                     (const StubStepeMotorRequest *message,
+size_t stub_steper_motor_request__pack
+                     (const StubSteperMotorRequest *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__stepe_motor_request__descriptor);
+  assert(message->base.descriptor == &stub_steper_motor_request__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__stepe_motor_request__pack_to_buffer
-                     (const StubStepeMotorRequest *message,
+size_t stub_steper_motor_request__pack_to_buffer
+                     (const StubSteperMotorRequest *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__stepe_motor_request__descriptor);
+  assert(message->base.descriptor == &stub_steper_motor_request__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-StubStepeMotorRequest *
-       stub__stepe_motor_request__unpack
+StubSteperMotorRequest *
+       stub_steper_motor_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (StubStepeMotorRequest *)
-     protobuf_c_message_unpack (&stub__stepe_motor_request__descriptor,
+  return (StubSteperMotorRequest *)
+     protobuf_c_message_unpack (&stub_steper_motor_request__descriptor,
                                 allocator, len, data);
 }
-void   stub__stepe_motor_request__free_unpacked
-                     (StubStepeMotorRequest *message,
+void   stub_steper_motor_request__free_unpacked
+                     (StubSteperMotorRequest *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__stepe_motor_request__descriptor);
+  assert(message->base.descriptor == &stub_steper_motor_request__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__stepe_motor_request__field_descriptors[5] =
+static const ProtobufCFieldDescriptor stub_steper_motor_request__field_descriptors[5] =
 {
   {
     "MotorId",
     1,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(StubStepeMotorRequest, has_motorid),
-    offsetof(StubStepeMotorRequest, motorid),
+    offsetof(StubSteperMotorRequest, has_motorid),
+    offsetof(StubSteperMotorRequest, motorid),
     NULL,
     NULL,
     0,             /* flags */
@@ -71,8 +71,8 @@ static const ProtobufCFieldDescriptor stub__stepe_motor_request__field_descripto
     2,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_BOOL,
-    offsetof(StubStepeMotorRequest, has_start),
-    offsetof(StubStepeMotorRequest, start),
+    offsetof(StubSteperMotorRequest, has_start),
+    offsetof(StubSteperMotorRequest, start),
     NULL,
     NULL,
     0,             /* flags */
@@ -83,8 +83,8 @@ static const ProtobufCFieldDescriptor stub__stepe_motor_request__field_descripto
     3,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_BOOL,
-    offsetof(StubStepeMotorRequest, has_setdirection),
-    offsetof(StubStepeMotorRequest, setdirection),
+    offsetof(StubSteperMotorRequest, has_setdirection),
+    offsetof(StubSteperMotorRequest, setdirection),
     NULL,
     NULL,
     0,             /* flags */
@@ -94,9 +94,9 @@ static const ProtobufCFieldDescriptor stub__stepe_motor_request__field_descripto
     "SetMicrostepDivision",
     4,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_INT32,
-    offsetof(StubStepeMotorRequest, has_setmicrostepdivision),
-    offsetof(StubStepeMotorRequest, setmicrostepdivision),
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(StubSteperMotorRequest, has_setmicrostepdivision),
+    offsetof(StubSteperMotorRequest, setmicrostepdivision),
     NULL,
     NULL,
     0,             /* flags */
@@ -107,38 +107,38 @@ static const ProtobufCFieldDescriptor stub__stepe_motor_request__field_descripto
     5,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_INT32,
-    offsetof(StubStepeMotorRequest, has_setspeed),
-    offsetof(StubStepeMotorRequest, setspeed),
+    offsetof(StubSteperMotorRequest, has_setspeed),
+    offsetof(StubSteperMotorRequest, setspeed),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__stepe_motor_request__field_indices_by_name[] = {
+static const unsigned stub_steper_motor_request__field_indices_by_name[] = {
   0,   /* field[0] = MotorId */
   2,   /* field[2] = SetDirection */
   3,   /* field[3] = SetMicrostepDivision */
   4,   /* field[4] = SetSpeed */
   1,   /* field[1] = Start */
 };
-static const ProtobufCIntRange stub__stepe_motor_request__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_steper_motor_request__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 5 }
 };
-const ProtobufCMessageDescriptor stub__stepe_motor_request__descriptor =
+const ProtobufCMessageDescriptor stub_steper_motor_request__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_StepeMotorRequest",
-  "StubStepeMotorRequest",
-  "StubStepeMotorRequest",
+  "StubSteperMotorRequest",
+  "StubSteperMotorRequest",
+  "StubSteperMotorRequest",
   "",
-  sizeof(StubStepeMotorRequest),
+  sizeof(StubSteperMotorRequest),
   5,
-  stub__stepe_motor_request__field_descriptors,
-  stub__stepe_motor_request__field_indices_by_name,
-  1,  stub__stepe_motor_request__number_ranges,
-  (ProtobufCMessageInit) stub__stepe_motor_request__init,
+  stub_steper_motor_request__field_descriptors,
+  stub_steper_motor_request__field_indices_by_name,
+  1,  stub_steper_motor_request__number_ranges,
+  (ProtobufCMessageInit) stub_steper_motor_request__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_SteperMotorRequest.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubSteperMotorRequest.pb-c.h
index eb740b223..a7a771172 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_SteperMotorRequest.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubSteperMotorRequest.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_SteperMotorRequest.proto */
+/* Generated from: StubSteperMotorRequest.proto */
 
-#ifndef PROTOBUF_C_Stub_5fSteperMotorRequest_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fSteperMotorRequest_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubSteperMotorRequest_2eproto__INCLUDED
+#define PROTOBUF_C_StubSteperMotorRequest_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -15,7 +15,7 @@ PROTOBUF_C__BEGIN_DECLS
 #endif
 
 
-typedef struct _StubStepeMotorRequest StubStepeMotorRequest;
+typedef struct _StubSteperMotorRequest StubSteperMotorRequest;
 
 
 /* --- enums --- */
@@ -23,7 +23,7 @@ typedef struct _StubStepeMotorRequest StubStepeMotorRequest;
 
 /* --- messages --- */
 
-struct  _StubStepeMotorRequest
+struct  _StubSteperMotorRequest
 {
   ProtobufCMessage base;
   /*
@@ -45,41 +45,41 @@ struct  _StubStepeMotorRequest
    * No. of steps for 360 deg.
    */
   protobuf_c_boolean has_setmicrostepdivision;
-  int32_t setmicrostepdivision;
+  uint32_t setmicrostepdivision;
   /*
    * ?
    */
   protobuf_c_boolean has_setspeed;
   int32_t setspeed;
 };
-#define STUB__STEPE_MOTOR_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__stepe_motor_request__descriptor) \
+#define STUB_STEPER_MOTOR_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_steper_motor_request__descriptor) \
     , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
-/* StubStepeMotorRequest methods */
-void   stub__stepe_motor_request__init
-                     (StubStepeMotorRequest         *message);
-size_t stub__stepe_motor_request__get_packed_size
-                     (const StubStepeMotorRequest   *message);
-size_t stub__stepe_motor_request__pack
-                     (const StubStepeMotorRequest   *message,
+/* StubSteperMotorRequest methods */
+void   stub_steper_motor_request__init
+                     (StubSteperMotorRequest         *message);
+size_t stub_steper_motor_request__get_packed_size
+                     (const StubSteperMotorRequest   *message);
+size_t stub_steper_motor_request__pack
+                     (const StubSteperMotorRequest   *message,
                       uint8_t             *out);
-size_t stub__stepe_motor_request__pack_to_buffer
-                     (const StubStepeMotorRequest   *message,
+size_t stub_steper_motor_request__pack_to_buffer
+                     (const StubSteperMotorRequest   *message,
                       ProtobufCBuffer     *buffer);
-StubStepeMotorRequest *
-       stub__stepe_motor_request__unpack
+StubSteperMotorRequest *
+       stub_steper_motor_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__stepe_motor_request__free_unpacked
-                     (StubStepeMotorRequest *message,
+void   stub_steper_motor_request__free_unpacked
+                     (StubSteperMotorRequest *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
 
-typedef void (*StubStepeMotorRequest_Closure)
-                 (const StubStepeMotorRequest *message,
+typedef void (*StubSteperMotorRequest_Closure)
+                 (const StubSteperMotorRequest *message,
                   void *closure_data);
 
 /* --- services --- */
@@ -87,9 +87,9 @@ typedef void (*StubStepeMotorRequest_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__stepe_motor_request__descriptor;
+extern const ProtobufCMessageDescriptor stub_steper_motor_request__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fSteperMotorRequest_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubSteperMotorRequest_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_SteperMotorResponse.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubSteperMotorResponse.pb-c.c
index 62b443026..994bcda15 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_SteperMotorResponse.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubSteperMotorResponse.pb-c.c
@@ -1,58 +1,58 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_SteperMotorResponse.proto */
+/* Generated from: StubSteperMotorResponse.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_SteperMotorResponse.pb-c.h"
-void   stub__steper_motor_response__init
+#include "StubSteperMotorResponse.pb-c.h"
+void   stub_steper_motor_response__init
                      (StubSteperMotorResponse         *message)
 {
-  static const StubSteperMotorResponse init_value = STUB__STEPER_MOTOR_RESPONSE__INIT;
+  static const StubSteperMotorResponse init_value = STUB_STEPER_MOTOR_RESPONSE__INIT;
   *message = init_value;
 }
-size_t stub__steper_motor_response__get_packed_size
+size_t stub_steper_motor_response__get_packed_size
                      (const StubSteperMotorResponse *message)
 {
-  assert(message->base.descriptor == &stub__steper_motor_response__descriptor);
+  assert(message->base.descriptor == &stub_steper_motor_response__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__steper_motor_response__pack
+size_t stub_steper_motor_response__pack
                      (const StubSteperMotorResponse *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__steper_motor_response__descriptor);
+  assert(message->base.descriptor == &stub_steper_motor_response__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__steper_motor_response__pack_to_buffer
+size_t stub_steper_motor_response__pack_to_buffer
                      (const StubSteperMotorResponse *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__steper_motor_response__descriptor);
+  assert(message->base.descriptor == &stub_steper_motor_response__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubSteperMotorResponse *
-       stub__steper_motor_response__unpack
+       stub_steper_motor_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubSteperMotorResponse *)
-     protobuf_c_message_unpack (&stub__steper_motor_response__descriptor,
+     protobuf_c_message_unpack (&stub_steper_motor_response__descriptor,
                                 allocator, len, data);
 }
-void   stub__steper_motor_response__free_unpacked
+void   stub_steper_motor_response__free_unpacked
                      (StubSteperMotorResponse *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__steper_motor_response__descriptor);
+  assert(message->base.descriptor == &stub_steper_motor_response__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__steper_motor_response__field_descriptors[3] =
+static const ProtobufCFieldDescriptor stub_steper_motor_response__field_descriptors[3] =
 {
   {
     "MotorId",
@@ -91,28 +91,28 @@ static const ProtobufCFieldDescriptor stub__steper_motor_response__field_descrip
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__steper_motor_response__field_indices_by_name[] = {
+static const unsigned stub_steper_motor_response__field_indices_by_name[] = {
   0,   /* field[0] = MotorId */
   1,   /* field[1] = MotorVersion */
   2,   /* field[2] = Status */
 };
-static const ProtobufCIntRange stub__steper_motor_response__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_steper_motor_response__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 3 }
 };
-const ProtobufCMessageDescriptor stub__steper_motor_response__descriptor =
+const ProtobufCMessageDescriptor stub_steper_motor_response__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_SteperMotorResponse",
+  "StubSteperMotorResponse",
   "StubSteperMotorResponse",
   "StubSteperMotorResponse",
   "",
   sizeof(StubSteperMotorResponse),
   3,
-  stub__steper_motor_response__field_descriptors,
-  stub__steper_motor_response__field_indices_by_name,
-  1,  stub__steper_motor_response__number_ranges,
-  (ProtobufCMessageInit) stub__steper_motor_response__init,
+  stub_steper_motor_response__field_descriptors,
+  stub_steper_motor_response__field_indices_by_name,
+  1,  stub_steper_motor_response__number_ranges,
+  (ProtobufCMessageInit) stub_steper_motor_response__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_SteperMotorResponse.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubSteperMotorResponse.pb-c.h
index 9d35bc109..978fb8b2c 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_SteperMotorResponse.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubSteperMotorResponse.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_SteperMotorResponse.proto */
+/* Generated from: StubSteperMotorResponse.proto */
 
-#ifndef PROTOBUF_C_Stub_5fSteperMotorResponse_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fSteperMotorResponse_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubSteperMotorResponse_2eproto__INCLUDED
+#define PROTOBUF_C_StubSteperMotorResponse_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -41,28 +41,28 @@ struct  _StubSteperMotorResponse
   protobuf_c_boolean has_status;
   protobuf_c_boolean status;
 };
-#define STUB__STEPER_MOTOR_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__steper_motor_response__descriptor) \
+#define STUB_STEPER_MOTOR_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_steper_motor_response__descriptor) \
     , 0, 0, 0, 0, 0, 0 }
 
 
 /* StubSteperMotorResponse methods */
-void   stub__steper_motor_response__init
+void   stub_steper_motor_response__init
                      (StubSteperMotorResponse         *message);
-size_t stub__steper_motor_response__get_packed_size
+size_t stub_steper_motor_response__get_packed_size
                      (const StubSteperMotorResponse   *message);
-size_t stub__steper_motor_response__pack
+size_t stub_steper_motor_response__pack
                      (const StubSteperMotorResponse   *message,
                       uint8_t             *out);
-size_t stub__steper_motor_response__pack_to_buffer
+size_t stub_steper_motor_response__pack_to_buffer
                      (const StubSteperMotorResponse   *message,
                       ProtobufCBuffer     *buffer);
 StubSteperMotorResponse *
-       stub__steper_motor_response__unpack
+       stub_steper_motor_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__steper_motor_response__free_unpacked
+void   stub_steper_motor_response__free_unpacked
                      (StubSteperMotorResponse *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -76,9 +76,9 @@ typedef void (*StubSteperMotorResponse_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__steper_motor_response__descriptor;
+extern const ProtobufCMessageDescriptor stub_steper_motor_response__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fSteperMotorResponse_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubSteperMotorResponse_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_ValveRequest.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubValveRequest.pb-c.c
index 0fc776c5c..6e1bc168f 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_ValveRequest.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubValveRequest.pb-c.c
@@ -1,58 +1,58 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_ValveRequest.proto */
+/* Generated from: StubValveRequest.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_ValveRequest.pb-c.h"
-void   stub__valve_request__init
+#include "StubValveRequest.pb-c.h"
+void   stub_valve_request__init
                      (StubValveRequest         *message)
 {
-  static const StubValveRequest init_value = STUB__VALVE_REQUEST__INIT;
+  static const StubValveRequest init_value = STUB_VALVE_REQUEST__INIT;
   *message = init_value;
 }
-size_t stub__valve_request__get_packed_size
+size_t stub_valve_request__get_packed_size
                      (const StubValveRequest *message)
 {
-  assert(message->base.descriptor == &stub__valve_request__descriptor);
+  assert(message->base.descriptor == &stub_valve_request__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__valve_request__pack
+size_t stub_valve_request__pack
                      (const StubValveRequest *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__valve_request__descriptor);
+  assert(message->base.descriptor == &stub_valve_request__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__valve_request__pack_to_buffer
+size_t stub_valve_request__pack_to_buffer
                      (const StubValveRequest *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__valve_request__descriptor);
+  assert(message->base.descriptor == &stub_valve_request__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubValveRequest *
-       stub__valve_request__unpack
+       stub_valve_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubValveRequest *)
-     protobuf_c_message_unpack (&stub__valve_request__descriptor,
+     protobuf_c_message_unpack (&stub_valve_request__descriptor,
                                 allocator, len, data);
 }
-void   stub__valve_request__free_unpacked
+void   stub_valve_request__free_unpacked
                      (StubValveRequest *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__valve_request__descriptor);
+  assert(message->base.descriptor == &stub_valve_request__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__valve_request__field_descriptors[3] =
+static const ProtobufCFieldDescriptor stub_valve_request__field_descriptors[3] =
 {
   {
     "ValveId",
@@ -91,28 +91,28 @@ static const ProtobufCFieldDescriptor stub__valve_request__field_descriptors[3]
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__valve_request__field_indices_by_name[] = {
+static const unsigned stub_valve_request__field_indices_by_name[] = {
   1,   /* field[1] = Inkflow */
   0,   /* field[0] = ValveId */
   2,   /* field[2] = ValveOn */
 };
-static const ProtobufCIntRange stub__valve_request__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_valve_request__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 3 }
 };
-const ProtobufCMessageDescriptor stub__valve_request__descriptor =
+const ProtobufCMessageDescriptor stub_valve_request__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_ValveRequest",
+  "StubValveRequest",
   "StubValveRequest",
   "StubValveRequest",
   "",
   sizeof(StubValveRequest),
   3,
-  stub__valve_request__field_descriptors,
-  stub__valve_request__field_indices_by_name,
-  1,  stub__valve_request__number_ranges,
-  (ProtobufCMessageInit) stub__valve_request__init,
+  stub_valve_request__field_descriptors,
+  stub_valve_request__field_indices_by_name,
+  1,  stub_valve_request__number_ranges,
+  (ProtobufCMessageInit) stub_valve_request__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_ValveRequest.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubValveRequest.pb-c.h
index da468f7b2..9a730b4d0 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_ValveRequest.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubValveRequest.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_ValveRequest.proto */
+/* Generated from: StubValveRequest.proto */
 
-#ifndef PROTOBUF_C_Stub_5fValveRequest_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fValveRequest_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubValveRequest_2eproto__INCLUDED
+#define PROTOBUF_C_StubValveRequest_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -27,43 +27,43 @@ struct  _StubValveRequest
 {
   ProtobufCMessage base;
   /*
-   *0..19
+   * 0..19
    */
   protobuf_c_boolean has_valveid;
   uint32_t valveid;
   /*
-   *0-Min
+   *0 - Min
    */
   protobuf_c_boolean has_inkflow;
   uint32_t inkflow;
   /*
-   * 0-Off 1-On
+   *0-Off 1-On
    */
   protobuf_c_boolean has_valveon;
   protobuf_c_boolean valveon;
 };
-#define STUB__VALVE_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__valve_request__descriptor) \
+#define STUB_VALVE_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_valve_request__descriptor) \
     , 0, 0, 0, 0, 0, 0 }
 
 
 /* StubValveRequest methods */
-void   stub__valve_request__init
+void   stub_valve_request__init
                      (StubValveRequest         *message);
-size_t stub__valve_request__get_packed_size
+size_t stub_valve_request__get_packed_size
                      (const StubValveRequest   *message);
-size_t stub__valve_request__pack
+size_t stub_valve_request__pack
                      (const StubValveRequest   *message,
                       uint8_t             *out);
-size_t stub__valve_request__pack_to_buffer
+size_t stub_valve_request__pack_to_buffer
                      (const StubValveRequest   *message,
                       ProtobufCBuffer     *buffer);
 StubValveRequest *
-       stub__valve_request__unpack
+       stub_valve_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__valve_request__free_unpacked
+void   stub_valve_request__free_unpacked
                      (StubValveRequest *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -77,9 +77,9 @@ typedef void (*StubValveRequest_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__valve_request__descriptor;
+extern const ProtobufCMessageDescriptor stub_valve_request__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fValveRequest_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubValveRequest_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_ValveResponse.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubValveResponse.pb-c.c
index 1f998eebb..4fbed304f 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_ValveResponse.pb-c.c
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubValveResponse.pb-c.c
@@ -1,58 +1,58 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_ValveResponse.proto */
+/* Generated from: StubValveResponse.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "Stub_ValveResponse.pb-c.h"
-void   stub__valve_response__init
+#include "StubValveResponse.pb-c.h"
+void   stub_valve_response__init
                      (StubValveResponse         *message)
 {
-  static const StubValveResponse init_value = STUB__VALVE_RESPONSE__INIT;
+  static const StubValveResponse init_value = STUB_VALVE_RESPONSE__INIT;
   *message = init_value;
 }
-size_t stub__valve_response__get_packed_size
+size_t stub_valve_response__get_packed_size
                      (const StubValveResponse *message)
 {
-  assert(message->base.descriptor == &stub__valve_response__descriptor);
+  assert(message->base.descriptor == &stub_valve_response__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t stub__valve_response__pack
+size_t stub_valve_response__pack
                      (const StubValveResponse *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &stub__valve_response__descriptor);
+  assert(message->base.descriptor == &stub_valve_response__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t stub__valve_response__pack_to_buffer
+size_t stub_valve_response__pack_to_buffer
                      (const StubValveResponse *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &stub__valve_response__descriptor);
+  assert(message->base.descriptor == &stub_valve_response__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 StubValveResponse *
-       stub__valve_response__unpack
+       stub_valve_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
   return (StubValveResponse *)
-     protobuf_c_message_unpack (&stub__valve_response__descriptor,
+     protobuf_c_message_unpack (&stub_valve_response__descriptor,
                                 allocator, len, data);
 }
-void   stub__valve_response__free_unpacked
+void   stub_valve_response__free_unpacked
                      (StubValveResponse *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &stub__valve_response__descriptor);
+  assert(message->base.descriptor == &stub_valve_response__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor stub__valve_response__field_descriptors[1] =
+static const ProtobufCFieldDescriptor stub_valve_response__field_descriptors[1] =
 {
   {
     "Status",
@@ -67,26 +67,26 @@ static const ProtobufCFieldDescriptor stub__valve_response__field_descriptors[1]
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned stub__valve_response__field_indices_by_name[] = {
+static const unsigned stub_valve_response__field_indices_by_name[] = {
   0,   /* field[0] = Status */
 };
-static const ProtobufCIntRange stub__valve_response__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_valve_response__number_ranges[1 + 1] =
 {
   { 3, 0 },
   { 0, 1 }
 };
-const ProtobufCMessageDescriptor stub__valve_response__descriptor =
+const ProtobufCMessageDescriptor stub_valve_response__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_ValveResponse",
+  "StubValveResponse",
   "StubValveResponse",
   "StubValveResponse",
   "",
   sizeof(StubValveResponse),
   1,
-  stub__valve_response__field_descriptors,
-  stub__valve_response__field_indices_by_name,
-  1,  stub__valve_response__number_ranges,
-  (ProtobufCMessageInit) stub__valve_response__init,
+  stub_valve_response__field_descriptors,
+  stub_valve_response__field_indices_by_name,
+  1,  stub_valve_response__number_ranges,
+  (ProtobufCMessageInit) stub_valve_response__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_ValveResponse.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubValveResponse.pb-c.h
index 95a59bcbc..1949b4602 100644
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_ValveResponse.pb-c.h
+++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/StubValveResponse.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_ValveResponse.proto */
+/* Generated from: StubValveResponse.proto */
 
-#ifndef PROTOBUF_C_Stub_5fValveResponse_2eproto__INCLUDED
-#define PROTOBUF_C_Stub_5fValveResponse_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubValveResponse_2eproto__INCLUDED
+#define PROTOBUF_C_StubValveResponse_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -32,28 +32,28 @@ struct  _StubValveResponse
   protobuf_c_boolean has_status;
   protobuf_c_boolean status;
 };
-#define STUB__VALVE_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stub__valve_response__descriptor) \
+#define STUB_VALVE_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_valve_response__descriptor) \
     , 0, 0 }
 
 
 /* StubValveResponse methods */
-void   stub__valve_response__init
+void   stub_valve_response__init
                      (StubValveResponse         *message);
-size_t stub__valve_response__get_packed_size
+size_t stub_valve_response__get_packed_size
                      (const StubValveResponse   *message);
-size_t stub__valve_response__pack
+size_t stub_valve_response__pack
                      (const StubValveResponse   *message,
                       uint8_t             *out);
-size_t stub__valve_response__pack_to_buffer
+size_t stub_valve_response__pack_to_buffer
                      (const StubValveResponse   *message,
                       ProtobufCBuffer     *buffer);
 StubValveResponse *
-       stub__valve_response__unpack
+       stub_valve_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   stub__valve_response__free_unpacked
+void   stub_valve_response__free_unpacked
                      (StubValveResponse *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
@@ -67,9 +67,9 @@ typedef void (*StubValveResponse_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor stub__valve_response__descriptor;
+extern const ProtobufCMessageDescriptor stub_valve_response__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_Stub_5fValveResponse_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubValveResponse_2eproto__INCLUDED */
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Cartridge.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Cartridge.c
deleted file mode 100644
index e69de29bb..000000000
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Cartridge.c
+++ /dev/null
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Cartridge.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Cartridge.h
deleted file mode 100644
index e69de29bb..000000000
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Cartridge.h
+++ /dev/null
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Dispenser.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Dispenser.c
deleted file mode 100644
index 0f7b90e8c..000000000
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Dispenser.c
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "inc/hw_memmap.h"
-#include "inc/hw_types.h"
-#include "inc/hw_uart.h"
-#include "driverlib/gpio.h"
-
-#include "MessageContainer.pb-c.h"
-
-#include "Stub_DispenserResponse.pb-c.h"
-#include "Stub_DispenserRequest.pb-c.h"
-
-MessageContainer createContainer(MessageType type, char* token, protobuf_c_boolean completed, void* response, size_t (*packPtr)(void*, uint8_t*), size_t (*sizePtr)(void*));
-
-void Stub_DispenserRequest(MessageContainer* requestContainer)
-{
-    MessageContainer responseContainer;
-
-    StubDispenserRequest* request = stub__dispenser_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
-
-
-              
-
-
-    StubDispenserResponse response =   STUB__DISPENSER_RESPONSE__INIT;
-
-    responseContainer = createContainer(MESSAGE_TYPE__Stub_DispenserResponse, requestContainer->token, true, &response, &stub__dispenser_response__pack, &stub__dispenser_response__get_packed_size);
-
-    //-------------------------------------------------------------------------------------------
-    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
-    size_t container_size = message_container__pack(&responseContainer, container_buffer);
-    SendChars((char*)container_buffer, container_size);
-    free(container_buffer);
-    free(requestContainer);
-}
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Dispenser.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Dispenser.h
deleted file mode 100644
index b9f82d577..000000000
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Dispenser.h
+++ /dev/null
@@ -1 +0,0 @@
-void Stub_DispenserRequest(MessageContainer* requestContainer);
\ No newline at end of file
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIO.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIO.c
deleted file mode 100644
index c9d713b60..000000000
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIO.c
+++ /dev/null
@@ -1,191 +0,0 @@
-
-
-//#include <protobuf-c/person-pb-c.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-//#include "inc/hw_ints.h"
-#include "inc/hw_memmap.h"
-#include "inc/hw_types.h"
-#include "inc/hw_uart.h"
-#include "driverlib/gpio.h"
-
-#include "MessageContainer.pb-c.h"
-
-#include "Stub_GPIOWriteBitRequest.pb-c.h"
-#include "Stub_GPIOWriteBitResponse.pb-c.h"
-#include "Stub_GPIOReadByteResponse.pb-c.h"
-#include "Stub_GPIOReadByteRequest.pb-c.h"
-
-MessageContainer createContainer(MessageType type, char* token, protobuf_c_boolean completed, void* response, size_t (*packPtr)(void*, uint8_t*), size_t (*sizePtr)(void*));
-
-void Stub_GPIOWriteBitRequest(MessageContainer* requestContainer)
-{
-    MessageContainer responseContainer;
-
-    StubGPIOWriteBitRequest* request =  stub__gpiowrite_bit_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
-
-
-              uint8_t PinId;
-              uint32_t PortId;
-
-              switch(request->pinid)
-              {
-                  case 0:
-                      PinId = GPIO_PIN_0;
-                      break;
-                  case 1:
-                      PinId = GPIO_PIN_1;
-                      break;
-                  case 2:
-                      PinId = GPIO_PIN_2;
-                      break;
-                  case 3:
-                      PinId = GPIO_PIN_3;
-                      break;
-                  case 4:
-                      PinId = GPIO_PIN_4;
-                      break;
-                  case 5:
-                      PinId = GPIO_PIN_5;
-                      break;
-                  case 6:
-                      PinId = GPIO_PIN_6;
-                      break;
-                  case 7:
-                      PinId = GPIO_PIN_7;
-                      break;
-                  default:
-                      break;
-              }
-
-              switch(request->portid)
-              {
-                  case 0:
-                      PortId = GPIO_PORTA_BASE;
-                      break;
-                  case 1:
-                      PortId = GPIO_PORTB_BASE;
-                      break;
-                  case 2:
-                      PortId = GPIO_PORTC_BASE;
-                      break;
-                  case 3:
-                      PortId = GPIO_PORTD_BASE;
-                      break;
-                  case 4:
-                      PortId = GPIO_PORTE_BASE;
-                      break;
-                  case 5:
-                      PortId = GPIO_PORTF_BASE;
-                      break;
-                  case 6:
-                      PortId = GPIO_PORTH_BASE;
-                      break;
-                  case 7:
-                      PortId = GPIO_PORTK_BASE;
-                      break;
-                  case 8:
-                      PortId = GPIO_PORTL_BASE;
-                      break;
-                  case 9:
-                      PortId = GPIO_PORTM_BASE;
-                      break;
-                  case 11:
-                      PortId = GPIO_PORTN_BASE;
-                      break;
-                  case 12:
-                      PortId = GPIO_PORTP_BASE;
-                      break;
-                  case 13:
-                      PortId = GPIO_PORTQ_BASE;
-                      break;
-
-                  default:
-                      break;
-              }
-
-              GPIOPinWrite(PortId, PinId, PinId*request->bittowrite);//
-
-              StubGPIOWriteBitResponse response = STUB__GPIOWRITE_BIT_RESPONSE__INIT;
-
-              responseContainer = createContainer(MESSAGE_TYPE__Stub_GPIOWriteBitResponse, requestContainer->token, true, &response, &stub__gpiowrite_bit_response__pack, &stub__gpiowrite_bit_response__get_packed_size);
-
-              //-------------------------------------------------------------------------------------------
-              uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
-              size_t container_size = message_container__pack(&responseContainer, container_buffer);
-              SendChars((char*)container_buffer, container_size);
-              free(container_buffer);
-              free(requestContainer);
-}
-
-
-void Stub_GPIOReadByteRequest(MessageContainer* requestContainer)
-{
-    MessageContainer responseContainer;
-
-    StubGPIOReadByteRequest* request =  stub__gpiowrite_bit_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
-
-    uint32_t PortId;
-
-    switch(request->portid)
-    {
-        case 0:
-            PortId = GPIO_PORTA_BASE;
-            break;
-        case 1:
-            PortId = GPIO_PORTB_BASE;
-            break;
-        case 2:
-            PortId = GPIO_PORTC_BASE;
-            break;
-        case 3:
-            PortId = GPIO_PORTD_BASE;
-            break;
-        case 4:
-            PortId = GPIO_PORTE_BASE;
-            break;
-        case 5:
-            PortId = GPIO_PORTF_BASE;
-            break;
-        case 6:
-            PortId = GPIO_PORTH_BASE;
-            break;
-        case 7:
-            PortId = GPIO_PORTK_BASE;
-            break;
-        case 8:
-            PortId = GPIO_PORTL_BASE;
-            break;
-        case 9:
-            PortId = GPIO_PORTM_BASE;
-            break;
-        case 11:
-            PortId = GPIO_PORTN_BASE;
-            break;
-        case 12:
-            PortId = GPIO_PORTP_BASE;
-            break;
-        case 13:
-            PortId = GPIO_PORTQ_BASE;
-            break;
-
-        default:
-            break;
-    }
-
-
-    StubGPIOReadByteResponse response = STUB__GPIOREAD_BYTE_RESPONSE__INIT;
-
-    responseContainer = createContainer(MESSAGE_TYPE__Stub_GPIOReadByteResponse, requestContainer->token, true, &response, &stub__gpioread_byte_response__pack, &stub__gpioread_byte_response__get_packed_size);
-
-    //-------------------------------------------------------------------------------------------
-    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
-    size_t container_size = message_container__pack(&responseContainer, container_buffer);
-    SendChars((char*)container_buffer, container_size);
-    free(container_buffer);
-    free(requestContainer);
-}
-
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIO.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIO.h
deleted file mode 100644
index 03e5d0f99..000000000
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIO.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "MessageContainer.pb-c.h"
-
-void Stub_GPIOWriteBitRequest(MessageContainer* requestContainer);
-void Stub_GPIOReadByteRequest(MessageContainer* requestContainer);
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOReadBitRequest.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOReadBitRequest.pb-c.c
deleted file mode 100644
index 2961fe9dc..000000000
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_GPIOReadBitRequest.pb-c.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: Stub_GPIOReadBitRequest.proto */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C__NO_DEPRECATED
-#define PROTOBUF_C__NO_DEPRECATED
-#endif
-
-#include "Stub_GPIOReadBitRequest.pb-c.h"
-void   stub__gpioread_bit_request__init
-                     (StubGPIOReadBitRequest         *message)
-{
-  static const StubGPIOReadBitRequest init_value = STUB__GPIOREAD_BIT_REQUEST__INIT;
-  *message = init_value;
-}
-size_t stub__gpioread_bit_request__get_packed_size
-                     (const StubGPIOReadBitRequest *message)
-{
-  assert(message->base.descriptor == &stub__gpioread_bit_request__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t stub__gpioread_bit_request__pack
-                     (const StubGPIOReadBitRequest *message,
-                      uint8_t       *out)
-{
-  assert(message->base.descriptor == &stub__gpioread_bit_request__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t stub__gpioread_bit_request__pack_to_buffer
-                     (const StubGPIOReadBitRequest *message,
-                      ProtobufCBuffer *buffer)
-{
-  assert(message->base.descriptor == &stub__gpioread_bit_request__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-StubGPIOReadBitRequest *
-       stub__gpioread_bit_request__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (StubGPIOReadBitRequest *)
-     protobuf_c_message_unpack (&stub__gpioread_bit_request__descriptor,
-                                allocator, len, data);
-}
-void   stub__gpioread_bit_request__free_unpacked
-                     (StubGPIOReadBitRequest *message,
-                      ProtobufCAllocator *allocator)
-{
-  if(!message)
-    return;
-  assert(message->base.descriptor == &stub__gpioread_bit_request__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-static const ProtobufCFieldDescriptor stub__gpioread_bit_request__field_descriptors[2] =
-{
-  {
-    "PortId",
-    1,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(StubGPIOReadBitRequest, has_portid),
-    offsetof(StubGPIOReadBitRequest, portid),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "PinId",
-    2,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(StubGPIOReadBitRequest, has_pinid),
-    offsetof(StubGPIOReadBitRequest, pinid),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-};
-static const unsigned stub__gpioread_bit_request__field_indices_by_name[] = {
-  1,   /* field[1] = PinId */
-  0,   /* field[0] = PortId */
-};
-static const ProtobufCIntRange stub__gpioread_bit_request__number_ranges[1 + 1] =
-{
-  { 1, 0 },
-  { 0, 2 }
-};
-const ProtobufCMessageDescriptor stub__gpioread_bit_request__descriptor =
-{
-  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "Stub_GPIOReadBitRequest",
-  "StubGPIOReadBitRequest",
-  "StubGPIOReadBitRequest",
-  "",
-  sizeof(StubGPIOReadBitRequest),
-  2,
-  stub__gpioread_bit_request__field_descriptors,
-  stub__gpioread_bit_request__field_indices_by_name,
-  1,  stub__gpioread_bit_request__number_ranges,
-  (ProtobufCMessageInit) stub__gpioread_bit_request__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Heater.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Heater.c
deleted file mode 100644
index 4069ee0d4..000000000
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Heater.c
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "inc/hw_memmap.h"
-#include "inc/hw_types.h"
-#include "inc/hw_uart.h"
-#include "driverlib/gpio.h"
-
-#include "MessageContainer.pb-c.h"
-
-#include "Stub_HeaterResponse.pb-c.h"
-#include "Stub_HeaterRequest.pb-c.h"
-
-MessageContainer createContainer(MessageType type, char* token, protobuf_c_boolean completed, void* response, size_t (*packPtr)(void*, uint8_t*), size_t (*sizePtr)(void*));
-
-void Stub_HeaterRequest(MessageContainer* requestContainer)
-{
-    MessageContainer responseContainer;
-
-    StubHeaterRequest* request = stub__heater_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
-
-
-              
-
-
-    StubHeaterResponse response =   STUB__HEATER_RESPONSE__INIT;
-
-    responseContainer = createContainer(MESSAGE_TYPE__Stub_HeaterResponse, requestContainer->token, true, &response, &stub__heater_response__pack, &stub__heater_response__get_packed_size);
-
-    //-------------------------------------------------------------------------------------------
-    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
-    size_t container_size = message_container__pack(&responseContainer, container_buffer);
-    SendChars((char*)container_buffer, container_size);
-    free(container_buffer);
-    free(requestContainer);
-}
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Heater.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Heater.h
deleted file mode 100644
index 5443c187f..000000000
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Heater.h
+++ /dev/null
@@ -1 +0,0 @@
-void Stub_HeaterRequest(MessageContainer* requestContainer);
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_MotorEncoder.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_MotorEncoder.c
deleted file mode 100644
index 2045d473d..000000000
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_MotorEncoder.c
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "inc/hw_memmap.h"
-#include "inc/hw_types.h"
-#include "inc/hw_uart.h"
-#include "driverlib/gpio.h"
-
-#include "MessageContainer.pb-c.h"
-
-#include "Stub_MotorEncoderResponse.pb-c.h"
-#include "Stub_MotorEncoderRequest.pb-c.h"
-
-MessageContainer createContainer(MessageType type, char* token, protobuf_c_boolean completed, void* response, size_t (*packPtr)(void*, uint8_t*), size_t (*sizePtr)(void*));
-
-void Stub_MotorEncoderRequest(MessageContainer* requestContainer)
-{
-    MessageContainer responseContainer;
-
-    StubMotorEncoderRequest* request = stub__motor_encoder_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
-
-
-              
-
-
-    StubMotorEncoderResponse response =   STUB__MOTOR_ENCODER_RESPONSE__INIT;
-
-    responseContainer = createContainer(MESSAGE_TYPE__Stub_MotorEncoderResponse, requestContainer->token, true, &response, &stub__motor_encoder_response__pack, &stub__motor_encoder_response__get_packed_size);
-
-    //-------------------------------------------------------------------------------------------
-    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
-    size_t container_size = message_container__pack(&responseContainer, container_buffer);
-    SendChars((char*)container_buffer, container_size);
-    free(container_buffer);
-    free(requestContainer);
-}
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_MotorEncoder.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_MotorEncoder.h
deleted file mode 100644
index 586867d5a..000000000
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_MotorEncoder.h
+++ /dev/null
@@ -1 +0,0 @@
-void Stub_MotorEncoderRequest(MessageContainer* requestContainer);
\ No newline at end of file
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_OptLimitSwitch.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_OptLimitSwitch.c
deleted file mode 100644
index 29a16e4ed..000000000
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_OptLimitSwitch.c
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "inc/hw_memmap.h"
-#include "inc/hw_types.h"
-#include "inc/hw_uart.h"
-#include "driverlib/gpio.h"
-
-#include "MessageContainer.pb-c.h"
-
-#include "Stub_OptLimitSwitchResponse.pb-c.h"
-#include "Stub_OptLimitSwitchRequest.pb-c.h"
-
-MessageContainer createContainer(MessageType type, char* token, protobuf_c_boolean completed, void* response, size_t (*packPtr)(void*, uint8_t*), size_t (*sizePtr)(void*));
-
-void Stub_OptLimitSwitchRequest(MessageContainer* requestContainer)
-{
-    MessageContainer responseContainer;
-
-    StubOptLimitSwitchRequest* request = stub__opt_limit_switch_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
-
-
-              
-
-
-    StubOptLimitSwitchResponse response =   STUB__OPT_LIMIT_SWITCH_RESPONSE__INIT;
-
-    responseContainer = createContainer(MESSAGE_TYPE__Stub_OptLimitSwitchResponse, requestContainer->token, true, &response, &stub__opt_limit_switch_response__pack, &stub__opt_limit_switch_response__get_packed_size);
-
-    //-------------------------------------------------------------------------------------------
-    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
-    size_t container_size = message_container__pack(&responseContainer, container_buffer);
-    SendChars((char*)container_buffer, container_size);
-    free(container_buffer);
-    free(requestContainer);
-}
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_OptLimitSwitch.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_OptLimitSwitch.h
deleted file mode 100644
index b38eaf8c8..000000000
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_OptLimitSwitch.h
+++ /dev/null
@@ -1 +0,0 @@
-void Stub_OptLimitSwitchRequest(MessageContainer* requestContainer);
\ No newline at end of file
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_SteperMotor.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_SteperMotor.c
deleted file mode 100644
index 4dbe27e6a..000000000
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_SteperMotor.c
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "inc/hw_memmap.h"
-#include "inc/hw_types.h"
-#include "inc/hw_uart.h"
-#include "driverlib/gpio.h"
-
-#include "MessageContainer.pb-c.h"
-
-#include "Stub_SteperMotorRequest.pb-c.h"
-#include "Stub_SteperMotorResponse.pb-c.h"
-
-MessageContainer createContainer(MessageType type, char* token, protobuf_c_boolean completed, void* response, size_t (*packPtr)(void*, uint8_t*), size_t (*sizePtr)(void*));
-
-void Stub_SteperMotorRequest(MessageContainer* requestContainer)
-{
-    MessageContainer responseContainer;
-
-    StubStepeMotorRequest* request = stub__stepe_motor_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
-
-
-              
-
-
-    StubSteperMotorResponse response =   STUB__STEPER_MOTOR_RESPONSE__INIT;
-
-    responseContainer = createContainer(MESSAGE_TYPE__Stub_SteperMotorResponse, requestContainer->token, true, &response, &stub__steper_motor_response__pack, &stub__steper_motor_response__get_packed_size);
-
-    //-------------------------------------------------------------------------------------------
-    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
-    size_t container_size = message_container__pack(&responseContainer, container_buffer);
-    SendChars((char*)container_buffer, container_size);
-    free(container_buffer);
-    free(requestContainer);
-}
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_SteperMotor.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_SteperMotor.h
deleted file mode 100644
index 91d940ada..000000000
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_SteperMotor.h
+++ /dev/null
@@ -1 +0,0 @@
-void Stub_SteperMotorRequest(MessageContainer* requestContainer);
\ No newline at end of file
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Valve.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Valve.c
deleted file mode 100644
index 2fea0d945..000000000
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Valve.c
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "inc/hw_memmap.h"
-#include "inc/hw_types.h"
-#include "inc/hw_uart.h"
-#include "driverlib/gpio.h"
-
-#include "MessageContainer.pb-c.h"
-
-#include "Stub_ValveResponse.pb-c.h"
-#include "Stub_ValveRequest.pb-c.h"
-
-MessageContainer createContainer(MessageType type, char* token, protobuf_c_boolean completed, void* response, size_t (*packPtr)(void*, uint8_t*), size_t (*sizePtr)(void*));
-
-void Stub_ValveRequest(MessageContainer* requestContainer)
-{
-    MessageContainer responseContainer;
-
-    StubValveRequest* request = stub__valve_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
-
-
-              
-
-
-    StubValveResponse response =   STUB__VALVE_RESPONSE__INIT;
-
-    responseContainer = createContainer(MESSAGE_TYPE__Stub_ValveResponse, requestContainer->token, true, &response, &stub__valve_response__pack, &stub__valve_request__get_packed_size);
-
-    //-------------------------------------------------------------------------------------------
-    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
-    size_t container_size = message_container__pack(&responseContainer, container_buffer);
-    SendChars((char*)container_buffer, container_size);
-    free(container_buffer);
-    free(requestContainer);
-}
diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Valve.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Valve.h
deleted file mode 100644
index e5ca78a86..000000000
--- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/Stub_Valve.h
+++ /dev/null
@@ -1 +0,0 @@
-void Stub_ValveRequest(MessageContainer* requestContainer);
\ No newline at end of file
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Calculate.c b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Calculate.c
new file mode 100644
index 000000000..6bd5cb703
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Calculate.c
@@ -0,0 +1,49 @@
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <Stubs_Handler/DataDef.h>
+
+#include "inc/hw_memmap.h"
+#include "inc/hw_types.h"
+#include "inc/hw_uart.h"
+#include "driverlib/gpio.h"
+
+#include "usb_serial_adapter.h"
+#include "graphics_adapter.h"
+#include "MessageContainer.pb-c.h"
+#include "CalculateRequest.pb-c.h"
+#include "CalculateResponse.pb-c.h"
+
+#include "Container.h"
+
+void Stub_CalculateRequest(MessageContainer* requestContainer)
+{
+    MessageContainer responseContainer;
+
+    CalculateRequest* request = calculate_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+
+    writeLine("Calculate Request: ");
+    writeFloat(request->a);
+    writeString(" + ");
+    writeFloat(request->b);
+
+    CalculateResponse response = CALCULATE_RESPONSE__INIT;
+    response.sum = request->a + request->b;
+    response.has_sum = true;
+
+    responseContainer = createContainer(MESSAGE_TYPE__CalculateResponse, requestContainer->token, true, &response, &calculate_response__pack, &calculate_response__get_packed_size);
+
+    writeLine("Sending Response: ");
+    writeFloat(response.sum);
+
+    free(request);
+
+    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    size_t container_size = message_container__pack(&responseContainer, container_buffer);
+    SendChars((char*)container_buffer, container_size);
+    free(container_buffer);
+    free(requestContainer);
+}
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Calculate.h b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Calculate.h
new file mode 100644
index 000000000..cf3ad9b47
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Calculate.h
@@ -0,0 +1,8 @@
+#ifndef STUB_CALCULATE_H
+#define STUB_CALCULATE_H
+
+#include "MessageContainer.pb-c.h"
+void Stub_CalculateRequest(MessageContainer* requestContainer);
+
+#endif //STUB_CALCULATE_H
+
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Container.c b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Container.c
new file mode 100644
index 000000000..823ecb71a
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Container.c
@@ -0,0 +1,114 @@
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <Stubs_Handler/DataDef.h>
+
+#include "inc/hw_memmap.h"
+#include "inc/hw_types.h"
+#include "inc/hw_uart.h"
+#include "driverlib/gpio.h"
+
+#include "usb_serial_adapter.h"
+#include "graphics_adapter.h"
+#include "MessageContainer.pb-c.h"
+
+#include "Calculate.h"
+#include "Progress.h"
+#include "Stub_Cartridge.h"
+#include "Stub_Dispenser.h"
+#include "Stub_GPIO.h"
+#include "Stub_Heater.h"
+#include "Stub_MotorEncoder.h"
+#include "Stub_OptLimitSwitch.h"
+#include "Stub_SteperMotor.h"
+#include "Stub_Valve.h"
+
+MessageContainer createContainer(MessageType type, char* token, protobuf_c_boolean completed, void* response, size_t (*packPtr)(void*, uint8_t*), size_t (*sizePtr)(void*))
+{
+    MessageContainer container = MESSAGE_CONTAINER__INIT;
+    container.completed = completed;
+    container.token = token;
+    container.has_completed = true;
+    container.has_data = true;
+    container.has_type = true;
+    container.type = type;
+
+
+
+    uint8_t* response_buffer = malloc((*sizePtr)(response));
+    size_t response_size = (*packPtr)(response, response_buffer);
+    container.data.data = response_buffer;
+    container.data.len = response_size;
+
+    free(response);
+    return container;
+}
+
+void receive_callback(char* buffer, size_t length)
+{
+     //SendChars(buffer,length);
+     //draw_string(buffer, length);
+     //draw_image((uint8_t *)buffer);
+
+     writeLine("Received ");
+     writeFloat(length);
+     writeString(" bytes");
+     writeLine("Parsing message...");
+
+     MessageContainer* requestContainer = message_container__unpack(NULL, length, (uint8_t*)buffer);
+
+     switch(requestContainer->type)
+     {
+         case MESSAGE_TYPE__CalculateRequest:
+             Stub_CalculateRequest(requestContainer);
+             break;
+         case MESSAGE_TYPE__ProgressRequest:
+             Stub_ProgressRequest(requestContainer);
+             break;
+         case MESSAGE_TYPE__StubCartridgeReadRequest:
+             Stub_CartridgeReadRequest(requestContainer);
+             break;
+         case MESSAGE_TYPE__StubCartridgeWriteRequest:
+             Stub_CartridgeWriteRequest(requestContainer);
+             break;
+         case MESSAGE_TYPE__StubDispenserRequest:
+             Stub_DispenserRequest(requestContainer);
+             break;
+         case MESSAGE_TYPE__StubGPIOInputSetupRequest:
+             Stub_GPIOInputSetupRequest(requestContainer);
+             break;
+         case MESSAGE_TYPE__StubGPIOReadBitRequest:
+             Stub_GPIOReadBitRequest(requestContainer);
+             break;
+         case MESSAGE_TYPE__StubGPIOReadByteRequest:
+             Stub_GPIOReadByteRequest(requestContainer);
+             break;
+         case MESSAGE_TYPE__StubGPIOWriteBitRequest:
+             Stub_GPIOWriteBitRequest(requestContainer);
+             break;
+         case MESSAGE_TYPE__StubGPIOWriteByteRequest:
+             Stub_GPIOWriteByteRequest(requestContainer);
+             break;
+         case MESSAGE_TYPE__StubHeaterRequest:
+             Stub_HeaterRequest(requestContainer);
+             break;
+         case MESSAGE_TYPE__StubMotorEncoderRequest:
+             Stub_MotorEncoderRequest(requestContainer);
+             break;
+         case MESSAGE_TYPE__StubOptLimitSwitchRequest:
+             Stub_OptLimitSwitchRequest(requestContainer);
+             break;
+         case MESSAGE_TYPE__StubSteperMotorRequest:
+             Stub_SteperMotorRequest(requestContainer);
+             break;
+         case MESSAGE_TYPE__StubValveRequest:
+             Stub_ValveRequest(requestContainer);
+             break;
+
+         default:
+             //unsupported message type !!
+             break;
+     }
+}
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Container.h b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Container.h
new file mode 100644
index 000000000..2c5d9fa60
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Container.h
@@ -0,0 +1,7 @@
+#ifndef CONTAINER_H
+#define CONTAINER_H
+
+MessageContainer createContainer(MessageType type, char* token, protobuf_c_boolean completed, void* response, size_t (*packPtr)(void*, uint8_t*), size_t (*sizePtr)(void*));
+void receive_callback(char* buffer, size_t length);
+
+#endif //CONTAINER_H
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/DataDef.h b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/DataDef.h
new file mode 100644
index 000000000..12daba274
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/DataDef.h
@@ -0,0 +1,57 @@
+#ifndef DATADEF_H
+#define DATADEF_H
+
+#define EVALUATION_BOARD // to use the LCD only when using the evaluation board
+#define USE_HIGH_SPEED_GPIO // to use AHB GPIO (A..J) ports A-J APB or AHB, ports K-Q on AHB only
+
+#define ON  1
+#define OFF 0
+
+#define OK     0
+#define PASSED 0
+#define FAIL   1
+#define ERROR  1
+
+#define ENABLE  0
+#define DISABLE 1
+
+#define NEW  0
+#define USED 1
+
+#define START 1
+#define STOP  0
+
+// motor direction
+#define CW  1 // clockwise
+#define CCW 0 // counter clockwise
+
+#define TRUE  1
+#define FALSE 0
+
+#define INPUT  1
+#define OUTPUT 0
+
+#define PULLDOWN 0
+#define PULLUP   1
+
+//---------------------------------------------------------------------
+#pragma diag_suppress 169 /*  Avoid warnings on VOID * conversions (protobuf issue)
+The warning:
+#169-D argument of type "size_t (*)(const CalculateResponse *, uint8_t *)" is incompatible with parameter of type "size_t (*)(void *, uint8_t *)"   Calculate.c /twine_usblib_demo/PMR/Stubs    line 53 C/C++ Problem
+
+
+//#pragma diag_suppress 190 // Avoid the warning - #190-D enumerated type mixed with another type    protobuf-c.c
+ *
+or in the environment add command line:
+
+Project -> properties ->
+
+Add the warning number in
+Supports diagnostic <id> (--diag_suppress, - pds)
+169
+190
+*/
+
+
+
+#endif /* DATADEF_H */
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Progress.c b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Progress.c
new file mode 100644
index 000000000..efd4c7eac
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Progress.c
@@ -0,0 +1,58 @@
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <Stubs_Handler/DataDef.h>
+
+#include "inc/hw_memmap.h"
+#include "inc/hw_types.h"
+#include "inc/hw_uart.h"
+#include "driverlib/gpio.h"
+
+#include "usb_serial_adapter.h"
+#include "graphics_adapter.h"
+#include "MessageContainer.pb-c.h"
+#include "ProgressRequest.pb-c.h"
+#include "ProgressResponse.pb-c.h"
+
+#include "Container.h"
+
+void Stub_ProgressRequest(MessageContainer* requestContainer)
+{
+    MessageContainer responseContainer;
+
+    ProgressRequest* request = progress_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+
+    writeLine("Progress Request...");
+
+    ProgressResponse response = PROGRESS_RESPONSE__INIT;
+    response.has_progress = true;
+
+    int i = 0;
+    for (i = 0; i < request->amount; i++)
+    {
+        response.progress = i;
+        responseContainer = createContainer(MESSAGE_TYPE__ProgressResponse, requestContainer->token, false, &response, &progress_response__pack, &progress_response__get_packed_size);
+        uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+        size_t container_size = message_container__pack(&responseContainer, container_buffer);
+        writeLine("Sending Progress: ");
+        writeFloat(response.progress);
+        SendChars((char*)container_buffer, container_size);
+
+        int co = 0;
+        for (co = 0; co < request->delay; co++)
+        {
+            __delay_cycles(1000000);
+        }
+    }
+
+    responseContainer = createContainer(MESSAGE_TYPE__ProgressResponse, requestContainer->token, true, &response, &progress_response__pack, &progress_response__get_packed_size);
+    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    size_t container_size = message_container__pack(&responseContainer, container_buffer);
+    writeLine("Progress Completed!");
+    SendChars((char*)container_buffer, container_size);
+    return;
+
+}
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Progress.h b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Progress.h
new file mode 100644
index 000000000..18c459ced
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Progress.h
@@ -0,0 +1,7 @@
+#ifndef PROGRESS_H
+#define PROGRESS_H
+
+#include "MessageContainer.pb-c.h"
+void Stub_ProgressRequest(MessageContainer* requestContainer);
+
+#endif //PROGRESS_H
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Cartridge.c b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Cartridge.c
new file mode 100644
index 000000000..721425a6c
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Cartridge.c
@@ -0,0 +1,132 @@
+
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <Stubs_Handler/DataDef.h>
+
+#include "inc/hw_memmap.h"
+#include "inc/hw_types.h"
+#include "inc/hw_uart.h"
+#include "driverlib/gpio.h"
+
+#include "usb_serial_adapter.h"
+#include "graphics_adapter.h"
+
+#include "MessageContainer.pb-c.h"
+
+#include "StubCartridgeReadResponse.pb-c.h"
+#include "StubCartridgeReadRequest.pb-c.h"
+#include "StubCartridgeWriteResponse.pb-c.h"
+#include "StubCartridgeWriteRequest.pb-c.h"
+
+
+
+#include "Container.h"
+
+void Stub_CartridgeReadRequest(MessageContainer* requestContainer)
+{
+    MessageContainer responseContainer;
+
+    StubCartridgeReadRequest* request = stub_cartridge_read_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+
+	//request->cartridgeid
+
+    writeLine("cartridge Request: ");
+
+    writeFloat(request->cartridgeid);
+
+    StubCartridgeReadResponse response =   STUB_CARTRIDGE_READ_RESPONSE__INIT;
+	
+	response.cartridgeid = request->cartridgeid;
+	response.has_cartridgeid = true;
+	
+	//response.cartridgecolor
+	response.has_cartridgecolor = false;
+
+	//response.cartridgeversion
+	response.has_cartridgeversion = false;
+	
+	//response.cartridgedata
+	response.has_cartridgedata = false;
+	
+	//response.cartridgeused
+	response.has_cartridgeused = false;
+	
+	response.status = OK;
+	response.has_status = true;
+
+    writeLine("Sending Response: ");
+
+    writeFloat(response.cartridgeid);
+    writeString(", ");
+    writeFloat(response.cartridgecolor);
+    writeString(", ");
+    writeFloat(response.cartridgeversion);
+    writeString(", ");
+    writeFloat(response.cartridgedata);
+    writeString(", ");
+    writeFloat(response.cartridgeused);
+    writeString(", ");
+    writeFloat(response.status);
+
+    responseContainer = createContainer(MESSAGE_TYPE__StubCartridgeReadResponse, requestContainer->token, true, &response, &stub_cartridge_read_response__pack, &stub_cartridge_read_response__get_packed_size);
+
+    //-------------------------------------------------------------------------------------------
+    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    size_t container_size = message_container__pack(&responseContainer, container_buffer);
+    SendChars((char*)container_buffer, container_size);
+    free(container_buffer);
+    free(requestContainer);
+}
+
+void Stub_CartridgeWriteRequest(MessageContainer* requestContainer)
+{
+    MessageContainer responseContainer;
+
+    StubCartridgeWriteRequest* request = stub_cartridge_write_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+
+	//request->cartridgeid
+	//request->cartridgecolor
+	//request->cartridgeversion
+	//request->cartridgedata
+	//request->cartridgeused
+
+    writeLine("Cartridge Request: ");
+
+    writeFloat(request->cartridgeid);
+    writeString(", ");
+    writeFloat(request->cartridgecolor);
+    writeString(", ");
+    writeFloat(request->cartridgeversion);
+    writeString(", ");
+    writeFloat(request->cartridgedata);
+    writeString(", ");
+    writeFloat(request->cartridgeused);
+	
+    StubCartridgeWriteResponse response =   STUB_CARTRIDGE_WRITE_RESPONSE__INIT;
+	
+	response.cartridgeid = request->cartridgeid;
+	response.has_cartridgeid = true;
+	
+	response.status = OK;
+	response.has_status = true;
+
+    writeLine("Sending Response: ");
+
+    writeFloat(response.cartridgeid);
+    writeString(", ");
+    writeFloat(response.status);
+
+    responseContainer = createContainer(MESSAGE_TYPE__StubCartridgeWriteResponse, requestContainer->token, true, &response, &stub_cartridge_write_response__pack, &stub_cartridge_write_response__get_packed_size);
+
+    //-------------------------------------------------------------------------------------------
+    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    size_t container_size = message_container__pack(&responseContainer, container_buffer);
+    SendChars((char*)container_buffer, container_size);
+    free(container_buffer);
+    free(requestContainer);
+}
+
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Cartridge.h b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Cartridge.h
new file mode 100644
index 000000000..bcc2d2137
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Cartridge.h
@@ -0,0 +1,9 @@
+#ifndef STUB_CARTRIDGE_H
+#define STUB_CARTRIDGE_H
+
+#include "MessageContainer.pb-c.h"
+
+void Stub_CartridgeReadRequest(MessageContainer* requestContainer);
+void Stub_CartridgeWriteRequest(MessageContainer* requestContainer);
+
+#endif //STUB_CARTRIDGE_H
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Dispenser.c b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Dispenser.c
new file mode 100644
index 000000000..a9adb4116
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Dispenser.c
@@ -0,0 +1,81 @@
+
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <Stubs_Handler/DataDef.h>
+
+#include "inc/hw_memmap.h"
+#include "inc/hw_types.h"
+#include "inc/hw_uart.h"
+#include "driverlib/gpio.h"
+
+#include "usb_serial_adapter.h"
+#include "graphics_adapter.h"
+
+#include "MessageContainer.pb-c.h"
+
+#include "StubDispenserResponse.pb-c.h"
+#include "StubDispenserRequest.pb-c.h"
+
+#include "Container.h"
+
+void Stub_DispenserRequest(MessageContainer* requestContainer)
+{
+    MessageContainer responseContainer;
+
+    StubDispenserRequest* request = stub_dispenser_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+
+	//request->dispenserid
+	//request->start
+	//request->setdirection
+	//request->setmicrostepdivision
+	//request->setspeed
+
+    writeLine("Dispenser Request: ");
+
+    writeFloat(request->dispenserid);
+    writeString(", ");
+    writeFloat(request->start);
+    writeString(", ");
+    writeFloat(request->setdirection);
+    writeString(", ");
+    writeFloat(request->setmicrostepdivision);
+    writeString(", ");
+    writeFloat(request->setspeed);
+
+    StubDispenserResponse response =   STUB_DISPENSER_RESPONSE__INIT;
+	
+	response.dispenserid = request->dispenserid;
+	response.has_dispenserid = true;
+	
+	//response.dispenserposition
+	response.has_dispenserposition = false;
+
+	//response.inkworninglevel
+	response.has_inkworninglevel = false;
+	
+	response.status = OK;
+	response.has_status = true;
+
+    writeLine("Sending Response: ");
+
+    writeFloat(response.dispenserid);
+    writeString(", ");
+    writeFloat(response.dispenserposition);
+    writeString(", ");
+    writeFloat(response.inkworninglevel);
+    writeString(", ");
+    writeFloat(response.status);
+
+    responseContainer = createContainer(MESSAGE_TYPE__StubDispenserResponse, requestContainer->token, true, &response, &stub_dispenser_response__pack, &stub_dispenser_response__get_packed_size);
+
+    //-------------------------------------------------------------------------------------------
+    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    size_t container_size = message_container__pack(&responseContainer, container_buffer);
+    SendChars((char*)container_buffer, container_size);
+    free(container_buffer);
+    free(requestContainer);
+}
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Dispenser.h b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Dispenser.h
new file mode 100644
index 000000000..4387c078b
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Dispenser.h
@@ -0,0 +1,9 @@
+
+#ifndef STUB_DISPENSER_H
+#define STUB_DISPENSER_H
+
+#include "MessageContainer.pb-c.h"
+
+void Stub_DispenserRequest(MessageContainer* requestContainer);
+
+#endif //STUB_DISPENSER_H
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_GPIO.c b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_GPIO.c
new file mode 100644
index 000000000..a13293336
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_GPIO.c
@@ -0,0 +1,925 @@
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <Stubs_Handler/DataDef.h>
+
+#include "inc/hw_memmap.h"
+#include "inc/hw_types.h"
+#include "inc/hw_uart.h"
+#include "driverlib/gpio.h"
+
+#include "usb_serial_adapter.h"
+#include "graphics_adapter.h"
+
+#include "MessageContainer.pb-c.h"
+
+#include "StubGPIOWriteBitRequest.pb-c.h"
+#include "StubGPIOWriteBitResponse.pb-c.h"
+
+#include "StubGPIOReadByteResponse.pb-c.h"
+#include "StubGPIOReadByteRequest.pb-c.h"
+
+#include "StubGPIOReadBitResponse.pb-c.h"
+#include "StubGPIOReadBitRequest.pb-c.h"
+
+#include "StubGPIOWriteByteResponse.pb-c.h"
+#include "StubGPIOWriteByteRequest.pb-c.h"
+
+#include "StubGPIOInputSetupRequest.pb-c.h"
+#include "StubGPIOInputSetupResponse.pb-c.h"
+
+#include "Container.h"
+#include <Stubs_Handler/User_Leds.h>
+
+void Stub_GPIOWriteBitRequest(MessageContainer* requestContainer)
+{
+    MessageContainer responseContainer;
+
+    StubGPIOWriteBitRequest* request =  stub_gpiowrite_bit_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+
+    writeLine("GPIO Request: ");
+
+    writeString(request->portid);
+    writeString(", ");
+    writeFloat(request->pinid);
+    writeString(", ");
+    writeFloat(request->bittowrite);
+
+
+              uint8_t PinId = 0;
+              uint32_t PortId = 0;
+
+              switch(request->pinid)
+              {
+                  case 0:
+                      PinId = GPIO_PIN_0;
+                      break;
+                  case 1:
+                      PinId = GPIO_PIN_1;
+                      break;
+                  case 2:
+                      PinId = GPIO_PIN_2;
+                      break;
+                  case 3:
+                      PinId = GPIO_PIN_3;
+                      break;
+                  case 4:
+                      PinId = GPIO_PIN_4;
+                      break;
+                  case 5:
+                      PinId = GPIO_PIN_5;
+                      break;
+                  case 6:
+                      PinId = GPIO_PIN_6;
+                      break;
+                  case 7:
+                      PinId = GPIO_PIN_7;
+                      break;
+                  default:
+                      break;
+              }
+
+              char Port = request->portid[0];
+              switch(Port)
+              {
+                #ifdef USE_HIGH_SPEED_GPIO
+                case 'A':
+                    PortId = GPIO_PORTA_AHB_BASE;
+                    break;
+                case 'B':
+                    PortId = GPIO_PORTB_AHB_BASE;
+                    break;
+                case 'C':
+                    PortId = GPIO_PORTC_AHB_BASE;
+                    break;
+                case 'D':
+                    PortId = GPIO_PORTD_AHB_BASE;
+                    break;
+                case 'E':
+                    PortId = GPIO_PORTE_AHB_BASE;
+                    break;
+                case 'F':
+                    PortId = GPIO_PORTF_AHB_BASE;
+                    break;
+                case 'G':
+                    PortId = GPIO_PORTG_AHB_BASE;
+                    break;
+                case 'H':
+                    PortId = GPIO_PORTH_AHB_BASE;
+                    break;
+                case 'J':
+                    PortId = GPIO_PORTJ_AHB_BASE;
+                    break;
+                #else
+                case 'A':
+                    PortId = GPIO_PORTA_BASE;
+                    break;
+                case 'B':
+                    PortId = GPIO_PORTB_BASE;
+                    break;
+                case 'C':
+                    PortId = GPIO_PORTC_BASE;
+                    break;
+                case 'D':
+                    PortId = GPIO_PORTD_BASE;
+                    break;
+                case 'E':
+                    PortId = GPIO_PORTE_BASE;
+                    break;
+                case 'F':
+                    PortId = GPIO_PORTF_BASE;
+                    break;
+                case 'G':
+                    PortId = GPIO_PORTG_BASE;
+                    break;
+                case 'H':
+                    PortId = GPIO_PORTH_BASE;
+                    break;
+                case 'J':
+                    PortId = GPIO_PORTJ_BASE;
+                    break;
+                #endif
+                  case 'K':
+                      PortId = GPIO_PORTK_BASE;
+                      break;
+                  case 'L':
+                      PortId = GPIO_PORTL_BASE;
+                      break;
+                  case 'M':
+                      PortId = GPIO_PORTM_BASE;
+                      break;
+                  case 'N':
+                      PortId = GPIO_PORTN_BASE;
+                      break;
+                  case 'P':
+                      PortId = GPIO_PORTP_BASE;
+                      break;
+                  case 'Q':
+                      PortId = GPIO_PORTQ_BASE;
+                      break;
+                  case 'R':
+                      PortId = GPIO_PORTR_BASE;
+                      break;
+                  case 'S':
+                      PortId = GPIO_PORTS_BASE;
+                      break;
+                  case 'T':
+                      PortId = GPIO_PORTT_BASE;
+                      break;
+
+                  default:
+                      writeLine("Unsupported Port ID: ");
+                      writeString(request->portid);
+                      break;
+              }
+
+              ROM_GPIOPinTypeGPIOOutput(PortId, PinId); // set the requested GPIO to output
+              SysCtlDelay(10000);
+
+              if(request->bittowrite)
+                  ROM_GPIOPinWrite(PortId, PinId, ROM_GPIOPinRead(PortId, GPIO_BYTE) |  PinId); //Turn ON the requested GPIO
+              else
+                  ROM_GPIOPinWrite(PortId, PinId, ROM_GPIOPinRead(PortId, GPIO_BYTE) &  ~PinId); //Turn OFF the requested GPIO
+
+              //GPIOPinWrite(PortId, PinId, PinId*request->bittowrite);//
+
+              StubGPIOWriteBitResponse response = STUB_GPIOWRITE_BIT_RESPONSE__INIT;
+			  
+			  response.portid = request->portid;
+			  //response.has_portid = true;
+				
+			  response.pinid = request->pinid;
+			  response.has_pinid = true;
+				
+			  response.status = OK;
+			  response.has_status = true;
+
+			  writeLine("Sending Response: ");
+
+			  writeString(response.portid);
+			    writeString(", ");
+			    writeFloat(response.pinid);
+			    writeString(", ");
+			    writeFloat(response.status);
+
+              responseContainer = createContainer(MESSAGE_TYPE__StubGPIOWriteBitResponse, requestContainer->token, true, &response, &stub_gpiowrite_bit_response__pack, &stub_gpiowrite_bit_response__get_packed_size);
+
+              //-------------------------------------------------------------------------------------------
+              uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+              size_t container_size = message_container__pack(&responseContainer, container_buffer);
+              SendChars((char*)container_buffer, container_size);
+              free(container_buffer);
+              free(requestContainer);
+}
+
+//
+void Stub_GPIOReadByteRequest(MessageContainer* requestContainer)
+{
+    MessageContainer responseContainer;
+
+    StubGPIOReadByteRequest* request =  stub_gpioread_byte_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+
+    writeLine("GPIO Request: ");
+
+    writeString(request->portid);
+
+    char Port = request->portid[0];
+    uint32_t PortId = 0;
+
+    switch(Port)
+    {
+        #ifdef USE_HIGH_SPEED_GPIO
+        case 'A':
+            PortId = GPIO_PORTA_AHB_BASE;
+            break;
+        case 'B':
+            PortId = GPIO_PORTB_AHB_BASE;
+            break;
+        case 'C':
+            PortId = GPIO_PORTC_AHB_BASE;
+            break;
+        case 'D':
+            PortId = GPIO_PORTD_AHB_BASE;
+            break;
+        case 'E':
+            PortId = GPIO_PORTE_AHB_BASE;
+            break;
+        case 'F':
+            PortId = GPIO_PORTF_AHB_BASE;
+            break;
+        case 'G':
+            PortId = GPIO_PORTG_AHB_BASE;
+            break;
+        case 'H':
+            PortId = GPIO_PORTH_AHB_BASE;
+            break;
+        case 'J':
+            PortId = GPIO_PORTJ_AHB_BASE;
+            break;
+        #else
+        case 'A':
+            PortId = GPIO_PORTA_BASE;
+            break;
+        case 'B':
+            PortId = GPIO_PORTB_BASE;
+            break;
+        case 'C':
+            PortId = GPIO_PORTC_BASE;
+            break;
+        case 'D':
+            PortId = GPIO_PORTD_BASE;
+            break;
+        case 'E':
+            PortId = GPIO_PORTE_BASE;
+            break;
+        case 'F':
+            PortId = GPIO_PORTF_BASE;
+            break;
+        case 'G':
+            PortId = GPIO_PORTG_BASE;
+            break;
+        case 'H':
+            PortId = GPIO_PORTH_BASE;
+            break;
+        case 'J':
+            PortId = GPIO_PORTJ_BASE;
+            break;
+        #endif
+        case 'K':
+            PortId = GPIO_PORTK_BASE;
+            break;
+        case 'L':
+            PortId = GPIO_PORTL_BASE;
+            break;
+        case 'M':
+            PortId = GPIO_PORTM_BASE;
+            break;
+        case 'N':
+            PortId = GPIO_PORTN_BASE;
+            break;
+        case 'P':
+            PortId = GPIO_PORTP_BASE;
+            break;
+        case 'Q':
+            PortId = GPIO_PORTQ_BASE;
+            break;
+        case 'R':
+            PortId = GPIO_PORTR_BASE;
+            break;
+        case 'S':
+            PortId = GPIO_PORTS_BASE;
+            break;
+        case 'T':
+            PortId = GPIO_PORTT_BASE;
+            break;
+
+        default:
+            writeLine("Unsupported Port ID: ");
+            writeString(request->portid);
+            break;
+    }
+
+    StubGPIOReadByteResponse response = STUB_GPIOREAD_BYTE_RESPONSE__INIT;
+
+    response.portid = request->portid;
+
+    char temp = ROM_GPIOPinRead(PortId, GPIO_BYTE);
+    response.bytevalue = temp;
+    response.has_bytevalue = true;
+
+    response.status = OK;
+    response.has_status = true;
+
+    writeLine("Sending Response: ");
+
+    writeString(response.portid);
+    writeString(", ");
+    writeFloat(response.bytevalue);
+    writeString(", ");
+    writeFloat(response.status);
+
+    responseContainer = createContainer(MESSAGE_TYPE__StubGPIOReadByteResponse, requestContainer->token, true, &response, &stub_gpioread_byte_response__pack, &stub_gpioread_byte_response__get_packed_size);
+
+    //-------------------------------------------------------------------------------------------
+    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    size_t container_size = message_container__pack(&responseContainer, container_buffer);
+    SendChars((char*)container_buffer, container_size);
+    free(container_buffer);
+    free(requestContainer);
+}
+
+
+void Stub_GPIOReadBitRequest(MessageContainer* requestContainer)
+{
+    MessageContainer responseContainer;
+
+    StubGPIOReadBitRequest* request = stub_gpioread_bit_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+
+    writeLine("GPIO Request: ");
+
+    writeString(request->portid);
+    writeString(", ");
+    writeFloat(request->pinid);
+
+    uint8_t PinId = 0;
+    uint32_t PortId = 0;
+
+    switch(request->pinid)
+    {
+        case 0:
+            PinId = GPIO_PIN_0;
+            break;
+        case 1:
+            PinId = GPIO_PIN_1;
+            break;
+        case 2:
+            PinId = GPIO_PIN_2;
+            break;
+        case 3:
+            PinId = GPIO_PIN_3;
+            break;
+        case 4:
+            PinId = GPIO_PIN_4;
+            break;
+        case 5:
+            PinId = GPIO_PIN_5;
+            break;
+        case 6:
+            PinId = GPIO_PIN_6;
+            break;
+        case 7:
+            PinId = GPIO_PIN_7;
+            break;
+        default:
+            break;
+    }
+
+    char Port = request->portid[0];
+    switch(Port)
+    {
+        #ifdef USE_HIGH_SPEED_GPIO
+        case 'A':
+            PortId = GPIO_PORTA_AHB_BASE;
+            break;
+        case 'B':
+            PortId = GPIO_PORTB_AHB_BASE;
+            break;
+        case 'C':
+            PortId = GPIO_PORTC_AHB_BASE;
+            break;
+        case 'D':
+            PortId = GPIO_PORTD_AHB_BASE;
+            break;
+        case 'E':
+            PortId = GPIO_PORTE_AHB_BASE;
+            break;
+        case 'F':
+            PortId = GPIO_PORTF_AHB_BASE;
+            break;
+        case 'G':
+            PortId = GPIO_PORTG_AHB_BASE;
+            break;
+        case 'H':
+            PortId = GPIO_PORTH_AHB_BASE;
+            break;
+        case 'J':
+            PortId = GPIO_PORTJ_AHB_BASE;
+            break;
+        #else
+        case 'A':
+            PortId = GPIO_PORTA_BASE;
+            break;
+        case 'B':
+            PortId = GPIO_PORTB_BASE;
+            break;
+        case 'C':
+            PortId = GPIO_PORTC_BASE;
+            break;
+        case 'D':
+            PortId = GPIO_PORTD_BASE;
+            break;
+        case 'E':
+            PortId = GPIO_PORTE_BASE;
+            break;
+        case 'F':
+            PortId = GPIO_PORTF_BASE;
+            break;
+        case 'G':
+            PortId = GPIO_PORTG_BASE;
+            break;
+        case 'H':
+            PortId = GPIO_PORTH_BASE;
+            break;
+        case 'J':
+            PortId = GPIO_PORTJ_BASE;
+            break;
+        #endif
+        case 'K':
+            PortId = GPIO_PORTK_BASE;
+            break;
+        case 'L':
+            PortId = GPIO_PORTL_BASE;
+            break;
+        case 'M':
+            PortId = GPIO_PORTM_BASE;
+            break;
+        case 'N':
+            PortId = GPIO_PORTN_BASE;
+            break;
+        case 'P':
+            PortId = GPIO_PORTP_BASE;
+            break;
+        case 'Q':
+            PortId = GPIO_PORTQ_BASE;
+            break;
+        case 'R':
+            PortId = GPIO_PORTR_BASE;
+            break;
+        case 'S':
+            PortId = GPIO_PORTS_BASE;
+            break;
+        case 'T':
+            PortId = GPIO_PORTT_BASE;
+            break;
+
+        default:
+            writeLine("Unsupported Port ID: ");
+            writeString(request->portid);
+            break;
+    }
+
+///////////////////////////////////////////-----------------------------------------------------------------------------
+    char temp;
+    uint8_t expvalue;
+    uint32_t timeout = 10000;
+
+        if(request->pollexpvalue)
+            expvalue = PinId;
+
+        //Polling
+        if(request->polling)
+        {
+            do
+            {
+                timeout--;
+                SysCtlDelay(10000);
+                temp = ROM_GPIOPinRead(PortId, PinId);
+            } while(( temp != expvalue) && (timeout));
+
+        }
+        else
+        {
+            temp = ROM_GPIOPinRead(PortId, PinId);
+        }
+
+        StubGPIOReadBitResponse response =   STUB_GPIOREAD_BIT_RESPONSE__INIT;
+
+        response.portid = request->portid;
+
+        response.pinid = request->pinid;
+        response.has_pinid = true;
+
+        response.bitvalue = temp;
+        response.has_bitvalue = true;
+
+        response.status = OK;
+        response.has_status = true;
+
+        writeLine("Sending Response: ");
+
+        writeString(response.portid);
+        writeString(", ");
+        writeFloat(response.pinid);
+        writeString(", ");
+        writeFloat(response.bitvalue);
+        writeString(", ");
+        writeFloat(response.status);
+
+        responseContainer = createContainer(MESSAGE_TYPE__StubGPIOReadBitResponse, requestContainer->token, true, &response, &stub_gpioread_bit_response__pack, &stub_gpioread_bit_response__get_packed_size);
+
+///////////////////////////////////////////-----------------------------------------------------------------------------
+/*
+//    if( (PortId == GPIO_PORTS_BASE) && (PinId == GPIO_PIN_3))
+//    {
+//        MAP_GPIOPinTypeGPIOInput(GPIO_PORTS_BASE, GPIO_PIN_3); // Enable pin PS3 for GPIOInput
+//        GPIOPadConfigSet(GPIO_PORTS_BASE,GPIO_PIN_3,GPIO_STRENGTH_2MA,GPIO_PIN_TYPE_STD_WPU);//Configure GPIO pull up resistors. NOTE: does not work if ROM_GPIOPinTypeGPIOInput() isnt called before.
+//        //GPIOPadConfigSet(GPIO_PORTS_BASE,GPIO_PIN_3,GPIO_STRENGTH_2MA,GPIO_PIN_TYPE_STD_WPD );//Configure GPIO pull down resistors. NOTE: does not work if ROM_GPIOPinTypeGPIOInput() isnt called before.
+//    }
+
+    //ROM_GPIOPinTypeGPIOInput(PortId, PinId); // set the requested GPIO to Input
+    //SysCtlDelay(10000);
+
+    StubGPIOReadBitResponse response =   STUB_GPIOREAD_BIT_RESPONSE__INIT;
+
+    response.portid = request->portid;
+
+    response.pinid = request->pinid;
+    response.has_pinid = true;
+
+    char temp = ROM_GPIOPinRead(PortId, PinId);
+
+    //char temp2 = ROM_GPIOPinRead(GPIO_PORTQ_BASE, GPIO_BYTE);
+
+    //GPIOPinTypeGPIOInput(GPIO_PORTS_BASE, GPIO_PIN_3); // set the requested GPIO to Input
+    //SysCtlDelay(10000);
+    //char temp3 = GPIOPinRead(GPIO_PORTS_BASE, GPIO_PIN_3);
+    //char temp4 = GPIOPinRead(GPIO_PORTS_BASE, GPIO_BYTE);
+
+    response.bitvalue = temp;
+    response.has_bitvalue = true;
+
+    response.status = OK;
+    response.has_status = true;
+
+    writeLine("Sending Response: ");
+
+    writeString(response.portid);
+    writeString(", ");
+    writeFloat(response.pinid);
+    writeString(", ");
+    writeFloat(response.bitvalue);
+    writeString(", ");
+    writeFloat(response.status);
+
+    responseContainer = createContainer(MESSAGE_TYPE__StubGPIOReadBitResponse, requestContainer->token, true, &response, &stub_gpioread_bit_response__pack, &stub_gpioread_bit_response__get_packed_size);
+*/
+    //-------------------------------------------------------------------------------------------
+    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    size_t container_size = message_container__pack(&responseContainer, container_buffer);
+    SendChars((char*)container_buffer, container_size);
+    free(container_buffer);
+    free(requestContainer);
+}
+
+
+
+void Stub_GPIOWriteByteRequest(MessageContainer* requestContainer)
+{
+    MessageContainer responseContainer;
+
+    StubGPIOWriteByteRequest* request = stub_gpiowrite_byte_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+
+    writeLine("GPIO Request: ");
+
+    writeString(request->portid);
+    writeString(", ");
+    writeFloat(request->datatowrite);
+
+    uint32_t PortId = 0;
+
+    char Port = request->portid[0];
+    switch(Port)
+    {
+        #ifdef USE_HIGH_SPEED_GPIO
+        case 'A':
+            PortId = GPIO_PORTA_AHB_BASE;
+            break;
+        case 'B':
+            PortId = GPIO_PORTB_AHB_BASE;
+            break;
+        case 'C':
+            PortId = GPIO_PORTC_AHB_BASE;
+            break;
+        case 'D':
+            PortId = GPIO_PORTD_AHB_BASE;
+            break;
+        case 'E':
+            PortId = GPIO_PORTE_AHB_BASE;
+            break;
+        case 'F':
+            PortId = GPIO_PORTF_AHB_BASE;
+            break;
+        case 'G':
+            PortId = GPIO_PORTG_AHB_BASE;
+            break;
+        case 'H':
+            PortId = GPIO_PORTH_AHB_BASE;
+            break;
+        case 'J':
+            PortId = GPIO_PORTJ_AHB_BASE;
+            break;
+        #else
+        case 'A':
+            PortId = GPIO_PORTA_BASE;
+            break;
+        case 'B':
+            PortId = GPIO_PORTB_BASE;
+            break;
+        case 'C':
+            PortId = GPIO_PORTC_BASE;
+            break;
+        case 'D':
+            PortId = GPIO_PORTD_BASE;
+            break;
+        case 'E':
+            PortId = GPIO_PORTE_BASE;
+            break;
+        case 'F':
+            PortId = GPIO_PORTF_BASE;
+            break;
+        case 'G':
+            PortId = GPIO_PORTG_BASE;
+            break;
+        case 'H':
+            PortId = GPIO_PORTH_BASE;
+            break;
+        case 'J':
+            PortId = GPIO_PORTJ_BASE;
+            break;
+        #endif
+        case 'K':
+            PortId = GPIO_PORTK_BASE;
+            break;
+        case 'L':
+            PortId = GPIO_PORTL_BASE;
+            break;
+        case 'M':
+            PortId = GPIO_PORTM_BASE;
+            break;
+        case 'N':
+            PortId = GPIO_PORTN_BASE;
+            break;
+        case 'P':
+            PortId = GPIO_PORTP_BASE;
+            break;
+        case 'Q':
+            PortId = GPIO_PORTQ_BASE;
+            break;
+        case 'R':
+            PortId = GPIO_PORTR_BASE;
+            break;
+        case 'S':
+            PortId = GPIO_PORTS_BASE;
+            break;
+        case 'T':
+            PortId = GPIO_PORTS_BASE;
+            break;
+
+        default:
+            writeLine("Unsupported Port ID: ");
+            writeString(request->portid);
+            break;
+    }
+
+    ROM_GPIOPinTypeGPIOOutput(PortId, GPIO_BYTE); // set the requested GPIO to output
+    SysCtlDelay(10000);
+
+    ROM_GPIOPinWrite(PortId, GPIO_BYTE, request->datatowrite); //Turn ON the requested GPIOs BYTE
+
+    StubGPIOWriteByteResponse response =   STUB_GPIOWRITE_BYTE_RESPONSE__INIT;
+
+    response.portid = request->portid;
+
+    response.status = OK;
+    response.has_status = true;
+
+    writeLine("Sending Response: ");
+
+    writeString(response.portid);
+
+    responseContainer = createContainer(MESSAGE_TYPE__StubGPIOWriteByteResponse, requestContainer->token, true, &response, &stub_gpiowrite_byte_response__pack, &stub_gpiowrite_byte_response__get_packed_size);
+
+    //-------------------------------------------------------------------------------------------
+    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    size_t container_size = message_container__pack(&responseContainer, container_buffer);
+    SendChars((char*)container_buffer, container_size);
+    free(container_buffer);
+    free(requestContainer);
+}
+
+
+
+void Stub_GPIOInputSetupRequest(MessageContainer* requestContainer)
+{
+    MessageContainer responseContainer;
+
+    StubGPIOInputSetupRequest* request =  stub_gpioinput_setup_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+
+    writeLine("GPIO Request: ");
+
+    writeString(request->portid);
+    writeString(", ");
+    writeFloat(request->pinid);
+    writeString(", ");
+    writeFloat(request->setinput);
+    writeString(", ");
+    writeFloat(request->setpullup);
+
+
+              uint8_t PinId = 0;
+              uint32_t PortId = 0;
+
+              switch(request->pinid)
+              {
+                  case 0:
+                      PinId = GPIO_PIN_0;
+                      break;
+                  case 1:
+                      PinId = GPIO_PIN_1;
+                      break;
+                  case 2:
+                      PinId = GPIO_PIN_2;
+                      break;
+                  case 3:
+                      PinId = GPIO_PIN_3;
+                      break;
+                  case 4:
+                      PinId = GPIO_PIN_4;
+                      break;
+                  case 5:
+                      PinId = GPIO_PIN_5;
+                      break;
+                  case 6:
+                      PinId = GPIO_PIN_6;
+                      break;
+                  case 7:
+                      PinId = GPIO_PIN_7;
+                      break;
+                  default:
+                      break;
+              }
+
+              char Port = request->portid[0];
+              switch(Port)
+              {
+                #ifdef USE_HIGH_SPEED_GPIO
+                case 'A':
+                    PortId = GPIO_PORTA_AHB_BASE;
+                    break;
+                case 'B':
+                    PortId = GPIO_PORTB_AHB_BASE;
+                    break;
+                case 'C':
+                    PortId = GPIO_PORTC_AHB_BASE;
+                    break;
+                case 'D':
+                    PortId = GPIO_PORTD_AHB_BASE;
+                    break;
+                case 'E':
+                    PortId = GPIO_PORTE_AHB_BASE;
+                    break;
+                case 'F':
+                    PortId = GPIO_PORTF_AHB_BASE;
+                    break;
+                case 'G':
+                    PortId = GPIO_PORTG_AHB_BASE;
+                    break;
+                case 'H':
+                    PortId = GPIO_PORTH_AHB_BASE;
+                    break;
+                case 'J':
+                    PortId = GPIO_PORTJ_AHB_BASE;
+                    break;
+                #else
+                case 'A':
+                    PortId = GPIO_PORTA_BASE;
+                    break;
+                case 'B':
+                    PortId = GPIO_PORTB_BASE;
+                    break;
+                case 'C':
+                    PortId = GPIO_PORTC_BASE;
+                    break;
+                case 'D':
+                    PortId = GPIO_PORTD_BASE;
+                    break;
+                case 'E':
+                    PortId = GPIO_PORTE_BASE;
+                    break;
+                case 'F':
+                    PortId = GPIO_PORTF_BASE;
+                    break;
+                case 'G':
+                    PortId = GPIO_PORTG_BASE;
+                    break;
+                case 'H':
+                    PortId = GPIO_PORTH_BASE;
+                    break;
+                case 'J':
+                    PortId = GPIO_PORTJ_BASE;
+                    break;
+                #endif
+                  case 'K':
+                      PortId = GPIO_PORTK_BASE;
+                      break;
+                  case 'L':
+                      PortId = GPIO_PORTL_BASE;
+                      break;
+                  case 'M':
+                      PortId = GPIO_PORTM_BASE;
+                      break;
+                  case 'N':
+                      PortId = GPIO_PORTN_BASE;
+                      break;
+                  case 'P':
+                      PortId = GPIO_PORTP_BASE;
+                      break;
+                  case 'Q':
+                      PortId = GPIO_PORTQ_BASE;
+                      break;
+                  case 'R':
+                      PortId = GPIO_PORTR_BASE;
+                      break;
+                  case 'S':
+                      PortId = GPIO_PORTS_BASE;
+                      break;
+                  case 'T':
+                      PortId = GPIO_PORTT_BASE;
+                      break;
+
+                  default:
+                      writeLine("Unsupported Port ID: ");
+                      writeString(request->portid);
+                      break;
+              }
+
+              if(request->setinput == INPUT)
+              {
+                    MAP_GPIOPinTypeGPIOInput(PortId, PinId); // Enable pin for GPIOInput
+
+                    if(request->setpullup == PULLUP)
+                    {
+                        GPIOPadConfigSet(PortId,PinId,GPIO_STRENGTH_2MA,GPIO_PIN_TYPE_STD_WPU);//Configure GPIO pull up resistors. NOTE: does not work if ROM_GPIOPinTypeGPIOInput() isnt called before.
+                    }
+                    else //set pulldown:
+                    {
+                        GPIOPadConfigSet(GPIO_PORTS_BASE,GPIO_PIN_3,GPIO_STRENGTH_2MA,GPIO_PIN_TYPE_STD_WPD );//Configure GPIO pull down resistors. NOTE: does not work if ROM_GPIOPinTypeGPIOInput() isnt called before.
+                    }
+              }
+              else
+              {
+                   ROM_GPIOPinTypeGPIOOutput(PortId, PinId); // set the requested GPIO to output
+              }
+
+              SysCtlDelay(10000);
+
+              StubGPIOInputSetupResponse response = STUB_GPIOINPUT_SETUP_RESPONSE__INIT;
+
+              response.portid = request->portid;
+
+              response.pinid = request->pinid;
+              response.has_pinid = true;
+
+              response.status = OK;
+              response.has_status = true;
+
+              writeLine("Sending Response: ");
+
+              writeString(response.portid);
+              writeString(", ");
+              writeFloat(response.pinid);
+              writeString(", ");
+              writeFloat(response.status);
+
+              responseContainer = createContainer(MESSAGE_TYPE__StubGPIOInputSetupResponse, requestContainer->token, true, &response, &stub_gpioinput_setup_response__pack, &stub_gpioinput_setup_response__get_packed_size);
+
+              //-------------------------------------------------------------------------------------------
+              uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+              size_t container_size = message_container__pack(&responseContainer, container_buffer);
+              SendChars((char*)container_buffer, container_size);
+              free(container_buffer);
+              free(requestContainer);
+}
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_GPIO.h b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_GPIO.h
new file mode 100644
index 000000000..3779c65f5
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_GPIO.h
@@ -0,0 +1,12 @@
+#ifndef STUB_GPIO_H
+#define STUB_GPIO_H
+
+#include "MessageContainer.pb-c.h"
+
+void Stub_GPIOWriteBitRequest(MessageContainer* requestContainer);
+void Stub_GPIOReadByteRequest(MessageContainer* requestContainer);
+void Stub_GPIOReadBitRequest(MessageContainer* requestContainer);
+void Stub_GPIOWriteByteRequest(MessageContainer* requestContainer);
+void Stub_GPIOInputSetupRequest(MessageContainer* requestContainer);
+
+#endif //STUB_GPIO_H
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Heater.c b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Heater.c
new file mode 100644
index 000000000..de6aea470
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Heater.c
@@ -0,0 +1,72 @@
+
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <Stubs_Handler/DataDef.h>
+
+#include "inc/hw_memmap.h"
+#include "inc/hw_types.h"
+#include "inc/hw_uart.h"
+#include "driverlib/gpio.h"
+
+#include "usb_serial_adapter.h"
+#include "graphics_adapter.h"
+
+#include "MessageContainer.pb-c.h"
+
+#include "StubHeaterResponse.pb-c.h"
+#include "StubHeaterRequest.pb-c.h"
+
+#include "Container.h"
+
+void Stub_HeaterRequest(MessageContainer* requestContainer)
+{
+    MessageContainer responseContainer;
+
+    StubHeaterRequest* request = stub_heater_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+
+	/*
+	request->heatergroupid
+	request->heatergroupon
+	request->heatertemperaturereq
+    */
+
+    writeLine("Heater Request: ");
+
+    writeFloat(request->heatergroupid);
+    writeString(", ");
+    writeFloat(request->heatergroupon);
+    writeString(", ");
+    writeFloat(request->heatertemperaturereq);
+              
+    StubHeaterResponse response =   STUB_HEATER_RESPONSE__INIT;
+
+	response.heatergroupid = request->heatergroupid;
+	response.has_heatergroupid = true;
+	
+	//response.heatertemperaturesensor
+	response.has_heatertemperaturesensor = false;
+	
+	response.status = OK;
+	response.has_status = true;
+	
+    writeLine("Sending Response: ");
+
+    writeFloat(response.heatergroupid);
+    writeString(", ");
+    writeFloat(response.heatertemperaturesensor);
+    writeString(", ");
+    writeFloat(response.status);
+
+    responseContainer = createContainer(MESSAGE_TYPE__StubHeaterResponse, requestContainer->token, true, &response, &stub_heater_response__pack, &stub_heater_response__get_packed_size);
+
+    //-------------------------------------------------------------------------------------------
+    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    size_t container_size = message_container__pack(&responseContainer, container_buffer);
+    SendChars((char*)container_buffer, container_size);
+    free(container_buffer);
+    free(requestContainer);
+}
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Heater.h b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Heater.h
new file mode 100644
index 000000000..14c2dad3c
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Heater.h
@@ -0,0 +1,6 @@
+#ifndef STUB_HEATER_H
+#define STUB_HEATER_H
+
+void Stub_HeaterRequest(MessageContainer* requestContainer);
+
+#endif //STUB_HEATER_H
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_MotorEncoder.c b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_MotorEncoder.c
new file mode 100644
index 000000000..5ddc8ce3b
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_MotorEncoder.c
@@ -0,0 +1,84 @@
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <Stubs_Handler/DataDef.h>
+
+#include "inc/hw_memmap.h"
+#include "inc/hw_types.h"
+#include "inc/hw_uart.h"
+#include "driverlib/gpio.h"
+
+#include "usb_serial_adapter.h"
+#include "graphics_adapter.h"
+
+#include "MessageContainer.pb-c.h"
+
+#include "StubMotorEncoderResponse.pb-c.h"
+#include "StubMotorEncoderRequest.pb-c.h"
+
+#include "Container.h"
+
+void Stub_MotorEncoderRequest(MessageContainer* requestContainer)
+{
+    MessageContainer responseContainer;
+
+    StubMotorEncoderRequest* request = stub_motor_encoder_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+
+	/*
+	request->motorid
+	request->readencspeed
+	request->readdirection
+	request->motion_control
+    */
+
+    writeLine("Encoder Request: ");
+
+    writeFloat(request->motorid);
+    writeString(", ");
+    writeFloat(request->readencspeed);
+    writeString(", ");
+    writeFloat(request->readdirection);
+    writeString(", ");
+    writeFloat(request->motion_control);
+              
+    StubMotorEncoderResponse response =   STUB_MOTOR_ENCODER_RESPONSE__INIT;
+	
+	response.encoderid = request->motorid;
+	response.has_encoderid = true;
+	
+	response.encoderversion = 456;
+	response.has_encoderversion = true;
+	
+	//response.motorspeed
+	response.has_motorspeed = false;
+	
+	response.motordirection = CW;
+	response.has_motordirection = true;
+	
+	response.status = OK;
+	response.has_status = true;
+
+    writeLine("Sending Response: ");
+
+    writeFloat(response.encoderid);
+    writeString(", ");
+    writeFloat(response.encoderversion);
+    writeString(", ");
+    writeFloat(response.motorspeed);
+    writeString(", ");
+    writeFloat(response.motordirection);
+    writeString(", ");
+    writeFloat(response.status);
+
+    responseContainer = createContainer(MESSAGE_TYPE__StubMotorEncoderResponse, requestContainer->token, true, &response, &stub_motor_encoder_response__pack, &stub_motor_encoder_response__get_packed_size);
+
+    //-------------------------------------------------------------------------------------------
+    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    size_t container_size = message_container__pack(&responseContainer, container_buffer);
+    SendChars((char*)container_buffer, container_size);
+    free(container_buffer);
+    free(requestContainer);
+}
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_MotorEncoder.h b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_MotorEncoder.h
new file mode 100644
index 000000000..0e0a1c41e
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_MotorEncoder.h
@@ -0,0 +1,6 @@
+#ifndef STUB_MOTORENCODER_H
+#define STUB_MOTORENCODER_H
+
+void Stub_MotorEncoderRequest(MessageContainer* requestContainer);
+
+#endif //STUB_STUB_MOTORENCODER_H
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_OptLimitSwitch.c b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_OptLimitSwitch.c
new file mode 100644
index 000000000..70e79000f
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_OptLimitSwitch.c
@@ -0,0 +1,69 @@
+
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <Stubs_Handler/DataDef.h>
+
+#include "inc/hw_memmap.h"
+#include "inc/hw_types.h"
+#include "inc/hw_uart.h"
+#include "driverlib/gpio.h"
+
+#include "usb_serial_adapter.h"
+#include "graphics_adapter.h"
+
+#include "MessageContainer.pb-c.h"
+
+#include "StubOptLimitSwitchResponse.pb-c.h"
+#include "StubOptLimitSwitchRequest.pb-c.h"
+
+#include "Container.h"
+
+void Stub_OptLimitSwitchRequest(MessageContainer* requestContainer)
+{
+    MessageContainer responseContainer;
+
+    StubOptLimitSwitchRequest* request = stub_opt_limit_switch_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+
+	/*
+	request->limitswitchrid
+	request->limitswitchrdisable
+    */
+
+    writeLine("OptLimit Switch Request: ");
+
+    writeFloat(request->limitswitchrid);
+    writeString(", ");
+    writeFloat(request->limitswitchrdisable);
+              
+    StubOptLimitSwitchResponse response =   STUB_OPT_LIMIT_SWITCH_RESPONSE__INIT;
+	
+	response.limitswitchrid = request->limitswitchrid;
+	response.has_limitswitchrid = true;
+	
+	//response.limitswitchditection = 2;
+	response.has_limitswitchditection = false;
+	
+	response.status = OK;
+	response.has_status = true;
+
+    writeLine("Sending Response: ");
+
+    writeFloat(response.limitswitchrid);
+    writeString(", ");
+    writeFloat(response.limitswitchditection);
+    writeString(", ");
+    writeFloat(response.status);
+
+    responseContainer = createContainer(MESSAGE_TYPE__StubOptLimitSwitchResponse, requestContainer->token, true, &response, &stub_opt_limit_switch_response__pack, &stub_opt_limit_switch_response__get_packed_size);
+
+    //-------------------------------------------------------------------------------------------
+    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    size_t container_size = message_container__pack(&responseContainer, container_buffer);
+    SendChars((char*)container_buffer, container_size);
+    free(container_buffer);
+    free(requestContainer);
+}
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_OptLimitSwitch.h b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_OptLimitSwitch.h
new file mode 100644
index 000000000..dbd064a1d
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_OptLimitSwitch.h
@@ -0,0 +1,6 @@
+#ifndef STUB_OPTLIMITSWITCH_H
+#define STUB_OPTLIMITSWITCH_H
+
+void Stub_OptLimitSwitchRequest(MessageContainer* requestContainer);
+
+#endif //STUB_OPTLIMITSWITCH_H
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_SteperMotor.c b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_SteperMotor.c
new file mode 100644
index 000000000..4f53b71ce
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_SteperMotor.c
@@ -0,0 +1,79 @@
+
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <Stubs_Handler/DataDef.h>
+
+#include "inc/hw_memmap.h"
+#include "inc/hw_types.h"
+#include "inc/hw_uart.h"
+#include "driverlib/gpio.h"
+
+#include "usb_serial_adapter.h"
+#include "graphics_adapter.h"
+
+#include "MessageContainer.pb-c.h"
+
+#include "StubSteperMotorRequest.pb-c.h"
+#include "StubSteperMotorResponse.pb-c.h"
+
+#include "Container.h"
+
+void Stub_SteperMotorRequest(MessageContainer* requestContainer)
+{
+    MessageContainer responseContainer;
+
+    StubSteperMotorRequest* request = stub_steper_motor_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+
+
+	writeLine("Steper Motor Request: ");
+
+    writeFloat(request->motorid);
+    writeString(", ");
+    writeFloat(request->start);
+    writeString(", ");
+    writeFloat(request->setdirection);
+    writeString(", ");
+    writeFloat(request->setmicrostepdivision);
+    writeString(", ");
+    writeFloat(request->setspeed);
+    /*
+	request->motorid
+	request->start
+	request->setdirection
+	request->setmicrostepdivision
+	request->setspeed
+    */
+              
+    StubSteperMotorResponse response =   STUB_STEPER_MOTOR_RESPONSE__INIT;
+	
+	response.motorid = request->motorid;
+	response.has_motorid = true;
+	
+	response.motorversion = 123;
+	response.has_motorversion = true;
+	
+	response.status = OK;
+	response.has_status = true;
+
+    writeLine("Sending Response: ");
+
+    writeFloat(response.motorid);
+    writeString(", ");
+    writeFloat(response.motorversion);
+    writeString(", ");
+    writeFloat(response.status);
+
+
+    responseContainer = createContainer(MESSAGE_TYPE__StubSteperMotorResponse, requestContainer->token, true, &response, &stub_steper_motor_response__pack, &stub_steper_motor_response__get_packed_size);
+
+    //-------------------------------------------------------------------------------------------
+    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    size_t container_size = message_container__pack(&responseContainer, container_buffer);
+    SendChars((char*)container_buffer, container_size);
+    free(container_buffer);
+    free(requestContainer);
+}
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_SteperMotor.h b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_SteperMotor.h
new file mode 100644
index 000000000..b19aa0cc0
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_SteperMotor.h
@@ -0,0 +1,7 @@
+
+#ifndef STUB_STEPERMOTOR_H
+#define STUB_STEPERMOTOR_H
+
+void Stub_SteperMotorRequest(MessageContainer* requestContainer);
+
+#endif //STUB_STEPERMOTOR_H
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Valve.c b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Valve.c
new file mode 100644
index 000000000..beaa1c098
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Valve.c
@@ -0,0 +1,61 @@
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <Stubs_Handler/DataDef.h>
+
+#include "inc/hw_memmap.h"
+#include "inc/hw_types.h"
+#include "inc/hw_uart.h"
+#include "driverlib/gpio.h"
+
+#include "usb_serial_adapter.h"
+#include "graphics_adapter.h"
+
+#include "MessageContainer.pb-c.h"
+
+#include "StubValveResponse.pb-c.h"
+#include "StubValveRequest.pb-c.h"
+
+#include "Container.h"
+
+void Stub_ValveRequest(MessageContainer* requestContainer)
+{
+    MessageContainer responseContainer;
+
+    StubValveRequest* request = stub_valve_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+
+	/*
+	request->valveid
+	request->inkflow
+	request->valveon
+    */
+    writeLine("Valve Request: ");
+    writeFloat(request->valveid);
+    writeString(", ");
+    writeFloat(request->inkflow);
+    writeString(", ");
+    writeFloat(request->valveon);
+
+    StubValveResponse response =   STUB_VALVE_RESPONSE__INIT;
+	
+	response.status = OK;
+	response.has_status = true;
+
+
+
+    responseContainer = createContainer(MESSAGE_TYPE__StubValveResponse, requestContainer->token, true, &response, &stub_valve_response__pack, &stub_valve_response__get_packed_size);
+
+    writeLine("Sending Response: ");
+    writeFloat(response.status);
+
+    free(request);
+    //-------------------------------------------------------------------------------------------
+    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    size_t container_size = message_container__pack(&responseContainer, container_buffer);
+    SendChars((char*)container_buffer, container_size);
+    free(container_buffer);
+    free(requestContainer);
+}
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Valve.h b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Valve.h
new file mode 100644
index 000000000..1948fa37b
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/Stub_Valve.h
@@ -0,0 +1,6 @@
+#ifndef STUB_VALVE_H
+#define STUB_VALVE_H
+void Stub_ValveRequest(MessageContainer* requestContainer);
+
+#endif //STUB_VALVE_H
+
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/User_Leds.c b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/User_Leds.c
new file mode 100644
index 000000000..4f2fd802b
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/User_Leds.c
@@ -0,0 +1,68 @@
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "inc/hw_memmap.h"
+
+#include "driverlib/rom.h"
+#include "driverlib/gpio.h"
+#include "driverlib/sysctl.h"
+
+#include <Stubs_Handler/DataDef.h>
+#include <Stubs_Handler/User_Leds.h>
+
+void Turn_Green_Led_On()
+{
+    INIT_GPIO_GREEN_LED
+    GREEN_LED_ON
+    LED_SET_DELAY
+}
+
+void Turn_Green_Led_Off()
+{
+    GREEN_LED_OFF
+}
+
+void Turn_Blue_Led_On()
+{
+    INIT_GPIO_BLUE_LED
+    BLUE_LED_ON
+    LED_SET_DELAY
+}
+
+void Turn_Blue_Led_Off()
+{
+    BLUE_LED_OFF
+}
+
+void Turn_Red_Led_On()
+{
+    INIT_GPIO_RED_LED
+    RED_LED_ON
+    LED_SET_DELAY
+}
+
+void Turn_Red_Led_Off()
+{
+    RED_LED_OFF
+}
+
+
+void Test_3_Color_Led()
+{
+    char i;
+
+    for (i=0;i<5000;i++)
+    {
+        Turn_Green_Led_On();
+        Turn_Green_Led_Off();
+
+        Turn_Blue_Led_On();
+        Turn_Blue_Led_Off();
+
+        Turn_Red_Led_On();
+        Turn_Red_Led_Off();
+    }
+}
diff --git a/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/User_Leds.h b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/User_Leds.h
new file mode 100644
index 000000000..5f0016bda
--- /dev/null
+++ b/Software/Code_Composer/twine_usblib_demo/Stubs_Handler/User_Leds.h
@@ -0,0 +1,23 @@
+#ifndef USER_LEDS_H
+#define USER_LEDS_H
+
+#define GPIO_BYTE   (GPIO_PIN_0 | GPIO_PIN_1 | GPIO_PIN_2 | GPIO_PIN_3 | GPIO_PIN_4 | GPIO_PIN_5 | GPIO_PIN_6 | GPIO_PIN_7)
+
+#define INIT_GPIO_GREEN_LED  ROM_GPIOPinTypeGPIOOutput(GPIO_PORTQ_BASE, GPIO_PIN_7); // set PQ7 to output (Green LED)
+#define INIT_GPIO_BLUE_LED   ROM_GPIOPinTypeGPIOOutput(GPIO_PORTQ_BASE, GPIO_PIN_4); // set PQ4 to output (Blue LED)
+#define INIT_GPIO_RED_LED    ROM_GPIOPinTypeGPIOOutput(GPIO_PORTN_BASE, GPIO_PIN_5); // set PN5 to output (RED LED)
+
+#define GREEN_LED_ON  ROM_GPIOPinWrite(GPIO_PORTQ_BASE, GPIO_PIN_7, ROM_GPIOPinRead(GPIO_PORTQ_BASE, GPIO_BYTE) |  GPIO_PIN_7); //Turn the GREEN led on
+#define GREEN_LED_OFF ROM_GPIOPinWrite(GPIO_PORTQ_BASE, GPIO_PIN_7, ROM_GPIOPinRead(GPIO_PORTQ_BASE, GPIO_BYTE) & ~ GPIO_PIN_7); //Turn the GREEN led off
+
+#define BLUE_LED_ON   ROM_GPIOPinWrite(GPIO_PORTQ_BASE, GPIO_PIN_4, ROM_GPIOPinRead(GPIO_PORTQ_BASE, GPIO_BYTE) |  GPIO_PIN_4); //Turn the BLUE led on
+#define BLUE_LED_OFF  ROM_GPIOPinWrite(GPIO_PORTQ_BASE, GPIO_PIN_4, ROM_GPIOPinRead(GPIO_PORTQ_BASE, GPIO_BYTE) & ~ GPIO_PIN_4); //Turn the BLUE led off
+
+#define RED_LED_ON    ROM_GPIOPinWrite(GPIO_PORTN_BASE, GPIO_PIN_5, ROM_GPIOPinRead(GPIO_PORTN_BASE, GPIO_BYTE) |  GPIO_PIN_5); //Turn the RED led on
+#define RED_LED_OFF   ROM_GPIOPinWrite(GPIO_PORTN_BASE, GPIO_PIN_5, ROM_GPIOPinRead(GPIO_PORTN_BASE, GPIO_BYTE) & ~ GPIO_PIN_5); //Turn the RED led off
+
+#define LED_SET_DELAY SysCtlDelay(10000000); // need #include "driverlib/sysctl.h"
+
+void Test_3_Color_Led();
+
+#endif //USER_LEDS_H
diff --git a/Software/Code_Composer/twine_usblib_demo/main.c b/Software/Code_Composer/twine_usblib_demo/main.c
index 88b7b5e91..4f7545ea6 100644
--- a/Software/Code_Composer/twine_usblib_demo/main.c
+++ b/Software/Code_Composer/twine_usblib_demo/main.c
@@ -4,7 +4,16 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
-#include <Stub_GPIO.h>
+#include <Stubs_Handler/Calculate.h>
+#include <Stubs_Handler/Progress.h>
+#include <Stubs_Handler/Stub_Cartridge.h>
+#include <Stubs_Handler/Stub_Dispenser.h>
+#include <Stubs_Handler/Stub_GPIO.h>
+#include <Stubs_Handler/Stub_Heater.h>
+#include <Stubs_Handler/Stub_MotorEncoder.h>
+#include <Stubs_Handler/Stub_OptLimitSwitch.h>
+#include <Stubs_Handler/Stub_SteperMotor.h>
+#include <Stubs_Handler/Stub_Valve.h>
 #include "inc/hw_ints.h"
 #include "inc/hw_memmap.h"
 #include "inc/hw_types.h"
@@ -28,13 +37,9 @@
 #include "utils/ustdlib.h"
 #include "usb_serial_adapter.h"
 #include "graphics_adapter.h"
-#include "MessageContainer.pb-c.h"
-#include "CalculateRequest.pb-c.h"
-#include "CalculateResponse.pb-c.h"
-#include "ProgressRequest.pb-c.h"
-#include "ProgressResponse.pb-c.h"
-
 
+#include "Stubs_Handler/Container.h"
+#include "Stubs_Handler/User_Leds.h"
 
 //*****************************************************************************
 //
@@ -54,7 +59,7 @@ static volatile uint32_t g_ui32SysTickCount = 0;
 // Flags used to pass commands from interrupt context to the main loop.
 static volatile uint32_t g_ui32Flags;
 
-MessageContainer createContainer(MessageType type, char* token, protobuf_c_boolean completed, void* response, size_t (*packPtr)(void*, uint8_t*), size_t (*sizePtr)(void*));
+//MessageContainer createContainer(MessageType type, char* token, protobuf_c_boolean completed, void* response, size_t (*packPtr)(void*, uint8_t*), size_t (*sizePtr)(void*));
 
 //*****************************************************************************
 //
@@ -77,191 +82,6 @@ void USB0Handler(void)
     InitUSB();
 }
 
-void receive_callback(char* buffer, size_t length)
-{
-     //SendChars(buffer,length);
-     //draw_string(buffer, length);
-     //draw_image((uint8_t *)buffer);
-
-     writeLine("Received ");
-     writeFloat(length);
-     writeString(" bytes");
-     writeLine("Parsing message...");
-
-     MessageContainer* requestContainer = message_container__unpack(NULL, length, (uint8_t*)buffer);
-
-     MessageContainer responseContainer;
-
-     //Avi->
-
-     if (requestContainer->type == MESSAGE_TYPE__Stub_GPIOWriteBitRequest)
-     {
-         Stub_GPIOWriteBitRequest(requestContainer);
-         return;
-     }
-     else if (requestContainer->type == MESSAGE_TYPE__Stub_GPIOReadByteRequest)
-     {
-         Stub_GPIOReadByteRequest(requestContainer);
-         return;
-     }
-     //<-Avi
-
-     else if (requestContainer->type == MESSAGE_TYPE__CalculateRequest)
-    {
-             CalculateRequest* request = calculate_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
-
-             writeLine("Calculate Request: ");
-             writeFloat(request->a);
-             writeString(" + ");
-             writeFloat(request->b);
-
-             CalculateResponse response = CALCULATE_RESPONSE__INIT;
-             response.sum = request->a + request->b;
-             response.has_sum = true;
-
-             responseContainer = createContainer(MESSAGE_TYPE__CalculateResponse, requestContainer->token, true, &response, &calculate_response__pack, &calculate_response__get_packed_size);
-
-             writeLine("Sending Response: ");
-             writeFloat(response.sum);
-
-             free(request);
-    }
-    else if (requestContainer->type == MESSAGE_TYPE__ProgressRequest)
-    {
-            ProgressRequest* request = progress_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
-
-            writeLine("Progress Request...");
-
-            ProgressResponse response = PROGRESS_RESPONSE__INIT;
-            response.has_progress = true;
-
-            int i = 0;
-            for (i = 0; i < request->amount; i++)
-            {
-                response.progress = i;
-                responseContainer = createContainer(MESSAGE_TYPE__ProgressResponse, requestContainer->token, false, &response, &progress_response__pack, &progress_response__get_packed_size);
-                uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
-                size_t container_size = message_container__pack(&responseContainer, container_buffer);
-                writeLine("Sending Progress: ");
-                writeFloat(response.progress);
-                SendChars((char*)container_buffer, container_size);
-
-                int co = 0;
-                for (co = 0; co < request->delay; co++)
-                {
-                    __delay_cycles(1000000);
-                }
-            }
-
-            responseContainer = createContainer(MESSAGE_TYPE__ProgressResponse, requestContainer->token, true, &response, &progress_response__pack, &progress_response__get_packed_size);
-            uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
-            size_t container_size = message_container__pack(&responseContainer, container_buffer);
-            writeLine("Progress Completed!");
-            SendChars((char*)container_buffer, container_size);
-            return;
-    }
-
-    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
-    size_t container_size = message_container__pack(&responseContainer, container_buffer);
-    SendChars((char*)container_buffer, container_size);
-    free(container_buffer);
-    free(requestContainer);
-}
-
-MessageContainer createContainer(MessageType type, char* token, protobuf_c_boolean completed, void* response, size_t (*packPtr)(void*, uint8_t*), size_t (*sizePtr)(void*))
-{
-    MessageContainer container = MESSAGE_CONTAINER__INIT;
-    container.completed = completed;
-    container.token = token;
-    container.has_completed = true;
-    container.has_data = true;
-    container.has_type = true;
-    container.type = type;
-
-
-
-    uint8_t* response_buffer = malloc((*sizePtr)(response));
-    size_t response_size = (*packPtr)(response, response_buffer);
-    container.data.data = response_buffer;
-    container.data.len = response_size;
-
-    free(response);
-    return container;
-}
-
-
-void user_leds()//AVI
-{
-    /*#define RED_LED   GPIO_PIN_1
-    #define BLUE_LED  GPIO_PIN_2
-    #define GREEN_LED GPIO_PIN_3
-
-    char i;
-
-    //for(i=0;i<30;i++)
-    while(1)
-    {
-        // Turn on the LED
-        //GPIOPinWrite(GPIO_PORTF_BASE, RED_LED|BLUE_LED|GREEN_LED, RED_LED);
-        GPIOPinWrite(GPIO_PORTG_BASE, GPIO_PIN_2, GPIO_PIN_2);
-        // Delay for a bit
-        SysCtlDelay(5000000);
-
-
-        // Turn on the LED
-        //GPIOPinWrite(GPIO_PORTF_BASE, RED_LED|BLUE_LED|GREEN_LED, BLUE_LED);
-        // Delay for a bit
-        SysCtlDelay(2000000);
-
-        // Turn on the LED
-        //GPIOPinWrite(GPIO_PORTF_BASE, RED_LED|BLUE_LED|GREEN_LED, RED_LED);
-        // Delay for a bit
-        SysCtlDelay(2000000);
-
-    }*/
-    uint32_t ui32Loop;
-
-    //
-        // Enable the GPIO port that is used for the on-board LED.
-        //
-        SysCtlPeripheralEnable(SYSCTL_PERIPH_GPIOG);
-
-        //
-        // Check if the peripheral access is enabled.
-        //
-        while(!SysCtlPeripheralReady(SYSCTL_PERIPH_GPIOG))
-        {
-        }
-
-
-    while(1)
-        {
-            //
-            // Turn on the LED.
-            //
-            GPIOPinWrite(GPIO_PORTG_BASE, GPIO_PIN_2, GPIO_PIN_2);
-
-            //
-            // Delay for a bit.
-            //
-            for(ui32Loop = 0; ui32Loop < 200000; ui32Loop++)
-            {
-            }
-
-            //
-            // Turn off the LED.
-            //
-            GPIOPinWrite(GPIO_PORTG_BASE, GPIO_PIN_2, 0);
-
-            //
-            // Delay for a bit.
-            //
-            for(ui32Loop = 0; ui32Loop < 200000; ui32Loop++)
-            {
-            }
-        }
-}
-
 int main(void)
 {
     uint32_t  ui32SysClock, ui32PLLRate;
@@ -285,7 +105,9 @@ int main(void)
     init_graphics(ui32SysClock);
     clear();
 
-    user_leds();//AVI
+    ///////////////
+    //Test_3_Color_Led();
+    /////////////////////
 
     RegisterReceiveCallback(&receive_callback);
     StartUSB(ui32SysClock);