Changeset 10929 for firmware


Ignore:
Timestamp:
Jun 8, 2011, 5:19:46 PM (8 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:
2 edited

Legend:

Unmodified
Added
Removed
  • firmware/FTM/FTM_top.vhd

    r10879 r10929  
    12561256      clk_50         => clk_50M_sig,
    12571257      --clk_250        => clk_250M_sig,
    1258       Cal_0_p        => Cal_0_p,
    1259       Cal_0_n        => Cal_0_n,
     1258      Cal_0_p        => Cal_2_p,  --swapped with Cal_2_p due to connector on FLD board
     1259      Cal_0_n        => Cal_2_n,  --swapped with Cal_2_n due to connector on FLD board
    12601260      Cal_1_p        => Cal_1_p,
    12611261      Cal_1_n        => Cal_1_n,
    1262       Cal_2_p        => Cal_2_p,
    1263       Cal_2_n        => Cal_2_n,
     1262      Cal_2_p        => Cal_0_p,  --swapped with Cal_0_p due to connector on FLD board
     1263      Cal_2_n        => Cal_0_n,  --swapped with Cal_0_n due to connector on FLD board
    12641264      Cal_3_p        => Cal_3_p,
    12651265      Cal_3_n        => Cal_3_n,
    1266       Cal_4_p        => Cal_4_p,
    1267       Cal_4_n        => Cal_4_n,
     1266      Cal_4_p        => Cal_6_p,  --swapped with Cal_6_p due to connector on FLD board
     1267      Cal_4_n        => Cal_6_n,  --swapped with Cal_6_n due to connector on FLD board
    12681268      Cal_5_p        => Cal_5_p,
    12691269      Cal_5_n        => Cal_5_n,
    1270       Cal_6_p        => Cal_6_p,
    1271       Cal_6_n        => Cal_6_n,
     1270      Cal_6_p        => Cal_4_p,  --swapped with Cal_4_p due to connector on FLD board
     1271      Cal_6_n        => Cal_4_n,  --swapped with Cal_4_n due to connector on FLD board
    12721272      Cal_7_p        => Cal_7_p,
    12731273      Cal_7_n        => Cal_7_n,
  • firmware/FTM/ftu_control/FTM_ftu_control.vhd

    r10740 r10929  
    733733        when PING_1 =>  -- wait one cycle for CRC calculation
    734734          enable_crc_from_FSM_sig <= '0';
    735           rec_reset_sig <= '1';
     735          --rec_reset_sig <= '1';
    736736          FTM_ftu_rs485_control_State <= PING_2;
    737737
     
    749749              tx_data_sig <= crc_sig;
    750750              tx_start_sig <= '1';
     751              rec_reset_sig <= '1';  -- new
    751752              FTM_ftu_rs485_control_State <= PING_2;
    752753            else
     
    924925        when RATES_1 =>  -- wait one cycle for CRC calculation
    925926          enable_crc_from_FSM_sig <= '0';
     927          --rec_reset_sig <= '1';  --new
    926928          crc_data_from_FSM_sig_cp <= crc_data_from_FSM_sig;
    927929          FTM_ftu_rs485_control_State <= RATES_2;
    928930
    929931        when RATES_2 =>  -- transmit byte by byte
     932          rec_reset_sig <= '0';  --new
    930933          if (tx_busy_sig = '0') then
    931934            if (frame_cnt < 27) then
     
    940943              tx_data_sig <= crc_sig;
    941944              tx_start_sig <= '1';
     945              rec_reset_sig <= '1';
    942946              FTM_ftu_rs485_control_State <= RATES_2;
    943947            else
Note: See TracChangeset for help on using the changeset viewer.