small corrections, especially for CHARLY25 (STEMlab/HAMlab).

diff --git a/discovery.c b/discovery.c
index c59a6a2ad2fb8d340b9612bc53e28785c93e5635..130740cbf6951235197f7ff77b7de2eaf8f1fe32 100644 (file)
--- a/discovery.c
+++ b/discovery.c
@@ -60,7 +60,8 @@ fprintf(stderr,"start_cb: %p\n",data);
   // we otherwise lose the information about which app has been selected.
   if (radio->protocol == STEMLAB_PROTOCOL) {
     const int device_id = radio - discovered;
-    stemlab_start_app(gtk_combo_box_get_active_id(GTK_COMBO_BOX(apps_combobox[device_id])));
+    int ret;
+    ret=stemlab_start_app(gtk_combo_box_get_active_id(GTK_COMBO_BOX(apps_combobox[device_id])));
 #ifdef NO_AVAHI
     // We only have started the app, but not queried e.g. the MAC address.
     // Therefore, we have to clean up and re-start the discovery process.
@@ -69,6 +70,8 @@ fprintf(stderr,"start_cb: %p\n",data);
     g_idle_add(ext_discovery,NULL);
     return TRUE;
 #endif
+    // At this point, if stemlab_start_app failed, we cannot recover
+    if (ret != 0) exit(-1);
   }
   stemlab_cleanup();
 #endif

diff --git a/old_protocol.c b/old_protocol.c
index 06105d0ef53683be92ef1c949501eeb33d662538..f0fa619a78b9be3a1f94e1ba22f4d163429abbf2 100644 (file)
--- a/old_protocol.c
+++ b/old_protocol.c
@@ -132,7 +132,9 @@ static int running;
 static long ep4_sequence;
 
 // DL1YCF added this variable for lost-package-check
-static long last_seq_num=0;
+// init with -1 such that there is no error message if the
+// first packet is received with seq_num = 0
+static long last_seq_num=-1;
 
 static int current_rx=0;
 
@@ -843,8 +845,7 @@ void ozy_send_buffer() {
     }
 
 // TODO - add Alex Antenna
-    output_buffer[C3]=0x00;
-    output_buffer[C3] = receiver[0]->alex_attenuation;
+    output_buffer[C3] = (receiver[0]->alex_attenuation) & 0x03;  // do not set higher bits
     if(active_receiver->random) {
       output_buffer[C3]|=LT2208_RANDOM_ON;
     }

diff --git a/sliders.c b/sliders.c
index 0981550eaf553fb63c815f611adbe14e614492d1..c31afefa8f962a57944f83f6d1d670d4e850f062 100644 (file)
--- a/sliders.c
+++ b/sliders.c
@@ -103,8 +103,11 @@ int sliders_active_receiver_changed(void *data) {
   if(display_sliders) {
     gtk_range_set_value(GTK_RANGE(af_gain_scale),active_receiver->volume*100.0);
     gtk_range_set_value (GTK_RANGE(agc_scale),active_receiver->agc_gain);
-    gtk_range_set_value (GTK_RANGE(attenuation_scale),(double)adc_attenuation[active_receiver->adc]);
-
+    if (filter_board == CHARLY25) {
+      update_att_preamp();
+    } else {
+      gtk_range_set_value (GTK_RANGE(attenuation_scale),(double)adc_attenuation[active_receiver->adc]);
+    }
     char title[64];
 #ifdef RADIOBERRY
        sprintf(title,"RX GAIN"/*,active_receiver->adc*/);
@@ -166,12 +169,7 @@ void set_attenuation_value(double value) {
          scale_status=ATTENUATION;
       scale_dialog=gtk_dialog_new_with_buttons(title,GTK_WINDOW(top_window),GTK_DIALOG_DESTROY_WITH_PARENT,NULL,NULL);
       GtkWidget *content=gtk_dialog_get_content_area(GTK_DIALOG(scale_dialog));
-      if (filter_board == CHARLY25) {
-       // although this slider is hidden, its value range does matter
-        attenuation_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,0.0, 36.0, 1.00);
-      } else {
-        attenuation_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,0.0, 31.0, 1.00);
-      }
+      attenuation_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,0.0, 31.0, 1.00);
       gtk_widget_set_size_request (attenuation_scale, 400, 30);
       gtk_range_set_value (GTK_RANGE(attenuation_scale),(double)adc_attenuation[active_receiver->adc]);
       gtk_widget_show(attenuation_scale);
@@ -189,6 +187,7 @@ void set_attenuation_value(double value) {
 }
 
 void update_att_preamp(void) {
+  // CHARLY25: update the ATT/Pre buttons to the values of the active RX
   if (filter_board == CHARLY25) {
     char id[] = "x";
     sprintf(id, "%d", active_receiver->alex_attenuation);
@@ -221,18 +220,34 @@ static gboolean load_att_type_cb(gpointer data) {
 }
 
 static void c25_att_combobox_changed(GtkWidget *widget, gpointer data) {
-  int id = atoi(gtk_combo_box_get_active_id(GTK_COMBO_BOX(widget)));
-  //DL1YCF: store attenuation, such that in meter.c the correct level is displayed
-  adc_attenuation[active_receiver->adc] = 12.0*id;
-  set_alex_attenuation(id);
+  int val = atoi(gtk_combo_box_get_active_id(GTK_COMBO_BOX(widget)));
+  if (active_receiver->id == 0) {
+    //DL1YCF: this button is only valid for the first receiver
+    //        store attenuation, such that in meter.c the correct level is displayed
+    adc_attenuation[active_receiver->adc] = 12*val;
+    set_alex_attenuation(val);
+  } else {
+    // always show "0 dB" on the button if the second RX is active
+    if (val != 0) {
+      gtk_combo_box_set_active_id(GTK_COMBO_BOX(c25_att_combobox), "0");
+    }
+  }
 }
 
 static void c25_preamp_combobox_changed(GtkWidget *widget, gpointer data) {
-  int id = atoi(gtk_combo_box_get_active_id(GTK_COMBO_BOX(widget)));
-  //DL1YCF comment: dither and preamp are "misused" to store the PreAmp value.
-  //                this has to be exploited in meter.c
-  active_receiver->dither = id >= 2;
-  active_receiver->preamp = id >= 1;
+  int val = atoi(gtk_combo_box_get_active_id(GTK_COMBO_BOX(widget)));
+  if (active_receiver->id == 0) {
+    //DL1YCF: This button is only valid for the first receiver
+    //        dither and preamp are "misused" to store the PreAmp value.
+    //        this has to be exploited in meter.c
+    active_receiver->dither = (val >= 2);  // second preamp ON
+    active_receiver->preamp = (val >= 1);  // first  preamp ON
+  } else{
+    // always show "0 dB" on the button if the second RX is active
+    if (val != 0) {
+      gtk_combo_box_set_active_id(GTK_COMBO_BOX(c25_preamp_combobox), "0");
+    }
+  }
 }
 
 static void agcgain_value_changed_cb(GtkWidget *widget, gpointer data) {
@@ -580,11 +595,7 @@ fprintf(stderr,"sliders_init: width=%d height=%d\n", width,height);
        attenuation_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,0.0, 60.0, 1.0);
        gtk_range_set_value (GTK_RANGE(attenuation_scale),rx_gain_slider[active_receiver->adc]);
 #else
-       if (filter_board == CHARLY25) {
-         attenuation_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,0.0, 36.0, 1.0);
-        } else {
-         attenuation_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,0.0, 31.0, 1.0);
-       }
+       attenuation_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,0.0, 31.0, 1.0);
        gtk_range_set_value (GTK_RANGE(attenuation_scale),adc_attenuation[active_receiver->adc]);
 #endif
   

diff --git a/stemlab_discovery.c b/stemlab_discovery.c
index febb98ba331b4bfe8858e47261f8baf52e1b9107..9f709e3bb6fcebc20a3d747f2de284c2a9eaca5f 100644 (file)
--- a/stemlab_discovery.c
+++ b/stemlab_discovery.c
@@ -254,7 +254,8 @@ static size_t app_list_cb(void *buffer, size_t size, size_t nmemb, void *data) {
   return size * nmemb;
 }
 
-// This is essentially a no-op curl callback
+// This is essentially a no-op curl callback.
+// Its main purpose is to prevent the status message going to stderr
 static size_t app_start_callback(void *buffer, size_t size, size_t nmemb, void *data) {
   if (strncmp(buffer, "{\"status\":\"OK\"}", size*nmemb) != 0) {
     fprintf(stderr, "stemlab_start: Receiver error from STEMlab\n");
@@ -263,36 +264,63 @@ static size_t app_start_callback(void *buffer, size_t size, size_t nmemb, void *
   return size * nmemb;
 }
 
-void stemlab_start_app(const char * const app_id) {
+int stemlab_start_app(const char * const app_id) {
   // Dummy string, using the longest possible app id
-  char app_start_url[] = "http://123.123.123.123/bazaar?start=stemlab_sdr_transceiver_hpsdr";
-  sprintf(app_start_url, "http://%s/bazaar?start=%s",
-          inet_ntoa(radio->info.network.address.sin_addr),
-          app_id);
+  char app_start_url[] = "http://123.123.123.123/bazaar?start=stemlab_sdr_transceiver_hpsdr_headroom_max";
+  //
+  // If there is already an SDR application running on the RedPitaya,
+  // starting the SDR app might lead to an unpredictable state, unless
+  // the "killall" command from stop.sh is included in start.sh but this
+  // is not done at the factory.
+  // Therefore, we first stop the program (this essentially includes the
+  // command "killall sdr_transceiver_hpsdr") and then start it.
+  // We return with value 0 if everything went OK, else we return -1.
+  // This is so because in the NO_AVAHI case, we can in principle recover
+  // from a failure here.
+
   CURL *curl_handle = curl_easy_init();
+  CURLcode curl_error = CURLE_OK;
+
   if (curl_handle == NULL) {
     fprintf(stderr, "stemlab_start: Failed to create cURL handle\n");
-    exit(-1);
+    return -1;
   }
-  CURLcode curl_error = CURLE_OK;
+
 #define check_curl(description) do { \
   if (curl_error != CURLE_OK) { \
     fprintf(stderr, "stemlab_start: " description ": %s\n", \
         curl_easy_strerror(curl_error)); \
-    exit(-1); \
+     return -1; \
   } \
 }  while (0);
+
+  sprintf(app_start_url, "http://%s/bazaar?stop=%s",
+          inet_ntoa(radio->info.network.address.sin_addr),
+          app_id);
+  curl_error = curl_easy_setopt(curl_handle, CURLOPT_URL, app_start_url);
+  check_curl("Failed setting cURL URL");
+  curl_error = curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, app_start_callback);
+  check_curl("Failed install cURL callback");
+  curl_error = curl_easy_perform(curl_handle);
+  check_curl("Failed to stop app");
+
+  sprintf(app_start_url, "http://%s/bazaar?start=%s",
+          inet_ntoa(radio->info.network.address.sin_addr),
+          app_id);
   curl_error = curl_easy_setopt(curl_handle, CURLOPT_URL, app_start_url);
   check_curl("Failed setting cURL URL");
   curl_error = curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, app_start_callback);
   check_curl("Failed install cURL callback");
   curl_error = curl_easy_perform(curl_handle);
   check_curl("Failed to start app");
+
 #undef check_curl
+
   curl_easy_cleanup(curl_handle);
   // Since the SDR application is now running, we can hand it over to the
   // regular HPSDR protocol handling code
   radio->protocol = ORIGINAL_PROTOCOL;
+  return 0;
 }
 
 void stemlab_cleanup(void) {

diff --git a/stemlab_discovery.h b/stemlab_discovery.h
index ce7086858dc539e6bbab644104a5079e27ee3a1d..f4d8f92b76a6732965eadf3a61590f988984f9af 100644 (file)
--- a/stemlab_discovery.h
+++ b/stemlab_discovery.h
@@ -18,5 +18,5 @@
 */
 
 extern void stemlab_discovery(void);
-extern void stemlab_start_app(const char * const app_id);
+extern int  stemlab_start_app(const char * const app_id);
 extern void stemlab_cleanup(void);