Fixed issues with the logger and brought logger to same structure as the rest - now the logger is a independent object

Added testItems to HwValidationMenu for SWo

git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@235 05563f52-14a8-4384-a975-3d1654cca0fa
This commit is contained in:
mmi
2017-10-05 07:49:28 +00:00
parent 955d695720
commit c860b5b3b4
17 changed files with 283 additions and 258 deletions

View File

@@ -59,6 +59,25 @@ struct HwValidationMenu
bool runTask;
};
struct HwValidationMenuItems
{
struct DisplayDevice* display; // DisplayDevice to talk to
struct Adc* internalADC; // Internal ADC with channel array
struct MAX5715* externalDAC; // External DAC with channel array
struct Gpio* interlock1;
struct Gpio* interlock2;
struct Gpio* solenoid;
struct Gpio* mcp0Relay;
struct Gpio* mcp1Relay;
struct Gpio* mcp2Relay;
struct Gpio* cat0Relay;
struct Gpio* cat0Relay;
struct Gpio* cat0Relay;
struct Pcba* pcba;
// struct Eeprom* eeprom; // Not implemented yet
};
// -----------------------------------------------------------------------------
// Function declarations
// -----------------------------------------------------------------------------
@@ -66,16 +85,19 @@ struct HwValidationMenu
/** ----------------------------------------------------------------------------
* HwValidationMenu_construct
* Description of function
* Constructor for HW validation menu (usually used on a terminal)
*
* @param self
* @param ioDevice
* @return ErrorStatus
* @param self The validation menu object
* @param ioDevice IODevice to communicate with
* @param testItems list of items to test
*
* @return ErrorStatus SUCCESS if construction was successful
* ERROR otherwise
*
* @todo
* -----------------------------------------------------------------------------
*/
extern ErrorStatus HwValidationMenu_construct(struct HwValidationMenu* self, struct IODevice* ioDevice);
extern ErrorStatus HwValidationMenu_construct(struct HwValidationMenu* self, struct IODevice* ioDevice, struct HwValidationMenuItems testItems);
#endif /* INC_HWVALIDATIONMENU_H_ */