Przeglądaj źródła

Добавлена отгрузка регистра MUX. Изменён порт по умолчанию на 5025

zaytsev.mikhail.olegovich@gmail.com 1 rok temu
rodzic
commit
6187dac6e4
2 zmienionych plików z 7 dodań i 1 usunięć
  1. 6 0
      Devices/lmx2594.c
  2. 1 1
      main.c

+ 6 - 0
Devices/lmx2594.c

@@ -188,6 +188,9 @@ int lmx_freq_set_main_band(void *bar1, double freq, double f_pd) {
     lmx2594regs[112-PLL_DEN_M] = lmx2594regs[112-PLL_DEN_M] & (~0xFFFF);
     // Next 16 bits of the denominator
     lmx2594regs[112-PLL_DEN_M] = lmx2594regs[112-PLL_DEN_M] | (frac_d & 0xFFFF);
+    // Set the OUTA_MUX to channel divider R45[12:11]; 0 - Channel divider, 1 - VCO;
+    lmx2594regs[112 - OUTA_MUX] = lmx2594regs[112 - OUTA_MUX] & (~BITM_LMX2594_R45_OUTA_MUX);
+    lmx2594regs[112 - OUTA_MUX] = lmx2594regs[112 - OUTA_MUX] | ENUM_LMX2594_R45_OUTA_MUX_VCO;
     // Program the FCAL_EN bit
     lmx2594regs[112-FCAL_ADDR] = lmx2594regs[112-FCAL_ADDR] | (LMX2594_R0_FCAL_EN);
     // Show the all the upper 16 bits of the register lmx2594regs[PLL_N_S]
@@ -201,6 +204,7 @@ int lmx_freq_set_main_band(void *bar1, double freq, double f_pd) {
             lmx2594regs[112-PLL_DEN_M],
             lmx2594regs[112-PLL_NUM_S],
             lmx2594regs[112-PLL_NUM_M],
+            lmx2594regs[112-OUTA_MUX],
             lmx2594regs[112-FCAL_ADDR]
     };
     // Create a header for the LMX2594 with the appropriate number of words
@@ -407,6 +411,8 @@ int lmx_freq_set_out_of_band(void *bar1, double freq, double f_pd) {
     lmx2594regs[112 - FCAL_ADDR] = lmx2594regs[112 - FCAL_ADDR] | (LMX2594_R0_FCAL_EN);
 
     uint32_t lmx_change_freq_regs[] = {
+            lmx2594regs[112-MASH_ORDER],
+            lmx2594regs[112-PFD_DLY_SEL],
             lmx2594regs[112 - PLL_N_S],
             lmx2594regs[112 - PLL_N_M],
             lmx2594regs[112 - PLL_DEN_S],

+ 1 - 1
main.c

@@ -18,7 +18,7 @@
 #include "command.h"
 
 #define REQUESTED_MEMORY_SIZE  0x1000
-#define SERVER_PORT 5000
+#define SERVER_PORT 5025
 #define BACKLOG 10
 
 volatile int conn_fd = 0;