diff options
-rw-r--r-- | instr-daemon.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/instr-daemon.c b/instr-daemon.c index ec4e27e..4de0c95 100644 --- a/instr-daemon.c +++ b/instr-daemon.c @@ -241,13 +241,18 @@ int main(int argc, char **argv) LCD_display_extended_message (message, 0); g_free (message); + int i; + for (i=0; i<8; i++) { + set_dac(i,globals.Flash.initial_dac_settings[i]); + } + fixFlash(&globals.Flash); // count startups if (globals.Flash.self_cal) { ++globals.Flash.self_cal_startups; int eprom_loc = (char *) &(globals.Flash.self_cal_startups) - (char *) &(globals.Flash.flash_start); - writeUserBlock(eprom_loc,&globals.Flash.flash_start + eprom_loc,sizeof(globals.Flash.self_cal_startups)); + writeUserBlock(&globals.Flash, eprom_loc, sizeof(globals.Flash.self_cal_startups)); } nicinfo info; @@ -257,6 +262,8 @@ int main(int argc, char **argv) LCD_write(2,0,message); g_free (message); + // FIXME - init RS232 + /* start-up delay */ LCD_write(3,0,"Warming up, please wait... "); @@ -269,14 +276,17 @@ int main(int argc, char **argv) } LCD_write(3,27,"OK"); + bus_init(); - // FIXME - copy init stuff from FW411.C + // FIXME - I2C_Setup_Monitor(); - bus_init(); Main_Rst(); + // FIXME - self-cal here - or in thread beside user sessions? + // FIXME - need auto-timer output-off somewhere - launch event from set_output? + // FIXME - need main loops, checks monitors too //register stdin channel stdinChannel = g_io_channel_unix_new(0); |