some protobuf for pack 4

7 files changed, 11 insertions, 37 deletions

diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h
index 91b3df6bf..2f61843a2 100644
--- a/Software/Embedded_SW/Embedded/DataDef.h
+++ b/Software/Embedded_SW/Embedded/DataDef.h
@@ -32,7 +32,7 @@
 
 #define USE_RFID_STUB //stub only. to use it undef USE_RFID_LOGIC
 //#define RFID_READ_ONLY //
-#define USE_RFID_LOGIC //See more settings in RFID_Settings.h
+//#define USE_RFID_LOGIC //See more settings in RFID_Settings.h
 //#define USE_POWERSTEP01 -NA
 //#define LIGHT_COLORS
 //#define EMC_FORCE_MOT_CLOCK_INTERNAL
diff --git a/Software/PMR/Messages/Common/MessageType.proto b/Software/PMR/Messages/Common/MessageType.proto
index 152408996..a1965ee91 100644
--- a/Software/PMR/Messages/Common/MessageType.proto
+++ b/Software/PMR/Messages/Common/MessageType.proto
@@ -127,8 +127,6 @@ enum MessageType
 	StubHeadEEpromResponse = 114;
 	ProcedureRequest = 115;
 	ProcedureResponse = 116;
-	StubAllHardwareRequest = 117;
-	StubAllHardwareResponse = 118;
 	//------------------------------------
 
 
diff --git a/Software/PMR/Messages/Hardware/HardwareDancerType.proto b/Software/PMR/Messages/Hardware/HardwareDancerType.proto
index b51f10c7a..a7c9e005d 100644
--- a/Software/PMR/Messages/Hardware/HardwareDancerType.proto
+++ b/Software/PMR/Messages/Hardware/HardwareDancerType.proto
@@ -25,4 +25,10 @@ enum HardwareDancerType
     //Right Dancer
     RightDancer = 2;
 
+    //4x 3rd dancer
+    ThirdDancer = 3;
+
+    //4x 4th Dancer
+    FourthDancer = 4;
+
 }
diff --git a/Software/PMR/Messages/Stubs/ProcedureRequest.proto b/Software/PMR/Messages/Stubs/ProcedureRequest.proto
index 2c65a2910..0a78ac9bd 100644
--- a/Software/PMR/Messages/Stubs/ProcedureRequest.proto
+++ b/Software/PMR/Messages/Stubs/ProcedureRequest.proto
@@ -7,8 +7,6 @@ message ProcedureRequest
 {
 	int32 Type = 1;
 	int32 Timeout = 2;
-	float Param1 = 3;
-	float Param2 = 4;
-	float Param3 = 5;
-	float Param4 = 6;
+	string TestName = 3;
+	repeated float Param = 4;
 }
\ No newline at end of file
diff --git a/Software/PMR/Messages/Stubs/ProcedureResponse.proto b/Software/PMR/Messages/Stubs/ProcedureResponse.proto
index 840ba054b..400b20bba 100644
--- a/Software/PMR/Messages/Stubs/ProcedureResponse.proto
+++ b/Software/PMR/Messages/Stubs/ProcedureResponse.proto
@@ -7,7 +7,6 @@ message ProcedureResponse
 {
 	int32 Type = 1;
 	int32 Time = 2;
-	float ReplyValue1 = 3;
-	float ReplyValue2 = 4;
-	float ReplyValue3 = 5;
+	string ReplyMessage = 3;
+	repeated float ReplyValue = 4;
 }
\ No newline at end of file
diff --git a/Software/PMR/Messages/Stubs/StubAllHardwareRequest.proto b/Software/PMR/Messages/Stubs/StubAllHardwareRequest.proto
deleted file mode 100644
index 9a6565c32..000000000
--- a/Software/PMR/Messages/Stubs/StubAllHardwareRequest.proto
+++ /dev/null
@@ -1,8 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.Stubs;
-option java_package = "com.twine.tango.pmr.stubs";
-
-message StubAllHardwareRequest
-{
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Stubs/StubAllHardwareResponse.proto b/Software/PMR/Messages/Stubs/StubAllHardwareResponse.proto
deleted file mode 100644
index 67adde136..000000000
--- a/Software/PMR/Messages/Stubs/StubAllHardwareResponse.proto
+++ /dev/null
@@ -1,19 +0,0 @@
-syntax = "proto3";
-
-import "StubHeadEEpromData.proto";
-import "StubWhsEEpromData.proto";
-import "StubDispenserEEpromResponse.proto";
-import "StubMainCardEEpromReadResponse.proto";
-
-
-package Tango.PMR.Stubs;
-option java_package = "com.twine.tango.pmr.stubs";
-
-message StubAllHardwareResponse
-{
-	string MCU_Serial = 1;
-	StubHeadEEpromData HeadEEprom = 2;
-	StubWhsEEpromData WhsEEprom = 3;
-	repeated StubMainCardEEpromReadResponse MainCardEEpromData = 4;
-	repeated StubDispenserEEpromResponse DispenserEEpromData = 5;
-}