Replaced verification of voltageFree rows with HighVoltageDetection module
Added LED module git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@338 05563f52-14a8-4384-a975-3d1654cca0fa
This commit is contained in:
@@ -71,24 +71,30 @@ static struct Leds self = { .initialized = false };
|
||||
// Function definitions
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
void Led_construct(void)
|
||||
ErrorStatus Led_construct(struct Gpio* onboardGreen, struct Gpio* onboardOrange, struct Gpio* bicolourGreen, struct Gpio* bicolourRed)
|
||||
{
|
||||
ErrorStatus returnValue = SUCCESS;
|
||||
if (!self.initialized)
|
||||
{
|
||||
self.initialized = true;
|
||||
|
||||
self.leds[LED_ONBOARD_GREEN].ioDevice = &ledInternGreen->device;
|
||||
self.leds[LED_ONBOARD_GREEN].ioDevice = &onboardGreen->device;
|
||||
self.leds[LED_ONBOARD_GREEN].initialized = true;
|
||||
|
||||
self.leds[LED_ONBOARD_ORANGE].ioDevice = &ledInternOrange->device;
|
||||
self.leds[LED_ONBOARD_ORANGE].ioDevice = &onboardOrange->device;
|
||||
self.leds[LED_ONBOARD_ORANGE].initialized = true;
|
||||
|
||||
self.leds[LED_BICOLOR_GREEN].ioDevice = &ledBicolourGreen->device;
|
||||
self.leds[LED_BICOLOR_GREEN].ioDevice = &bicolourGreen->device;
|
||||
self.leds[LED_BICOLOR_GREEN].initialized = true;
|
||||
|
||||
self.leds[LED_BICOLOR_RED].ioDevice = &ledBicolourRed->device;
|
||||
self.leds[LED_BICOLOR_RED].ioDevice = &bicolourRed->device;
|
||||
self.leds[LED_BICOLOR_RED].initialized = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
returnValue = ERROR;
|
||||
}
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
|
||||
@@ -146,11 +152,26 @@ extern bool Led_getStatus(Led led)
|
||||
{
|
||||
if (self.leds[led].initialized)
|
||||
{
|
||||
char value;
|
||||
IODevice_read(self.leds[led].ioDevice, &value, 1, NULL);
|
||||
if (value != (char)false)
|
||||
// IN case of the BICOLOUR ORANGE LED, actually the GREEN and RED LEDs must be read
|
||||
if (led == LED_BICOLOR_ORANGE)
|
||||
{
|
||||
returnValue = true;
|
||||
char valueRed;
|
||||
char valueGreen;
|
||||
IODevice_read(self.leds[LED_BICOLOR_RED].ioDevice, &valueRed, 1, NULL);
|
||||
IODevice_read(self.leds[LED_BICOLOR_GREEN].ioDevice, &valueGreen, 1, NULL);
|
||||
if ((valueRed != (char)false) && (valueGreen != (char)false))
|
||||
{
|
||||
returnValue = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
char value;
|
||||
IODevice_read(self.leds[led].ioDevice, &value, 1, NULL);
|
||||
if (value != (char)false)
|
||||
{
|
||||
returnValue = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user