merge

2 files changed, 5 insertions, 75 deletions

diff --git a/Software/PMR/Messages/Common/ErrorCode.proto b/Software/PMR/Messages/Common/ErrorCode.proto
index 7121516cb..3b22192cb 100644
--- a/Software/PMR/Messages/Common/ErrorCode.proto
+++ b/Software/PMR/Messages/Common/ErrorCode.proto
@@ -57,21 +57,6 @@ enum ErrorCode
 	JOB_LIDS_OPEN = 2013;
 	JOB_ABORTED_BY_USER = 2014;
 	JOB_SAFETY_ALARM = 2015;
-	JOB_NO_ALARM_FILE = 2016;
-	JOB_FILE_PROBLEM = 2017;
-	JOB_WASTE_HANDLING_PROBLEM = 2018;
 
-	//power up
-    POWER_UP_NO_CFG_FILE = 3000;
-    POWER_UP_HW_CONFIG_FAILED = 3001;
-    POWER_UP_BUILT_IN_FAILED = 3002;
-    POWER_UP_INITIAL_BLOWER_FAILED = 3003;
-    POWER_UP_DISPENSER_PRESSURE_BUILDUP_FAILED = 3004;
-    POWER_UP_NO_THREAD_DETECTED = 3005;
-    POWER_UP_NO_PROCESS_PARAMS = 3006;
 
-
-	//DataStore
-	GENERAL_DATASTORE_ERROR = 4000;
-	KEY_NOT_FOUND = 4001;
 }
diff --git a/Software/PMR/Messages/Common/MessageType.proto b/Software/PMR/Messages/Common/MessageType.proto
index a1965ee91..a9bd65db9 100644
--- a/Software/PMR/Messages/Common/MessageType.proto
+++ b/Software/PMR/Messages/Common/MessageType.proto
@@ -115,18 +115,6 @@ enum MessageType
 	StubAbortJobResponse = 102;
 	StubMidTankPressureSensorRequest = 103;
 	StubMidTankPressureSensorResponse = 104;
-	StubDispenserEEpromRequest = 105;
-	StubDispenserEEpromResponse = 106;
-	StubWhsEEpromRequest = 107;
-	StubWhsEEpromResponse = 108;
-	StubMainCardEEpromReadRequest = 109;
-	StubMainCardEEpromReadResponse = 110;
-	StubMainCardEEpromWriteRequest = 111;
-	StubMainCardEEpromWriteResponse = 112;
-	StubHeadEEpromRequest = 113;
-	StubHeadEEpromResponse = 114;
-	ProcedureRequest = 115;
-	ProcedureResponse = 116;
 	//------------------------------------
 
 
@@ -148,10 +136,6 @@ enum MessageType
 	ColorProfileResponse = 1014;
 	UpdateStatusRequest = 1015;
 	UpdateStatusResponse = 1016;
-	GenericRequest = 1017;
-	GenericResponse = 1018;
-	ConfigureProtocolRequest = 1019;
-	ConfigureProtocolResponse = 1020;
 
 
 
@@ -196,9 +180,14 @@ enum MessageType
 	SetBlowerStateResponse = 2037;
 	SetValveStateRequest = 2038;
 	SetValveStateResponse = 2039;
+	StartCartridgesUpdateRequest = 2040;
+	StartCartridgesUpdateResponse = 2041;
+	StopCartridgesUpdateRequest = 2042;
+	StopCartridgesUpdateResponse = 2043;
 	CartridgeValidationRequest = 2044;
 	CartridgeValidationResponse = 2045;
 
+
 	//Printing
 	JobRequest = 3000;
 	JobResponse = 3001;
@@ -210,10 +199,6 @@ enum MessageType
 	CurrentJobResponse = 3007;
 	ResumeCurrentJobRequest = 3008;
 	ResumeCurrentJobResponse = 3009;
-	StartHeadCleaningRequest = 3010;
-	StartHeadCleaningResponse = 3011;
-	AbortHeadCleaningRequest = 3012;
-	AbortHeadCleaningResponse = 3013;
 
 
 
@@ -224,8 +209,6 @@ enum MessageType
 	StopDebugLogResponse = 4003;
 	SetDebugLogCategoryRequest = 4004;
 	SetDebugLogCategoryResponse = 4005;
-	SetupDebugDisributorsRequest = 4006;
-	SetupDebugDisributorsResponse = 4007;
 
 	//Hardware
 	UploadHardwareConfigurationRequest = 5000;
@@ -275,48 +258,10 @@ enum MessageType
 	MidTankDataSetupResponse = 8003;
 	MachineCalibrationDataRequest = 8004;
 	MachineCalibrationDataResponse = 8005;
-	MainCardStoredDataRequest = 8006;
-	MainCardStoredDataResponse = 8007;
 
 	//Machine Status
 	StartMachineStatusUpdateRequest = 9000;
 	StartMachineStatusUpdateResponse = 9001;
 	StopMachineStatusUpdateRequest = 9002;
 	StopMachineStatusUpdateResponse = 9003;
-
-	//Power
-	StartPowerDownRequest = 10000;
-	StartPowerDownResponse = 10001;
-	AbortPowerDownRequest = 10002;
-	AbortPowerDownResponse = 10003;
-	StartPowerUpRequest = 10004;
-	StartPowerUpResponse = 10005;
-	AbortPowerUpRequest = 10006;
-	AbortPowerUpResponse = 10007;
-	StandByRequest = 10008;
-	StandByResponse = 10009;
-
-	//Thread Loading
-	StartThreadLoadingRequest = 11000;
-	StartThreadLoadingResponse = 11001;
-	ContinueThreadLoadingRequest = 11002;
-	ContinueThreadLoadingResponse = 11003;
-	StopThreadLoadingRequest = 11004;
-	StopThreadLoadingResponse = 11005;
-	TryThreadLoadingRequest = 11006;
-	TryThreadLoadingResponse = 11007;
-	AttemptThreadJoggingRequest = 11008;
-	AttemptThreadJoggingResponse = 11009;
-
-	//IFS
-	StartInkFillingStatusRequest = 12000;
-	StartInkFillingStatusResponse = 12001;
-
-	//DataStore
-	PutDataStoreItemRequest = 13000;
-	PutDataStoreItemResponse = 13001;
-	GetDataStoreItemRequest = 13002;
-	GetDataStoreItemResponse = 13003;
-	DataStoreItemModifiedRequest = 13004;
-	DataStoreItemModifiedResponse = 13005;
 }