aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Common/report
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-12-04 16:27:16 +0200
committerShlomo Hecht <shlomo@twine-s.com>2019-12-04 16:27:16 +0200
commitc19fa7f39c4614307c6fbd80ce1de5bd7dd4db8b (patch)
treedf875d8f8f70c08a72173d673c5f819703a8cb7f /Software/Embedded_SW/Embedded/Common/report
parentfeea57db6edf990f16333395d2639a61a1966a58 (diff)
downloadTango-c19fa7f39c4614307c6fbd80ce1de5bd7dd4db8b.tar.gz
Tango-c19fa7f39c4614307c6fbd80ce1de5bd7dd4db8b.zip
pressure handling in inactive dispensers
Diffstat (limited to 'Software/Embedded_SW/Embedded/Common/report')
-rw-r--r--Software/Embedded_SW/Embedded/Common/report/reportInit.c21
1 files changed, 4 insertions, 17 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index 5c5865811..5675c5607 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -133,7 +133,6 @@ void SetupDebugDisributorsRequestFunc(MessageContainer* requestContainer)
MessageContainer responseContainer;
uint8_t* container_buffer;
uint32_t status = 0;
- int Dist_i;
SetupDebugDisributorsRequest* request = setup_debug_disributors_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
SetupDebugDisributorsResponse response = SETUP_DEBUG_DISRIBUTORS_RESPONSE__INIT;
@@ -141,27 +140,15 @@ void SetupDebugDisributorsRequestFunc(MessageContainer* requestContainer)
responseContainer = createContainer(MESSAGE_TYPE__SetupDebugDisributorsResponse, requestContainer->token, true, &response, &setup_debug_disributors_response__pack, &setup_debug_disributors_response__get_packed_size);
container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
- if (request->n_distributoractive == (DEBUG_DISTRIBUTOR__MaintFilter+1))
+
+ if (request->has_debugdistributor == true )
{
- 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]);
+ status|=ReportSwitchPackageFilter(request->debugdistributor , request->distributoractive);
}
else
{
status = ERROR_CODE__INVALID_PARAMETER;
- ReportWithPackageFilter(GeneralFilter,"not all filters defined in SetupDebugDisributorsRequest",__FILE__,__LINE__,request->n_distributoractive,RpWarning,0, 0);
+ ReportWithPackageFilter(GeneralFilter,"SetupDebugDisributorsRequest error",__FILE__,__LINE__,request->has_debugdistributor,RpWarning,0, 0);
}
if (status)
{