Changeset 357

Timestamp:

01/23/12 01:30:19 (4 months ago)

Author:

df9dq

Message:

Firmware: Freien Pin als PTT verwenden (oder für beliebige Zwecke)

Location:

trunk/Software/LPC/fifisdr/src

Files:

• i2c/si570.c (modified) (4 diffs)
• lpcusb/softrock.c (modified) (6 diffs)
• params.h (modified) (1 diff)
• startup.c (modified) (1 diff)

trunk/Software/LPC/fifisdr/src/i2c/si570.c

@@ -388 +388 @@
     }
 
-    if ((g_params.presel_mode == 2) || (g_params.presel_mode == 3)) {
+    if (g_params.presel_mode == 2) {
         //TODO  Frequenz per UART senden
     }
@@ -414 +414 @@
     }
 
-    if ((g_params.presel_mode == 1) || (g_params.presel_mode == 2)) {
+    if ((g_params.presel_mode == 1) || (g_params.presel_mode == 2) || (g_params.presel_mode == 3)) {
         pattern = 0;
         search_range = 0xFFFFFFFF;
@@ -431 +431 @@
 
         /* Set outputs */
-        LPC_GPIO2->FIOCLR = ((~pattern) & 0x0F) << 5;
-        LPC_GPIO2->FIOSET = (( pattern) & 0x0F) << 5;
-    }
-
-    if ((g_params.presel_mode == 2) || (g_params.presel_mode == 3)) {
+        if (g_params.presel_mode == 3) {
+            LPC_GPIO2->FIOCLR = ((~pattern) & 0x07) << 5;
+            LPC_GPIO2->FIOSET = (( pattern) & 0x07) << 5;
+        }
+        else {
+            LPC_GPIO2->FIOCLR = ((~pattern) & 0x0F) << 5;
+            LPC_GPIO2->FIOSET = (( pattern) & 0x0F) << 5;
+        }
+    }
+
+    if (g_params.presel_mode == 2) {
         //TODO  Frequenz per UART senden
     }
@@ -765 +771 @@
 static void si570_OStimerCallback (xTimerHandle timer)
 {
+    (void) timer;
     si570_Message message;
-    
+
     message.opcode = SI570_MESSAGE_SAVE_PARAMS;
     xQueueSendToBack(si570_queue, &message, 0);

trunk/Software/LPC/fifisdr/src/lpcusb/softrock.c

@@ -74 +74 @@
             pbData[1] = 17;
             length = 2;
-        break;
+            break;
 
         case 0x02:  /* Dummy */
-            pbData[0] = 0x00;
+            pbData[0] = 0
+               | (0 << 5)               /* CW1 */
+               | (0 << 4)               /* PTT */
+               | (1 << 3)               /* 3.3V indicator */
+               | (0 << 1)               /* CW2 */
+               ;
             length = 1;
-        break;
+            break;
 
         case 0x15:
@@ -85 +90 @@
             pbData[1] = 0;
             length = 2;
-        break;
+            break;
 
         case 0x17:  /* Filter */
@@ -123 +128 @@
             }
             break;
-        
+
         case 0x19:  /* Read RX Band Pass Filter */
             pbData[0] = 0;
@@ -143 +148 @@
             }
             break;
-        
+
         case 0x30:  /* Set frequency by register values */
             si570_setVirtualRegisters (pbData);
@@ -222 +227 @@
             break;
 
+        case 0x43:  /* Dummy (Get/Set USB ID) */
+            pbData[0] = '0';
+            length = 1;
+            break;
+
         case 0x44:  /* Si570 Speed Grade and DCO range */
             /* No support for changing the parameters! */
@@ -229 +239 @@
             pwData[1] = 5670;   /* DCO maximum frequency [MHz] */
             pbData[4] = 3;      /* Grade C (A=1, B=2, C=3, C+=4 */
-            length = 5;
+            pbData[5] = 0x87;   /* M freeze for RFREQ change, register set starts at 7 */
+            length = 6;
             break;
 
         case 0x50:  /* Set PTT line */
+#if (BOARD_TYPE == BOARD_KAI2)
+            /* Preselector mode 3: Use pin X6.8 (SV1.12 on preselector) as PTT */
+            if (g_params.presel_mode == 3) {
+                if (pSetup->wValue & 1) {
+                    LPC_GPIO2->FIOSET = (1 << 8);
+                }
+                else {
+                    LPC_GPIO2->FIOCLR = (1 << 8);
+                }
+            }
+#endif
             pbData[0] = 0x22;
             length = 1;
-        break;
+            break;
 
         case 0x51:  /* Read CW key level */
-            pbData[0] = 0xFF;
+            pbData[0] = 0x22;
             length = 1;
-        break;
+            break;
 
         case 0xAB:    /* FiFi-SDR specific commands (read) */

trunk/Software/LPC/fifisdr/src/params.h

@@ -54 +54 @@
              * 2 = Wie (1), aber nur drei digitale AusgÀnge (noch immer 16 BÀnder!), und zusÀtzlich
              *     eine serielle Ausgabe der Frequenz ÃŒber UART.
-             * 3 = Wenn ein Jumper gesetzt ist, wird die Frequenz ÃŒber UART ausgegeben. Es gibt
-             *     dann keine Digital-AusgÀnge. Wenn der Jumper nicht gesetzt ist, dann wie (1).
+             * 3 = Wie (1), es werden aber nur drei AusgÀnge fÌr die acht BÀnder des
+             *     FiFi-Preselektors benutzt.
+             *     Der Pin X6.8 wird als PTT verwendet (PTT aktiv --> X6.8 = low).
+             *     Pin X6.8 des FiFi-SDR entspricht Pin SV1.12 am FiFi-Preselektor.
              */
             uint32_t presel_freq[16][2];    /* Anfangs- und Endfrequenz. Format 11.21 */

trunk/Software/LPC/fifisdr/src/startup.c

@@ -86 +86 @@
 void (*vector_table[])( void ) __attribute__ ((section(".vectors"))) =
 {
-    &__stack_end__,
+    (void(*)(void))&__stack_end__,
     Reset_Handler,
     NMI_Handler,