diff options
| -rw-r--r-- | bus.c | 5 | ||||
| -rw-r--r-- | instr-daemon.c | 3 |
2 files changed, 4 insertions, 4 deletions
@@ -356,10 +356,9 @@ void bus_init() globals.HWDetect.beaglebone = util_is_beaglebone(); globals.HWDetect.olimex = util_is_olimex(); - // TODO update once Olimex carrier board is ready globals.HWDetect.has_i2c = globals.HWDetect.beaglebone || globals.HWDetect.olimex; - globals.HWDetect.has_gpmc = globals.HWDetect.beaglebone; - globals.HWDetect.has_gpio = globals.HWDetect.beaglebone; + globals.HWDetect.has_gpmc = globals.HWDetect.beaglebone || globals.HWDetect.olimex; + globals.HWDetect.has_gpio = globals.HWDetect.beaglebone || globals.HWDetect.olimex; printf("Beaglebone: %d. Olimex: %d.\n", globals.HWDetect.beaglebone, globals.HWDetect.olimex); diff --git a/instr-daemon.c b/instr-daemon.c index 8b2d0e6..40bdf62 100644 --- a/instr-daemon.c +++ b/instr-daemon.c @@ -380,7 +380,8 @@ static gboolean periodic_poll (void) { gboolean power_fail; - power_fail = (globals.HWDetect.has_gpio && bus_getpin (POWER_FAIL)); + // TODO - remove Olimex qualification once ethernet-enabled carrier board is available + power_fail = globals.HWDetect.has_gpio && bus_getpin (POWER_FAIL) && !globals.HWDetect.olimex; if (power_fail) { // verify after a short delay (25 ms), to ignore short power glitches |