added 768K and 1536K to sample rates for new protocol

diff --git a/main.c b/main.c
index 7c27a641fd2cb2b0bfde42d2aafcb1f981b49846..f3759fc19c66d434b6a4ccb1068ee147392be6f2 100644 (file)
--- a/main.c
+++ b/main.c
@@ -581,45 +581,61 @@ static void configure_cb(GtkWidget *widget, gpointer data) {
   gtk_grid_attach(GTK_GRID(grid),sample_rate_384,0,4,1,1);
   g_signal_connect(sample_rate_384,"pressed",G_CALLBACK(sample_rate_cb),(gpointer *)384000);
 
+  if(d->protocol==NEW_PROTOCOL) {
+    GtkWidget *sample_rate_768=gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(sample_rate_384),"768000");
+    //gtk_widget_override_font(sample_rate_768, pango_font_description_from_string("Arial 18"));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sample_rate_768), sample_rate==768000);
+    gtk_widget_show(sample_rate_768);
+    gtk_grid_attach(GTK_GRID(grid),sample_rate_768,0,5,1,1);
+    g_signal_connect(sample_rate_768,"pressed",G_CALLBACK(sample_rate_cb),(gpointer *)768000);
+
+    GtkWidget *sample_rate_1536=gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(sample_rate_768),"1536000");
+    //gtk_widget_override_font(sample_rate_1536, pango_font_description_from_string("Arial 18"));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sample_rate_1536), sample_rate==1536000);
+    gtk_widget_show(sample_rate_1536);
+    gtk_grid_attach(GTK_GRID(grid),sample_rate_1536,0,6,1,1);
+    g_signal_connect(sample_rate_1536,"pressed",G_CALLBACK(sample_rate_cb),(gpointer *)1536000);
+  }
+
 
   GtkWidget *display_label=gtk_label_new("Display:");
   //gtk_widget_override_font(display_label, pango_font_description_from_string("Arial 18"));
   gtk_widget_show(display_label);
-  gtk_grid_attach(GTK_GRID(grid),display_label,0,5,1,1);
+  gtk_grid_attach(GTK_GRID(grid),display_label,0,7,1,1);
 
   GtkWidget *b_display_panadapter=gtk_check_button_new_with_label("Display Panadapter");
   //gtk_widget_override_font(b_display_panadapter, pango_font_description_from_string("Arial 18"));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_display_panadapter), display_panadapter);
   gtk_widget_show(b_display_panadapter);
-  gtk_grid_attach(GTK_GRID(grid),b_display_panadapter,0,6,1,1);
+  gtk_grid_attach(GTK_GRID(grid),b_display_panadapter,0,8,1,1);
   g_signal_connect(b_display_panadapter,"toggled",G_CALLBACK(display_panadapter_cb),(gpointer *)NULL);
 
   GtkWidget *b_display_waterfall=gtk_check_button_new_with_label("Display Waterfall");
   //gtk_widget_override_font(b_display_waterfall, pango_font_description_from_string("Arial 18"));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_display_waterfall), display_waterfall);
   gtk_widget_show(b_display_waterfall);
-  gtk_grid_attach(GTK_GRID(grid),b_display_waterfall,0,7,1,1);
+  gtk_grid_attach(GTK_GRID(grid),b_display_waterfall,0,9,1,1);
   g_signal_connect(b_display_waterfall,"toggled",G_CALLBACK(display_waterfall_cb),(gpointer *)NULL);
 
   GtkWidget *b_display_sliders=gtk_check_button_new_with_label("Display Sliders");
   //gtk_widget_override_font(b_display_sliders, pango_font_description_from_string("Arial 18"));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_display_sliders), display_sliders);
   gtk_widget_show(b_display_sliders);
-  gtk_grid_attach(GTK_GRID(grid),b_display_sliders,0,8,1,1);
+  gtk_grid_attach(GTK_GRID(grid),b_display_sliders,0,10,1,1);
   g_signal_connect(b_display_sliders,"toggled",G_CALLBACK(display_sliders_cb),(gpointer *)NULL);
 
   GtkWidget *b_display_toolbar=gtk_check_button_new_with_label("Display Toolbar");
   //gtk_widget_override_font(b_display_toolbar, pango_font_description_from_string("Arial 18"));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_display_toolbar), display_toolbar);
   gtk_widget_show(b_display_toolbar);
-  gtk_grid_attach(GTK_GRID(grid),b_display_toolbar,0,9,1,1);
+  gtk_grid_attach(GTK_GRID(grid),b_display_toolbar,0,11,1,1);
   g_signal_connect(b_display_toolbar,"toggled",G_CALLBACK(display_toolbar_cb),(gpointer *)NULL);
 
   GtkWidget *b_toolbar_simulate_buttons=gtk_check_button_new_with_label("Toolbar Simulate Buttons");
   //gtk_widget_override_font(b_toolbar_simulate_buttons, pango_font_description_from_string("Arial 18"));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b_toolbar_simulate_buttons), toolbar_simulate_buttons);
   gtk_widget_show(b_toolbar_simulate_buttons);
-  gtk_grid_attach(GTK_GRID(grid),b_toolbar_simulate_buttons,0,10,1,1);
+  gtk_grid_attach(GTK_GRID(grid),b_toolbar_simulate_buttons,0,12,1,1);
   g_signal_connect(b_toolbar_simulate_buttons,"toggled",G_CALLBACK(toolbar_simulate_buttons_cb),(gpointer *)NULL);
   gtk_container_add(GTK_CONTAINER(content),grid);
 

diff --git a/new_protocol.c b/new_protocol.c
index cc43408931d622c08896d0ca24d7ad7f24a40953..1c432a75d8999fa9a3f9927e179e707d999e9909 100644 (file)
--- a/new_protocol.c
+++ b/new_protocol.c
@@ -633,6 +633,12 @@ fprintf(stderr,"new_protocol_thread: receiver=%d\n", receiver);
         case 384000:
             outputsamples=BUFFER_SIZE/8;
             break;
+        case 768000:
+            outputsamples=BUFFER_SIZE/16;
+            break;
+        case 1536000:
+            outputsamples=BUFFER_SIZE/32;
+            break;
     }
 
     micoutputsamples=BUFFER_SIZE*4;  // 48000 in, 192000 out

diff --git a/pihpsdr b/pihpsdr
index eae4d133b9202d67f234ba2644f191058f332daa..784096991f01817a8dc8ff7d2d93497ab06d035a 100755 (executable)
Binary files a/pihpsdr and b/pihpsdr differ

diff --git a/release/pihpsdr.tar b/release/pihpsdr.tar
index 88501af32b5987a0a05100689f49e611bb6b951f..88acc4ee6a45c681a9faf56cb04f227e79166ea5 100644 (file)
Binary files a/release/pihpsdr.tar and b/release/pihpsdr.tar differ

diff --git a/release/pihpsdr/pihpsdr b/release/pihpsdr/pihpsdr
index eae4d133b9202d67f234ba2644f191058f332daa..784096991f01817a8dc8ff7d2d93497ab06d035a 100755 (executable)
Binary files a/release/pihpsdr/pihpsdr and b/release/pihpsdr/pihpsdr differ