From 797d4654f845a6d6c8f6e02bcdc6bc11ceeed51f Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Sun, 1 Dec 2019 14:34:42 +0200 Subject: update with Beta code --- Software/Embedded_SW/Embedded/Modules/Control/control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Software/Embedded_SW/Embedded/Modules/Control') diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c index 1f5e008d3..8dad3fa60 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/control.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c @@ -170,7 +170,7 @@ uint32_t ControlActivityLed( uint32_t Parameter1) if(FPGA_WD_Occurred == true) { ACTIVITY_GREEN_LED_ON; - HWConfigurationInit(); + //Motor_ReconfigAllMotors(); } else ACTIVITY_GREEN_LED_OFF; -- cgit v1.3.1 From 943093ac637151ce8c4ca93ca9ce7253188e5e9e Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Mon, 2 Dec 2019 16:30:06 +0200 Subject: debug lod filters command --- .../Embedded_SW/Embedded/Common/report/report.h | 2 + .../Embedded/Common/report/reportInit.c | 49 ++++++++++ .../Embedded_SW/Embedded/Communication/Container.c | 3 + .../Communication/PMR/Common/MessageType.pb-c.c | 102 +++++++++++---------- .../Communication/PMR/Common/MessageType.pb-c.h | 2 + .../Embedded_SW/Embedded/Modules/Control/control.c | 2 +- .../Embedded/Modules/Waste/Waste_init.c | 2 +- .../Initialization/PowerOffSequence.c | 5 + .../stubs/SetupDebugDisributors.cs | 79 ++++++++++++++++ 9 files changed, 195 insertions(+), 51 deletions(-) create mode 100644 Software/Stubs Collection/stubs/SetupDebugDisributors.cs (limited to 'Software/Embedded_SW/Embedded/Modules/Control') diff --git a/Software/Embedded_SW/Embedded/Common/report/report.h b/Software/Embedded_SW/Embedded/Common/report/report.h index 69dd15bdb..eb0b64fab 100644 --- a/Software/Embedded_SW/Embedded/Common/report/report.h +++ b/Software/Embedded_SW/Embedded/Common/report/report.h @@ -124,6 +124,8 @@ extern uint32_t ReportInitMessage(MessageContainer* requestContainer); extern void ReportStopReporting(void); extern uint32_t StopReportInitMessage(MessageContainer* requestContainer); uint32_t SetDebugLogCategoryFunc(MessageContainer* requestContainer); +void SetupDebugDisributorsRequestFunc(MessageContainer* requestContainer); + void ReportResetReason(void); diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c index 5ae55736d..ef0348de5 100644 --- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c +++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c @@ -39,6 +39,9 @@ #include "PMR/debugging/StopDebugLogResponse.pb-c.h" #include "PMR/debugging/SetDebugLogCategoryRequest.pb-c.h" #include "PMR/debugging/SetDebugLogCategoryResponse.pb-c.h" +#include "PMR/debugging/DebugDistributor.pb-c.h" +#include "PMR/debugging/SetupDebugDisributorsRequest.pb-c.h" +#include "PMR/debugging/SetupDebugDisributorsResponse.pb-c.h" #include "modules/General/process.h" #include "Common/SW_Info/SW_Info.h" @@ -125,6 +128,52 @@ int ReportResponseFunc(char *message, /* The formatted message } char ResetMessage[200]; +void SetupDebugDisributorsRequestFunc(MessageContainer* requestContainer) +{ + MessageContainer responseContainer; + uint8_t* container_buffer; + uint32_t status = 0; + int Dist_i; + + SetupDebugDisributorsRequest* request = setup_debug_disributors_request_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); + SetupDebugDisributorsResponse response = SETUP_DEBUG_DISRIBUTORS_RESPONSE__INIT; + + responseContainer = createContainer(MESSAGE_TYPE__SetupDebugDisributorsResponse, requestContainer->token, true, &response, &setup_debug_disributors_request_response__pack, &setup_debug_disributors_request_response__get_packed_size); + container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); + + if (request->n_distributoractive == (DEBUG_DISTRIBUTOR__MaintFilter+1)) + { + status|=ReportSwitchPackageFilter(ControlFilter , request->distributoractive[DEBUG_DISTRIBUTOR__ControlFilter ]); + status|=ReportSwitchPackageFilter(HeatersFilter , request->distributoractive[DEBUG_DISTRIBUTOR__HeatersFilter ]); + status|=ReportSwitchPackageFilter(JobFilter , request->distributoractive[DEBUG_DISTRIBUTOR__JobFilter ]); + status|=ReportSwitchPackageFilter(WasteFilter , request->distributoractive[DEBUG_DISTRIBUTOR__WasteFilter ]); + status|=ReportSwitchPackageFilter(AlarmFilter , request->distributoractive[DEBUG_DISTRIBUTOR__AlarmFilter ]); + status|=ReportSwitchPackageFilter(DiagnosticsFilter , request->distributoractive[DEBUG_DISTRIBUTOR__DiagnosticsFilter]); + status|=ReportSwitchPackageFilter(IDSFilter , request->distributoractive[DEBUG_DISTRIBUTOR__IDSFilter ]); + status|=ReportSwitchPackageFilter(ThreadFilter , request->distributoractive[DEBUG_DISTRIBUTOR__ThreadFilter ]); + status|=ReportSwitchPackageFilter(GeneralFilter , request->distributoractive[DEBUG_DISTRIBUTOR__GeneralFilter]); + status|=ReportSwitchPackageFilter(CommFilter , request->distributoractive[DEBUG_DISTRIBUTOR__CommFilter ]); + status|=ReportSwitchPackageFilter(FPGAFilter , request->distributoractive[DEBUG_DISTRIBUTOR__FPGAFilter ]); + status|=ReportSwitchPackageFilter(LoadFilter , request->distributoractive[DEBUG_DISTRIBUTOR__LoadFilter ]); + status|=ReportSwitchPackageFilter(InitFilter , request->distributoractive[DEBUG_DISTRIBUTOR__InitFilter ]); + status|=ReportSwitchPackageFilter(MaintFilter , request->distributoractive[DEBUG_DISTRIBUTOR__MaintFilter]); + } + else + { + status = ERROR_CODE__INVALID_PARAMETER; + ReportWithPackageFilter(GeneralFilter,"not all filters defined in SetupDebugDisributorsRequest",__FILE__,__LINE__,request->n_distributoractive,RpWarning,0, 0); + } + if (status) + { + responseContainer.has_error = true; + responseContainer.error = (ErrorCode)status; + } + size_t container_size = message_container__pack(&responseContainer, container_buffer); + my_free(responseContainer.data.data); + SendChars(container_buffer, container_size); + setup_debug_disributors_request_request__free_unpacked(request,NULL); + +} void ReportResetReason(void) { diff --git a/Software/Embedded_SW/Embedded/Communication/Container.c b/Software/Embedded_SW/Embedded/Communication/Container.c index d7a49a5f4..5ca7a4293 100644 --- a/Software/Embedded_SW/Embedded/Communication/Container.c +++ b/Software/Embedded_SW/Embedded/Communication/Container.c @@ -258,6 +258,9 @@ void receive_callback(char* buffer, size_t length) case MESSAGE_TYPE__SetDebugLogCategoryRequest: SetDebugLogCategoryFunc(requestContainer); break; + case MESSAGE_TYPE__SetupDebugDisributorsRequest: + SetupDebugDisributorsRequestFunc(requestContainer); + break; case MESSAGE_TYPE__JobRequest: JobRequestFunc(requestContainer); break; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c index 81d8fe973..aae3b8d5e 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c @@ -7,7 +7,7 @@ #endif #include "MessageType.pb-c.h" -static const ProtobufCEnumValue message_type__enum_values_by_number[227] = +static const ProtobufCEnumValue message_type__enum_values_by_number[229] = { { "None", "MESSAGE_TYPE__None", 0 }, { "ErrorResponse", "MESSAGE_TYPE__ErrorResponse", 1 }, @@ -192,6 +192,8 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[227] = { "StopDebugLogResponse", "MESSAGE_TYPE__StopDebugLogResponse", 4003 }, { "SetDebugLogCategoryRequest", "MESSAGE_TYPE__SetDebugLogCategoryRequest", 4004 }, { "SetDebugLogCategoryResponse", "MESSAGE_TYPE__SetDebugLogCategoryResponse", 4005 }, + { "SetupDebugDisributorsRequest", "MESSAGE_TYPE__SetupDebugDisributorsRequest", 4006 }, + { "SetupDebugDisributorsResponse", "MESSAGE_TYPE__SetupDebugDisributorsResponse", 4007 }, { "UploadHardwareConfigurationRequest", "MESSAGE_TYPE__UploadHardwareConfigurationRequest", 5000 }, { "UploadHardwareConfigurationResponse", "MESSAGE_TYPE__UploadHardwareConfigurationResponse", 5001 }, { "SystemResetRequest", "MESSAGE_TYPE__SystemResetRequest", 5002 }, @@ -238,72 +240,72 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[227] = { "StopMachineStatusUpdateResponse", "MESSAGE_TYPE__StopMachineStatusUpdateResponse", 9003 }, }; static const ProtobufCIntRange message_type__value_ranges[] = { -{0, 0},{3, 2},{1000, 104},{2000, 121},{3000, 167},{4000, 177},{5000, 183},{6000, 187},{7000, 193},{8000, 217},{9000, 223},{0, 227} +{0, 0},{3, 2},{1000, 104},{2000, 121},{3000, 167},{4000, 177},{5000, 185},{6000, 189},{7000, 195},{8000, 219},{9000, 225},{0, 229} }; -static const ProtobufCEnumValueIndex message_type__enum_values_by_name[227] = +static const ProtobufCEnumValueIndex message_type__enum_values_by_name[229] = { { "AbortJobRequest", 169 }, { "AbortJobResponse", 170 }, - { "ActivateVersionRequest", 215 }, - { "ActivateVersionResponse", 216 }, + { "ActivateVersionRequest", 217 }, + { "ActivateVersionResponse", 218 }, { "CalculateRequest", 2 }, { "CalculateResponse", 3 }, { "CartridgeValidationRequest", 165 }, { "CartridgeValidationResponse", 166 }, { "ColorProfileRequest", 117 }, { "ColorProfileResponse", 118 }, - { "ConnectRequest", 189 }, - { "ConnectResponse", 190 }, - { "CreateRequest", 201 }, - { "CreateResponse", 202 }, + { "ConnectRequest", 191 }, + { "ConnectResponse", 192 }, + { "CreateRequest", 203 }, + { "CreateResponse", 204 }, { "CurrentJobRequest", 173 }, { "CurrentJobResponse", 174 }, - { "DeleteRequest", 203 }, - { "DeleteResponse", 204 }, + { "DeleteRequest", 205 }, + { "DeleteResponse", 206 }, { "DirectSynchronizationRequest", 109 }, { "DirectSynchronizationResponse", 110 }, - { "DisconnectRequest", 191 }, - { "DisconnectResponse", 192 }, + { "DisconnectRequest", 193 }, + { "DisconnectResponse", 194 }, { "DispenserAbortHomingRequest", 131 }, { "DispenserAbortHomingResponse", 132 }, { "DispenserAbortJoggingRequest", 137 }, { "DispenserAbortJoggingResponse", 138 }, - { "DispenserDataRequest", 217 }, - { "DispenserDataResponse", 218 }, + { "DispenserDataRequest", 219 }, + { "DispenserDataResponse", 220 }, { "DispenserHomingRequest", 133 }, { "DispenserHomingResponse", 134 }, { "DispenserJoggingRequest", 135 }, { "DispenserJoggingResponse", 136 }, { "ErrorResponse", 1 }, - { "ExecuteProcessRequest", 197 }, - { "ExecuteProcessResponse", 198 }, + { "ExecuteProcessRequest", 199 }, + { "ExecuteProcessResponse", 200 }, { "ExternalBridgeLoginRequest", 105 }, { "ExternalBridgeLoginResponse", 106 }, { "ExternalBridgeLogoutRequest", 107 }, { "ExternalBridgeLogoutResponse", 108 }, { "ExternalBridgeUdpDiscoveryPacket", 104 }, - { "FileChunkDownloadRequest", 211 }, - { "FileChunkDownloadResponse", 212 }, - { "FileChunkUploadRequest", 195 }, - { "FileChunkUploadResponse", 196 }, - { "FileDownloadRequest", 209 }, - { "FileDownloadResponse", 210 }, - { "FileUploadRequest", 193 }, - { "FileUploadResponse", 194 }, - { "GetFilesRequest", 207 }, - { "GetFilesResponse", 208 }, - { "GetStorageInfoRequest", 205 }, - { "GetStorageInfoResponse", 206 }, + { "FileChunkDownloadRequest", 213 }, + { "FileChunkDownloadResponse", 214 }, + { "FileChunkUploadRequest", 197 }, + { "FileChunkUploadResponse", 198 }, + { "FileDownloadRequest", 211 }, + { "FileDownloadResponse", 212 }, + { "FileUploadRequest", 195 }, + { "FileUploadResponse", 196 }, + { "GetFilesRequest", 209 }, + { "GetFilesResponse", 210 }, + { "GetStorageInfoRequest", 207 }, + { "GetStorageInfoResponse", 208 }, { "JobRequest", 167 }, { "JobResponse", 168 }, - { "KeepAliveRequest", 187 }, - { "KeepAliveResponse", 188 }, - { "KillProcessRequest", 199 }, - { "KillProcessResponse", 200 }, - { "MachineCalibrationDataRequest", 221 }, - { "MachineCalibrationDataResponse", 222 }, - { "MidTankDataSetupRequest", 219 }, - { "MidTankDataSetupResponse", 220 }, + { "KeepAliveRequest", 189 }, + { "KeepAliveResponse", 190 }, + { "KillProcessRequest", 201 }, + { "KillProcessResponse", 202 }, + { "MachineCalibrationDataRequest", 223 }, + { "MachineCalibrationDataResponse", 224 }, + { "MidTankDataSetupRequest", 221 }, + { "MidTankDataSetupResponse", 222 }, { "MotorAbortHomingRequest", 123 }, { "MotorAbortHomingResponse", 124 }, { "MotorAbortJoggingRequest", 129 }, @@ -333,6 +335,8 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[227] = { "SetHeaterStateResponse", 156 }, { "SetValveStateRequest", 159 }, { "SetValveStateResponse", 160 }, + { "SetupDebugDisributorsRequest", 183 }, + { "SetupDebugDisributorsResponse", 184 }, { "StartApplicationLogsRequest", 113 }, { "StartApplicationLogsResponse", 114 }, { "StartCartridgesUpdateRequest", 161 }, @@ -343,8 +347,8 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[227] = { "StartDiagnosticsResponse", 122 }, { "StartEventsNotificationRequest", 151 }, { "StartEventsNotificationResponse", 152 }, - { "StartMachineStatusUpdateRequest", 223 }, - { "StartMachineStatusUpdateResponse", 224 }, + { "StartMachineStatusUpdateRequest", 225 }, + { "StartMachineStatusUpdateResponse", 226 }, { "StopApplicationLogsRequest", 115 }, { "StopApplicationLogsResponse", 116 }, { "StopCartridgesUpdateRequest", 163 }, @@ -355,8 +359,8 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[227] = { "StopDiagnosticsResponse", 150 }, { "StopEventsNotificationRequest", 153 }, { "StopEventsNotificationResponse", 154 }, - { "StopMachineStatusUpdateRequest", 225 }, - { "StopMachineStatusUpdateResponse", 226 }, + { "StopMachineStatusUpdateRequest", 227 }, + { "StopMachineStatusUpdateResponse", 228 }, { "StubAbortJobRequest", 100 }, { "StubAbortJobResponse", 101 }, { "StubCartridgeReadRequest", 6 }, @@ -455,20 +459,20 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[227] = { "StubTivaWriteRegResponse", 79 }, { "StubValveRequest", 30 }, { "StubValveResponse", 31 }, - { "SystemResetRequest", 185 }, - { "SystemResetResponse", 186 }, + { "SystemResetRequest", 187 }, + { "SystemResetResponse", 188 }, { "ThreadAbortJoggingRequest", 143 }, { "ThreadAbortJoggingResponse", 144 }, { "ThreadJoggingRequest", 141 }, { "ThreadJoggingResponse", 142 }, { "UpdateStatusRequest", 119 }, { "UpdateStatusResponse", 120 }, - { "UploadHardwareConfigurationRequest", 183 }, - { "UploadHardwareConfigurationResponse", 184 }, + { "UploadHardwareConfigurationRequest", 185 }, + { "UploadHardwareConfigurationResponse", 186 }, { "UploadProcessParametersRequest", 171 }, { "UploadProcessParametersResponse", 172 }, - { "ValidateVersionRequest", 213 }, - { "ValidateVersionResponse", 214 }, + { "ValidateVersionRequest", 215 }, + { "ValidateVersionResponse", 216 }, }; const ProtobufCEnumDescriptor message_type__descriptor = { @@ -477,9 +481,9 @@ const ProtobufCEnumDescriptor message_type__descriptor = "MessageType", "MessageType", "", - 227, + 229, message_type__enum_values_by_number, - 227, + 229, message_type__enum_values_by_name, 11, message_type__value_ranges, diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h index 90461900a..7cb8306df 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h @@ -203,6 +203,8 @@ typedef enum _MessageType { MESSAGE_TYPE__StopDebugLogResponse = 4003, MESSAGE_TYPE__SetDebugLogCategoryRequest = 4004, MESSAGE_TYPE__SetDebugLogCategoryResponse = 4005, + MESSAGE_TYPE__SetupDebugDisributorsRequest = 4006, + MESSAGE_TYPE__SetupDebugDisributorsResponse = 4007, MESSAGE_TYPE__UploadHardwareConfigurationRequest = 5000, MESSAGE_TYPE__UploadHardwareConfigurationResponse = 5001, MESSAGE_TYPE__SystemResetRequest = 5002, diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c index 8dad3fa60..d59aae8f4 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/control.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c @@ -57,7 +57,7 @@ #include "MillisecTask.h" #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h" /******************** Definitions ********************************************/ -#define MAX_TANGO_CONTROL_DEVICES 100 +#define MAX_TANGO_CONTROL_DEVICES 120 /******************** STRUCTURES AND ENUMs ********************************************/ diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c index 6339797d0..c5c092ae4 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c @@ -498,7 +498,7 @@ bool initWHS_WasteTank() WHS_info.WHS_sensors.waste_tank_empty_sensor = RdWasteTankEmptySensor(); WHS_info.WHS_sensors.waste_tank_full_sensor = SENSORnotFULL; UpdateStateMachine(); - AddControlCallback(WasteTankCBFunction, WasteTankCallBackTime , WasteTankCallBackFunction, 0,0,0);//eOneMinute + AddControlCallback(NULL,WasteTankCBFunction, WasteTankCallBackTime , WasteTankCallBackFunction, 0,0,0);//eOneMinute return OK; } diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c index 909135c71..79191072a 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c @@ -384,9 +384,14 @@ uint32_t PowerOffWaitForTemperature(void) /*******************************************************************************************************/ uint32_t PowerOffTurnOffDryerFan(void) { + int i; Control_Dryer_Fan(STOP,75);//use START or STOP, 0 - 100% PowerOffMachineState++; + for (i=0;i(setupDebugDisributorsRequest); + +} \ No newline at end of file -- cgit v1.3.1