From 6436708fbe9d36292938253b384d44ded169d336 Mon Sep 17 00:00:00 2001 From: PA3GSB Date: Sun, 29 Jan 2017 17:06:39 +0100 Subject: [PATCH] vfo info bug solved --- vfo.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/vfo.c b/vfo.c index 5e4ffda..f11897f 100644 --- a/vfo.c +++ b/vfo.c @@ -203,17 +203,27 @@ int vfo_update(void *data) { char version[16]; char text[128]; - if(radio->protocol==ORIGINAL_PROTOCOL) { - sprintf(version,"%d.%d", - radio->software_version/10, - radio->software_version%10); - } else { - sprintf(version,"%d.%d.%d", + + switch(radio->protocol) { + case ORIGINAL_PROTOCOL: +#ifdef RADIOBERRY + case RADIOBERRY_PROTOCOL: +#endif + sprintf(version,"%d.%d", + radio->software_version/10, + radio->software_version%10); + break; + case NEW_PROTOCOL: +#ifdef LIMESDR + case LIMESDR_PROTOCOL: +#endif + sprintf(version,"%d.%d.%d", radio->software_version/100, (radio->software_version%100)/10, radio->software_version%10); - } - + break; + } + switch(radio->protocol) { case ORIGINAL_PROTOCOL: case NEW_PROTOCOL: @@ -227,6 +237,11 @@ int vfo_update(void *data) { sprintf(text,"%s\n", radio->name); break; +#endif +#ifdef RADIOBERRY + case RADIOBERRY_PROTOCOL: + sprintf(text,"%s\n", radio->name); + break; #endif } cairo_set_source_rgb(cr, 0.5, 0.5, 0.5); -- 2.45.2