diff options
| author | daniel <danieruru@gmail.com> | 2012-10-04 04:20:51 +0900 |
|---|---|---|
| committer | daniel <danieruru@gmail.com> | 2012-10-04 04:20:51 +0900 |
| commit | 69d7ac58e532e5e51cf65c7d127fafddb812167d (patch) | |
| tree | 140dd90ec31bbb3667b685510dfab8fb881c3252 /instr-daemon.c | |
| parent | 3f81a5c4e8bab38a904df55a5a363baa33c794fb (diff) | |
| parent | 58b03f6b9bd96fb6de58e9a75b9af5fab7e3fab0 (diff) | |
Merge branch 'master' of grenfell.avtechpulse.com:Instrument
Diffstat (limited to 'instr-daemon.c')
| -rw-r--r-- | instr-daemon.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/instr-daemon.c b/instr-daemon.c index 1921822..5f764ed 100644 --- a/instr-daemon.c +++ b/instr-daemon.c @@ -228,7 +228,7 @@ int main(int argc, char **argv) LCD_write(2,0,message); g_free (message); -// GPIB_initialize(); + GPIB_initialize(); IO_Setup_RS232( globals.Flash.baud, globals.Flash.parity, @@ -326,7 +326,7 @@ static gboolean periodic_poll (void) // // FIXME - comment out everything up to "return TRUE" if this section // is crashing due to non-functional bus -/* GPIB_check_for_device_clear_signal(); + GPIB_check_for_device_clear_signal(); if (GPIB_check_for_messages(globals.Registers.gpib_buffer)) { if (GPIB_handle_new_input(globals.Registers.gpib_buffer)) { // FIXME check_for_ctrl_mode_changes(); @@ -334,7 +334,6 @@ static gboolean periodic_poll (void) } } GPIB_check_for_device_clear_signal(); -*/ return TRUE; } |