merge

6 files changed, 47 insertions, 109 deletions

diff --git a/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto b/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto
index 51fd85311..1dbd9515d 100644
--- a/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto
+++ b/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto
@@ -9,14 +9,15 @@ import "EventType.proto";
 
 message AlarmHandlingItem
 {
-    AlarmSourceType AlarmSource = 1;
-    uint32 DeviceId = 2;
-    uint32 ModuleDeviceId = 3;
-    uint32 AlarmValue = 4;
-    bool AlarmDirection = 5;
-    Debugging.DebugLogCategory Severity = 6;
-    uint32 DebounceValue = 7;
-    Diagnostics.EventType EventType = 8;
-    string EventName = 9;
-    bool IsPersistent = 10;
-}
+	AlarmSourceType AlarmSource = 1;
+    uint32 Frequency = 2;  //1/10/100/1000
+    uint32 DeviceId = 3;
+    uint32 ModuleDeviceId = 4;
+    uint32 AlarmValue = 5;
+    bool AlarmDirection = 6;
+    Debugging.DebugLogCategory Severity = 7;
+    uint32 Predecessor = 8;
+    uint32 DebounceValue = 9;
+    Diagnostics.EventType EventType = 10;
+    string EventName = 11;
+    }
diff --git a/Software/PMR/Messages/EmbeddedParameters/ConfigurationParameters.proto b/Software/PMR/Messages/EmbeddedParameters/ConfigurationParameters.proto
index da01452f4..1752307ad 100644
--- a/Software/PMR/Messages/EmbeddedParameters/ConfigurationParameters.proto
+++ b/Software/PMR/Messages/EmbeddedParameters/ConfigurationParameters.proto
@@ -8,78 +8,61 @@ option java_package = "com.twine.tango.pmr.embeddedparameters";
 message ConfigurationParameters
 {
 
-// Break Sensor Limit
+//#define BREAK_SENSOR_LIMIT 10
     uint32 BreakSensorLimit = 1;
-
-// Diagnostics send interval in milliseconds 2
-    uint32 DiagnosticCollectionLimit = 2;  //obsolete
-
-// Overheat Count Limit
-    uint32 OverHeatCountLimit = 3; //obsolete
-
-// Underheat Count Limit
-    uint32 UnderHeatCountLimit = 4; //obsolete
-
-// Close Valve Timeout
+//#define Diagnostics send interval in milliseconds 2
+    uint32 DiagnosticCollectionLimit = 2;
+//#define OVERHEAT_COUNT_LIMIT 3
+    uint32 OverHeatCountLimit = 3;
+//#define UNDERHEAT_COUNT_LIMIT 3
+    uint32 UnderHeatCountLimit = 4;
+//uint32_t CloseValveTimeout = 250;
     uint32 CloseValveTimeout = 5;
-
-// Open Valve Timeout = 250;
+//uint32_t OpenValveTimeout = 250;
     uint32 OpenValveTimeout = 6;
-
-// Initial Dispenser Pressure
-    double InitialDispenserPressure = 7; //obsolete
-
-// Initial Dispenser Timeout Limit
-    uint32 InitialDispenserTimeout = 8;//obsolete
-
-// Initial Dispenser Timeout
-    uint32 InitialDispenserTimeLag = 9;//obsolete
-
-// Dispenser prepare pressure building parameters - job prepare
+	//#define INITIAL_DISPENSER_PRESSURE 0.10
+    double InitialDispenserPressure = 7;
+//#define INITIAL_DISPENSER_TIMEOUT_LIMIT 10000
+    uint32 InitialDispenserTimeout = 8;
+//#define INITIAL_DISPENSER_TIMEOUT 100
+    uint32 InitialDispenserTimeLag = 9;
+//#define DISPENSER_BUILD_PRESSURE_SPEED 500
 	uint32 DispenserBuildPressureSpeed = 10;
+//#define DISPENSER_BUILD_PRESSURE_LIMIT 0.5
 	double DispenserBuildPressureLimit = 11;
+//#define DISPENSER_BUILD_PRESSURE_TIMEOUT 8000
 	uint32 DispenserBuildPressureTimeout = 12;
+//#define DISPENSER_BUILD_PRESSURE_LAG 50
 	uint32 DispenserBuildPressureLag = 13;
-
-//sets the temperature frame for approving job start - in promil above and beyond target temperatures
+	//sets the temperature frame for approving job start - in promil above and beyond target temperatures
 	uint32 ACHeatersLowerOperationLimit = 14;
 	uint32 ACHeatersUpperOperationLimit = 15;
 	uint32 DCHeatersLowerOperationLimit = 16;
 	uint32 DCHeatersUpperOperationLimit = 17;
-
-	double MidTankPressureCorrection = 18; //obsolete
-
-//Waste Flow Correction Factor
+	double MidTankPressureCorrection = 18;
+	//Waste Flow Correction Factor
 	double DispenserPresegmentWFCF = 19;
-
-//disable heating start on init
+	//disable heating start on init
 	bool StartHeatingOnInitSequence = 20;
-
-// general storage for parameters that do not have a specific name updated
+	// general storage for parameters that do not have a specific name updated
 	repeated double GeneralParameters = 21;
-	//0: Check HardLimit Alarms
-	//1: Check Current Alarms
-	//2: Check Tamper Alarms
-	//3: Check Motor Alarms
-	//4: Winder Back To Base Time
-	//5: initial dispenser speed
-	//6: checkTamperAlarms
-	//7: checkTamperAlarms
-	//8: checkTamperAlarms
+	//0: CheckHardLimitAlarms
+	//1: CheckCurrentAlarms
+	//2: checkTamperAlarms
 
-// a limit percentage for current deviation below predefined level
+	// a limit percentage for current deviation below predefined level
 	double CurrentAlarmLowLimit = 22;
+	// a limit percentage for current deviation  predefined level
 	double CurrentAlarmHighLimit = 23;
-
-//how much time before next segment the automatic refill should stop
+	//how much time before next segment the automatic refill should stop
 	double IDS_SegmentRefillTimeout = 24;
-
-// how much running to waste time during presegment
+	// how much running to waste time during presegment
 	double IDS_PreSegmentBuildupTime = 25;
-
-//cleaning dispenser motor speed and timing - going to move to RML
+	//cleaning dispenser motorspeed
 	double IDS_CleaningSpeed = 26;
+	//cleaning dispenser stop before segment  start
 	double IDS_CleaningStopBeforeSegmentTime = 27;
+	//cleaning dispenser start during pre segment
 	double IDS_CleaningStartSprayPreSegmentTime = 28;
 	double IDS_LeftCleaningMotorSpeed = 29;
 	double IDS_RightCleaningMotorSpeed = 30;
@@ -93,7 +76,6 @@ message ConfigurationParameters
 
 	double IDS_PreSegment_WFCF_TimeBeforeSegment = 36;
 
-	uint32 FileVersion = 37;
-	string Description = 38;
+
 
 }
diff --git a/Software/PMR/Messages/EmbeddedParameters/MainCardStoredData.proto b/Software/PMR/Messages/EmbeddedParameters/MainCardStoredData.proto
deleted file mode 100644
index 3ed995c5f..000000000
--- a/Software/PMR/Messages/EmbeddedParameters/MainCardStoredData.proto
+++ /dev/null
@@ -1,12 +0,0 @@
-syntax = "proto3";
-
-import "MainCardStoredItem.proto";
-
-package Tango.PMR.EmbeddedParameters;
-option java_package = "com.twine.tango.pmr.embeddedparameters";
-
-message MainCardStoredData
-{
-    string MainCardS_N = 1;
-    repeated MainCardStoredItem StoredItem = 2;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/EmbeddedParameters/MainCardStoredDataRequest.proto b/Software/PMR/Messages/EmbeddedParameters/MainCardStoredDataRequest.proto
deleted file mode 100644
index 75d5579f2..000000000
--- a/Software/PMR/Messages/EmbeddedParameters/MainCardStoredDataRequest.proto
+++ /dev/null
@@ -1,12 +0,0 @@
-syntax = "proto3";
-
-import "MainCardStoredData.proto";
-
-package Tango.PMR.EmbeddedParameters;
-option java_package = "com.twine.tango.pmr.embeddedparameters";
-
-message MainCardStoredDataRequest
-{
-	bool BurnRequest = 1;
-	MainCardStoredData MainCardStoredData = 2;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/EmbeddedParameters/MainCardStoredDataResponse.proto b/Software/PMR/Messages/EmbeddedParameters/MainCardStoredDataResponse.proto
deleted file mode 100644
index 8ee42e6b0..000000000
--- a/Software/PMR/Messages/EmbeddedParameters/MainCardStoredDataResponse.proto
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax = "proto3";
-
-import "MainCardStoredData.proto";
-
-package Tango.PMR.EmbeddedParameters;
-option java_package = "com.twine.tango.pmr.embeddedparameters";
-
-message MainCardStoredDataResponse
-{
-	MainCardStoredData MainCardStoredData = 1;
-}
\ No newline at end of file
diff --git a/Software/PMR/Messages/EmbeddedParameters/MainCardStoredItem.proto b/Software/PMR/Messages/EmbeddedParameters/MainCardStoredItem.proto
deleted file mode 100644
index 3b5ab8ee8..000000000
--- a/Software/PMR/Messages/EmbeddedParameters/MainCardStoredItem.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-package Tango.PMR.EmbeddedParameters;
-option java_package = "com.twine.tango.pmr.embeddedparameters";
-
-message MainCardStoredItem
-{
-    uint32 Address = 1;
-    uint32 Data = 2;
-}
\ No newline at end of file