Changeset 10929

Timestamp:

06/08/11 17:19:46 (13 years ago)

Author:

weitzel

Message:

FTM: patch in LP interface to correct for swapped channels; change in FTUcontrol to fix first-board-bug

Location:

firmware/FTM

Files:

• FTM_top.vhd (modified) (1 diff)
• ftu_control/FTM_ftu_control.vhd (modified) (4 diffs)

firmware/FTM/FTM_top.vhd

@@ -1256 +1256 @@
       clk_50         => clk_50M_sig,
       --clk_250        => clk_250M_sig,
-      Cal_0_p        => Cal_0_p,
-      Cal_0_n        => Cal_0_n,
+      Cal_0_p        => Cal_2_p,  --swapped with Cal_2_p due to connector on FLD board
+      Cal_0_n        => Cal_2_n,  --swapped with Cal_2_n due to connector on FLD board
       Cal_1_p        => Cal_1_p,
       Cal_1_n        => Cal_1_n,
-      Cal_2_p        => Cal_2_p,
-      Cal_2_n        => Cal_2_n,
+      Cal_2_p        => Cal_0_p,  --swapped with Cal_0_p due to connector on FLD board
+      Cal_2_n        => Cal_0_n,  --swapped with Cal_0_n due to connector on FLD board
       Cal_3_p        => Cal_3_p,
       Cal_3_n        => Cal_3_n,
-      Cal_4_p        => Cal_4_p,
-      Cal_4_n        => Cal_4_n,
+      Cal_4_p        => Cal_6_p,  --swapped with Cal_6_p due to connector on FLD board
+      Cal_4_n        => Cal_6_n,  --swapped with Cal_6_n due to connector on FLD board
       Cal_5_p        => Cal_5_p,
       Cal_5_n        => Cal_5_n,
-      Cal_6_p        => Cal_6_p,
-      Cal_6_n        => Cal_6_n,
+      Cal_6_p        => Cal_4_p,  --swapped with Cal_4_p due to connector on FLD board
+      Cal_6_n        => Cal_4_n,  --swapped with Cal_4_n due to connector on FLD board
       Cal_7_p        => Cal_7_p,
       Cal_7_n        => Cal_7_n,

firmware/FTM/ftu_control/FTM_ftu_control.vhd

@@ -733 +733 @@
         when PING_1 =>  -- wait one cycle for CRC calculation
           enable_crc_from_FSM_sig <= '0';
-          rec_reset_sig <= '1';
+          --rec_reset_sig <= '1';
           FTM_ftu_rs485_control_State <= PING_2;
 
@@ -749 +749 @@
               tx_data_sig <= crc_sig;
               tx_start_sig <= '1';
+              rec_reset_sig <= '1';  -- new
               FTM_ftu_rs485_control_State <= PING_2;
             else
@@ -924 +925 @@
         when RATES_1 =>  -- wait one cycle for CRC calculation
           enable_crc_from_FSM_sig <= '0';
+          --rec_reset_sig <= '1';  --new
           crc_data_from_FSM_sig_cp <= crc_data_from_FSM_sig;
           FTM_ftu_rs485_control_State <= RATES_2;
 
         when RATES_2 =>  -- transmit byte by byte
+          rec_reset_sig <= '0';  --new
           if (tx_busy_sig = '0') then
             if (frame_cnt < 27) then
@@ -940 +943 @@
               tx_data_sig <= crc_sig;
               tx_start_sig <= '1';
+              rec_reset_sig <= '1';
               FTM_ftu_rs485_control_State <= RATES_2;
             else