# Conflicts:
#   inc/Services/EventActionService.hpp
#   src/Services/EventActionService.cpp
#   src/main.cpp
#   test/Services/EventActionService.cpp

Merge branch 'ECSS_ST19_array_replacement' of https://gitlab.com/acubesat/obc/ecss-services into ECSS_ST19_array_replacement

Merge branch 'ECSS_ST19_array_replacement' of https://gitlab.com/acubesat/obc/ecss-services into ECSS_ST19_array_replacement

Changed comments

Fixed names in ErrorHandler and enumeration of errors and removed explicit declaration of true or false in a CHECK

- changed variable names
- added breaks
- corrected a comment
- deleted explicit declaration of true/false in ifs
- fixed a bug in tests caused by passing the message by reference

- Changed disableEventActionDefinition
according to the needs of multimap
- Added errors in ErrorHandler

- Changed deleteEventActionDefinition
according to the multimap needs

- Added a new variable eventActionDefinitionID
- Added the size of the multimap as #define in ECSS_Definitions.hpp

Resolve "Enable MISRA checks for cppcheck"

Closes #24

See merge request acubesat/obc/ecss-services!28

Finish fixing Message errors

Fix 3 of the last 4 errors of TimeHelper

Merge branch 'master' of https://gitlab.com/acubesat/obc/ecss-services into ECSS_ST19_array_replacement

Merge branch 'ECSS_ST19_array_replacement' of https://gitlab.com/acubesat/obc/ecss-services into ECSS_ST19_array_replacement

# Conflicts:
#	src/Services/EventActionService.cpp

Added comments in tests and changed a uint8_t to a uint16_t variable that counts the event action definitions in the eventActionStatusReport

Changed the way add action-definition function works after rechecking the standard and updated the corresponding tests as well as added documentation in those tests

Fix blunder with xargs using python3.6 instead of python3

Remove useless call to cat