diff options
| author | Michael J. Chudobiak <mjc@avtechpulse.com> | 2014-10-28 10:23:07 -0400 |
|---|---|---|
| committer | Michael J. Chudobiak <mjc@avtechpulse.com> | 2014-10-28 10:23:07 -0400 |
| commit | 8c36c3b8b912b9f10361347e801e5be2c7037e8a (patch) | |
| tree | 1db26c246021b17453512540ef3b2002ef95c44d | |
| parent | 647018f0e98bc30a80126d1a34fea3e7f8bdab5b (diff) | |
add messages about 60 second reset period
| -rw-r--r-- | device-functions.c | 4 | ||||
| -rw-r--r-- | instr-daemon.c | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/device-functions.c b/device-functions.c index 879ae73..c122542 100644 --- a/device-functions.c +++ b/device-functions.c @@ -3836,6 +3836,10 @@ int do_full_self_cal(CalStruct *caldata) string = g_strdup_printf ("Typical run time: %d min, %d sec.", globals.Flash.self_cal_typical_time_min, globals.Flash.self_cal_typical_time_sec); LCD_write(1,0,string); g_free (string); + /*0123456789012345678901234567890123456789*/ + string = g_strdup_printf ("To skip, power off 60sec, then power on."); + LCD_write(1,0,string); + g_free (string); while ((sec_timer() - globals.Timers.startup_timer_value) < (long)globals.Flash.self_cal_pause) { /*0123456789012345678901234567890123456789*/ diff --git a/instr-daemon.c b/instr-daemon.c index e8d9897..8db710f 100644 --- a/instr-daemon.c +++ b/instr-daemon.c @@ -214,7 +214,10 @@ int main(int argc, char **argv) initFlash (&globals.Flash, FALSE, 0); - gchar *message = g_strdup_printf ("%s, S/N %s", globals.Flash.model_num, globals.Flash.serial_num); + gchar *message = g_strdup_printf ("%s, S/N %s, GPIB addr %d. Allow 60sec power-off period between power-ups.", + globals.Flash.model_num, + globals.Flash.serial_num, + globals.Flash.gpib_address); LCD_display_extended_message (message, FALSE, FALSE); g_free (message); @@ -232,10 +235,6 @@ int main(int argc, char **argv) writeUserBlock(&globals.Flash, eprom_loc, sizeof(globals.Flash.self_cal_startups)); } - message = g_strdup_printf ("GPIB addr %d.", globals.Flash.gpib_address); - LCD_write(2,0,message); - g_free (message); - GPIB_initialize(); IO_Setup_RS232( globals.Flash.baud, |