diff options
4 files changed, 7 insertions, 15 deletions
diff --git a/Software/PMR/Messages/Stubs/StubCartridgeReadResponse.proto b/Software/PMR/Messages/Stubs/StubCartridgeReadResponse.proto index 1def2e020..4007232b0 100644 --- a/Software/PMR/Messages/Stubs/StubCartridgeReadResponse.proto +++ b/Software/PMR/Messages/Stubs/StubCartridgeReadResponse.proto @@ -1,15 +1,11 @@ syntax = "proto3"; +import "Cartridge.proto"; + package Tango.PMR.Stubs; option java_package = "com.twine.tango.pmr.stubs"; message StubCartridgeReadResponse { - uint32 CartridgeId = 1; - uint32 CartridgeColor = 2; - uint32 CartridgeVersion = 3; - int32 CartridgeData = 4; - bool CartridgeUsed = 5; - string Status = 6; // Passed/Failed - uint32 StatusWord = 7; // Error number/bit when the status is Failed + PMR.Diagnostics.Cartridge Cartridge = 1; }
\ No newline at end of file diff --git a/Software/PMR/Messages/Stubs/StubCartridgeWriteRequest.proto b/Software/PMR/Messages/Stubs/StubCartridgeWriteRequest.proto index 11b8d41ae..aa9214186 100644 --- a/Software/PMR/Messages/Stubs/StubCartridgeWriteRequest.proto +++ b/Software/PMR/Messages/Stubs/StubCartridgeWriteRequest.proto @@ -1,14 +1,12 @@ syntax = "proto3"; +import "Cartridge.proto"; + package Tango.PMR.Stubs; option java_package = "com.twine.tango.pmr.stubs"; message StubCartridgeWriteRequest { - uint32 CartridgeId = 1;//0..7 - uint32 CartridgeColor = 2;// - uint32 CartridgeVersion = 3; - uint32 CartridgeData = 4; - bool CartridgeUsed = 5; // 0 - new 1- used + PMR.Diagnostics.Cartridge Cartridge = 1; } diff --git a/Software/PMR/Messages/Stubs/StubCartridgeWriteResponse.proto b/Software/PMR/Messages/Stubs/StubCartridgeWriteResponse.proto index f916c60fd..7e0318c5d 100644 --- a/Software/PMR/Messages/Stubs/StubCartridgeWriteResponse.proto +++ b/Software/PMR/Messages/Stubs/StubCartridgeWriteResponse.proto @@ -6,6 +6,4 @@ option java_package = "com.twine.tango.pmr.stubs"; message StubCartridgeWriteResponse { uint32 CartridgeId = 1; - string Status = 2; // Passed/Failed - uint32 StatusWord = 3; // Error number/bit when the status is Failed }
\ No newline at end of file diff --git a/Software/Stubs Collection/stubs/embeddedparametersbuild.cs b/Software/Stubs Collection/stubs/embeddedparametersbuild.cs index 1ac7b6d53..e8ad8db52 100644 --- a/Software/Stubs Collection/stubs/embeddedparametersbuild.cs +++ b/Software/Stubs Collection/stubs/embeddedparametersbuild.cs @@ -101,7 +101,7 @@ configurationParameters.GeneralParameters.Add(checkCurrentAlarms); /*3*/ Double checkTamperAlarms = new Double(); -checkTamperAlarms = 0.0; +checkTamperAlarms = 1.0; configurationParameters.GeneralParameters.Add(checkTamperAlarms); /*4*/ |