diff options
| author | Michael J. Chudobiak <mjc@avtechpulse.com> | 2012-11-13 15:14:23 -0500 |
|---|---|---|
| committer | Michael J. Chudobiak <mjc@avtechpulse.com> | 2012-11-13 15:14:23 -0500 |
| commit | 107629c5e9f97dd04443bb341ed1edf4c3e813c8 (patch) | |
| tree | 351c61009aa5b08f6656d5ad7393f7a8e2fd90a9 | |
| parent | 9e168483a2b2b451388d6e474c85ec080b7ffcbb (diff) | |
| parent | bfc6244daec981ec9c903e13f521a5b9190ba689 (diff) | |
Merge branch 'master' of ulmo:Instrument
| -rw-r--r-- | device-functions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/device-functions.c b/device-functions.c index 271c6bc..6164506 100644 --- a/device-functions.c +++ b/device-functions.c @@ -4058,8 +4058,9 @@ int do_full_self_cal(CalStruct *caldata) while ((sec_timer() - globals.Timers.startup_timer_value) < (long)globals.Flash.self_cal_pause) { /*0123456789012345678901234567890123456789*/ - sprintf (string, "Min warm-up is %ds, on for %lds.", globals.Flash.self_cal_pause, sec_timer() - globals.Timers.startup_timer_value); + string = g_strdup_printf ("Min warm-up is %ds, on for %lds.", globals.Flash.self_cal_pause, sec_timer() - globals.Timers.startup_timer_value); LCD_write(3,0,string); + g_free (string); g_usleep (2e5); } |