In nearly all cases where there was a check on DEVICE_METIS, this case

also applies (if compiled for USBOZY) to DEVICE_OZY. This has been
added.

diff --git a/old_protocol.c b/old_protocol.c
index 1fcb9cae671e2ef326319b04ce0d66524589419a..2e7d22c0c71f04e02bd8aa660bf86c5c679d164d 100644 (file)
--- a/old_protocol.c
+++ b/old_protocol.c
@@ -659,6 +659,9 @@ static int rx_feedback_channel() {
   switch (device) {
     case DEVICE_METIS:
     case DEVICE_HERMES_LITE:
+#ifdef USBOZY
+    case DEVICE_OZY:
+#endif
       ret=0;
       break;
     case DEVICE_HERMES:
@@ -690,6 +693,9 @@ static int tx_feedback_channel() {
   switch (device) {
     case DEVICE_METIS:
     case DEVICE_HERMES_LITE:
+#ifdef USBOZY
+    case DEVICE_OZY:
+#endif
       ret=1;
       break;
     case DEVICE_HERMES:
@@ -813,6 +819,9 @@ static int how_many_receivers() {
     switch (device) {
       case DEVICE_METIS:
       case DEVICE_HERMES_LITE:
+#ifdef USBOZY
+      case DEVICE_OZY:
+#endif
        ret=2;  // TX feedback hard-wired to RX2
        break;
       case DEVICE_HERMES:

diff --git a/radio.c b/radio.c
index 6b202a54bdc985e981174325dc2a73b1ffe2a2bd..3f88e03b6f500b440cc60daf61006ecaabe8f811 100644 (file)
--- a/radio.c
+++ b/radio.c
@@ -710,6 +710,9 @@ void start_radio() {
     case ORIGINAL_PROTOCOL:
       switch(device) {
         case DEVICE_METIS:
+#ifdef USBOZY
+       case DEVICE_OZY:
+#endif
           pa_power=PA_1W;
           break;
         case DEVICE_HERMES:
@@ -1072,6 +1075,9 @@ void start_radio() {
     case ORIGINAL_PROTOCOL:
       switch(device) {
         case DEVICE_METIS: // No support for multiple MERCURY cards on a single ATLAS bus.
+#ifdef USBOZY
+       case DEVICE_OZY:    // No support for multiple MERCURY cards on a single ATLAS bus.
+#endif
         case DEVICE_HERMES:
         case DEVICE_HERMES_LITE:
         case DEVICE_HERMES_LITE2:

diff --git a/receiver.c b/receiver.c
index 37e652bfd55b900f38ddb9350025a24fd84ff2eb..26b703b557f3084c725f73a515e418a1c29379a2 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -1011,6 +1011,10 @@ g_print("%s: id=%d buffer_size=%d fft_size=%d pixels=%d fps=%d\n",__FUNCTION__,i
         case ORIGINAL_PROTOCOL:
           switch(device) {
             case DEVICE_METIS:
+#ifdef USBOZY
+           case DEVICE_OZY:
+#endif
+
             case DEVICE_HERMES:
             case DEVICE_HERMES_LITE:                   
             case DEVICE_HERMES_LITE2:                  

diff --git a/transmitter.c b/transmitter.c
index bbc2713800eee51483b9a2b8f4f2a8090987d143..719439cf4aa9dbc008cb341fc48e667969ab4d58 100644 (file)
--- a/transmitter.c
+++ b/transmitter.c
@@ -505,6 +505,9 @@ static gboolean update_display(gpointer data) {
       case ORIGINAL_PROTOCOL:
         switch(device) {
           case DEVICE_METIS:
+#ifdef USBOZY
+         case DEVICE_OZY:
+#endif
             constant1=3.3;
             constant2=0.09;
             break;

diff --git a/tx_menu.c b/tx_menu.c
index 040643eb800bba6a42ea419713759326100b4173..0d7d36ee7e6de2b3fcf615e99df920efb4f5f6d9 100644 (file)
--- a/tx_menu.c
+++ b/tx_menu.c
@@ -308,6 +308,10 @@ void tx_menu(GtkWidget *parent) {
     case ORIGINAL_PROTOCOL:
       switch(device) {
         case DEVICE_METIS:
+#ifdef USBOZY
+       case DEVICE_OZY:
+#endif
+
         case DEVICE_HERMES:
         case DEVICE_GRIFFIN:
         case DEVICE_ANGELIA: