From: PA3GSB Date: Sat, 18 Feb 2017 15:45:38 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.rkrishnan.org/pf/$top_link?a=commitdiff_plain;h=521d459a63f579f48790712a6c0186de21b0689d;p=pihpsdr.git Merge remote-tracking branch 'upstream/master' --- 521d459a63f579f48790712a6c0186de21b0689d diff --cc radio.c index 16a3f12,92f0c74..8bd1855 --- a/radio.c +++ b/radio.c @@@ -457,13 -441,8 +457,13 @@@ fprintf(stderr,"receiver %d: height=%d break; #ifdef LIMESDR case LIMESDR_PROTOCOL: - lime_protocol_init(0,display_width); + lime_protocol_init(0,display_width,receiver[0]->sample_rate); break; +#endif +#ifdef RADIOBERRY + case RADIOBERRY_PROTOCOL: + radioberry_protocol_init(0,display_width); + break; #endif }