fixed card id for Orion 2

diff --git a/discovered.h b/discovered.h
index 6eea2623c54fc9bfb6bb257304ca338781adacf0..417d74212c19c3d0611ea1c47e12afc92e76b9de 100644 (file)
--- a/discovered.h
+++ b/discovered.h
@@ -33,7 +33,7 @@
 #define NEW_DEVICE_HERMES2 2
 #define NEW_DEVICE_ANGELIA 3
 #define NEW_DEVICE_ORION 4
-#define NEW_DEVICE_ANAN_10E 5
+#define NEW_DEVICE_ORION2 5
 #define NEW_DEVICE_HERMES_LITE 6
 
 #define STATE_AVAILABLE 2

diff --git a/main.c b/main.c
index 8e8ac599553a5ea80a6f631544ea366b3c3ed3f5..7c27a641fd2cb2b0bfde42d2aafcb1f981b49846 100644 (file)
--- a/main.c
+++ b/main.c
@@ -172,9 +172,9 @@ gint update(gpointer data) {
                     constant1=5.0;
                     constant2=0.108;
                     break;
-                case NEW_DEVICE_ANAN_10E:
-                    constant1=3.3;
-                    constant2=0.09;
+                case NEW_DEVICE_ORION2:
+                    constant1=5.0;
+                    constant2=0.108;
                     break;
                 case NEW_DEVICE_HERMES_LITE:
                     constant1=3.3;

diff --git a/menu.c b/menu.c
index bf1d1a79e00f3f2d2f8906a171e7d144f53948a8..662bed68c320e27c056971e49cdcca3d827177c2 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -451,7 +451,9 @@ static gboolean menu_pressed_event_cb (GtkWidget *widget,
   g_signal_connect(micboost_b,"toggled",G_CALLBACK(micboost_cb),NULL);
 
 
-  if((protocol==NEW_PROTOCOL && device==NEW_DEVICE_ORION) || (protocol==ORIGINAL_PROTOCOL && device==DEVICE_ORION)) {
+  if((protocol==NEW_PROTOCOL && device==NEW_DEVICE_ORION) ||
+     (protocol==NEW_PROTOCOL && device==NEW_DEVICE_ORION2) ||
+     (protocol==ORIGINAL_PROTOCOL && device==DEVICE_ORION)) {
 
     GtkWidget *ptt_ring_b=gtk_radio_button_new_with_label(NULL,"PTT On Ring, Mic and Bias on Tip");
     //gtk_widget_override_font(ptt_ring_b, pango_font_description_from_string("Arial 18"));

diff --git a/new_discovery.c b/new_discovery.c
index c69a10a46cc1cf7373d2feb174cfc8a11d7d269a..8d23da4e6f512a27779c96c6e13b52182c895bac 100644 (file)
--- a/new_discovery.c
+++ b/new_discovery.c
@@ -221,8 +221,8 @@ void* new_discover_receive_thread(void* arg) {
                        case NEW_DEVICE_ORION:
                             strcpy(discovered[devices].name,"Orion");
                             break;
-                       case NEW_DEVICE_ANAN_10E:
-                            strcpy(discovered[devices].name,"Anan-10E");
+                       case NEW_DEVICE_ORION2:
+                            strcpy(discovered[devices].name,"Orion2");
                             break;
                        case NEW_DEVICE_HERMES_LITE:
                             strcpy(discovered[devices].name,"Hermes Lite");

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

diff --git a/radio.c b/radio.c
index 6a0a0b8606b1d89c09151646978fe9f056dbd54d..54ab494143c580cdcfec792483e7a89076b4e4fa 100644 (file)
--- a/radio.c
+++ b/radio.c
@@ -417,6 +417,8 @@ void radioRestoreState() {
     if(value) OCfull_tune_time=atoi(value);
     value=getProperty("OCmemory_tune_time");
     if(value) OCmemory_tune_time=atoi(value);
+    value=getProperty("attenuation");
+    if(value) attenuation=atoi(value);
 
     bandRestoreState();
     sem_post(&property_sem);
@@ -540,6 +542,8 @@ void radioSaveState() {
     setProperty("OCfull_tune_time",value);
     sprintf(value,"%d",OCmemory_tune_time);
     setProperty("OCmemory_tune_time",value);
+    sprintf(value,"%d",attenuation);
+    setProperty("attenuation",value);
 
     bandSaveState();
 

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