some changes to the protobuf

6 files changed, 108 insertions, 5 deletions

diff --git a/Software/PMR/Messages/Debugging/StartDebugLogResponse.proto b/Software/PMR/Messages/Debugging/StartDebugLogResponse.proto
index 09e238517..3375b8887 100644
--- a/Software/PMR/Messages/Debugging/StartDebugLogResponse.proto
+++ b/Software/PMR/Messages/Debugging/StartDebugLogResponse.proto
@@ -9,9 +9,9 @@ message StartDebugLogResponse
 {
 	DebugLogCategory 	Category = 1;
 	string 				FileName = 2;
-	uint32 				LineNumber = 3;
-	uint32  			Filter = 4;
-	string      		Message = 5;
-	uint32      		ModuleId = 6;
-	uint32 				Parameter = 7;
+	int32 				LineNumber = 3;
+	int32  				Filter = 4;
+	string     			Message = 5;
+    int32      			ModuleId = 6;
+	int32				Parameter = 7;
 }
\ No newline at end of file
diff --git a/Software/PMR/Messages/Stubs/StubAllHardwareRequest.proto b/Software/PMR/Messages/Stubs/StubAllHardwareRequest.proto
new file mode 100644
index 000000000..9a6565c32
--- /dev/null
+++ b/Software/PMR/Messages/Stubs/StubAllHardwareRequest.proto
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000..67adde136
--- /dev/null
+++ b/Software/PMR/Messages/Stubs/StubAllHardwareResponse.proto
@@ -0,0 +1,19 @@
+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;
+}
diff --git a/Software/PMR/Messages/Stubs/StubHeadEEpromData.proto b/Software/PMR/Messages/Stubs/StubHeadEEpromData.proto
new file mode 100644
index 000000000..cae31c04a
--- /dev/null
+++ b/Software/PMR/Messages/Stubs/StubHeadEEpromData.proto
@@ -0,0 +1,53 @@
+syntax = "proto3";
+
+package Tango.PMR.Stubs;
+option java_package = "com.twine.tango.pmr.stubs";
+
+message StubHeadEEpromData
+{
+ uint32 Header = 1;
+ uint32 Table_Length = 2;
+ uint32 Table_version = 3;
+ string Head_SN = 4;
+ string PCB_SN = 5;
+ string Head_Part_Number = 6;
+ string PCB_Part_Number = 7;
+ uint32 RunningHours = 8;
+ uint32 SW_Reserve = 9;
+ string TestPassFail = 10;
+ uint32 ATS_Location = 11;
+ double Orifice_Waste_Level_V0_ml = 12;
+ uint32 HeadType = 13;
+ uint32 BlowerRunHours1 = 14;
+ uint32 BlowerRunHours2 = 15;
+ uint32 FanFilterMaxLifecycle = 16;
+ uint32 FansFilterUsageHours = 17;
+ uint32 FilterSpare1 = 18;
+ uint32 FilterSpare2 = 19;
+ uint32 BenchTestD = 20;
+ uint32 Spare1 = 21;
+ uint32 Spare2 = 22;
+ string ProductionTestDate = 23;
+ uint32 FuncTestStatus = 24;
+ string PresSensPCB_SN = 25;
+ string PresSensPCB_PN = 26;
+ string PressCalibDate1 = 27;
+ uint32 PressWithoutBlower_mV1 = 28;
+ uint32 PressWithMinBlower_mV1 = 29;
+ uint32 PressMaxPress_mV1 = 30;
+ string PressCalibDate2 = 31;
+ uint32 PressWithoutBlower_mV2 = 32;
+ uint32 PressWithMinBlower_mV2 = 33;
+ uint32 PressMaxPress_mV2 = 34;
+ uint32 FansMinPWM = 35;
+ uint32 FansMinRPM = 36;
+ uint32 FansMaxPWM = 37;
+ uint32 FansMaxRPM = 38;
+ uint32 FansNomPWM = 39;
+ uint32 FansNomRPM = 40;
+ uint32 FansLimitRPM = 41;// [%] below Nom
+ uint32 FansTachoPPR = 42;
+ uint32 FansSpare1 = 43;
+ uint32 FansSpare2 = 44;
+ uint32 CheckSum = 45;
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Stubs/StubHeadEEpromRequest.proto b/Software/PMR/Messages/Stubs/StubHeadEEpromRequest.proto
new file mode 100644
index 000000000..7c098d915
--- /dev/null
+++ b/Software/PMR/Messages/Stubs/StubHeadEEpromRequest.proto
@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+import "StubHeadEEpromData.proto";
+
+package Tango.PMR.Stubs;
+option java_package = "com.twine.tango.pmr.stubs";
+
+message StubHeadEEpromRequest
+{
+	bool BurnRequest = 1;
+	StubHeadEEpromData HeadEEprom = 2;
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/Stubs/StubHeadEEpromResponse.proto b/Software/PMR/Messages/Stubs/StubHeadEEpromResponse.proto
new file mode 100644
index 000000000..479df1293
--- /dev/null
+++ b/Software/PMR/Messages/Stubs/StubHeadEEpromResponse.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+import "StubHeadEEpromData.proto";
+
+package Tango.PMR.Stubs;
+option java_package = "com.twine.tango.pmr.stubs";
+
+message StubHeadEEpromResponse
+{
+	StubHeadEEpromData HeadEEprom = 1;
+}
\ No newline at end of file