Changeset 10740 for firmware/FTM/ftu_control

Timestamp:

05/18/11 13:59:12 (14 years ago)

Author:

weitzel

Message:

several bugfixes for FTM firmware

File:

• firmware/FTM/ftu_control/FTM_ftu_control.vhd (modified) (7 diffs)

firmware/FTM/ftu_control/FTM_ftu_control.vhd

@@ -219 +219 @@
   signal frame_cnt           : integer range 0 to (FTU_RS485_BLOCK_WIDTH / 8) := 0;
   signal FTU_list_reg_cnt    : integer range 0 to NO_OF_FTU_LIST_REG := 0;
-  signal FTU_list_header_cnt : integer range 0 to FTU_LIST_RAM_OFFSET := 0;
+  signal FTU_list_header_cnt : integer range 0 to (FTU_LIST_RAM_OFFSET  + 1):= 0;
   signal DD_RAM_reg_cnt      : integer range 0 to NO_OF_DD_RAM_REG := 0;
   
@@ -442 +442 @@
           reset_crc_from_FSM_sig <= '0';
           enable_crc_from_FSM_sig <= '0';
-          new_config_done <= '0';
-          ping_all_done   <= '0';
-          read_rates_done <= '0';
+          --new_config_done <= '0';
+          --ping_all_done   <= '0';
+          --read_rates_done <= '0';
           if (new_config = '1') then
+            new_config_done <= '0';--
             new_config_started <= '1';
             ping_all_started   <= '0';
@@ -451 +452 @@
             FTM_ftu_rs485_control_State <= ACTIVE_LIST;
           elsif (new_config = '0' and  ping_all = '1') then
+            ping_all_done   <= '0';--
             new_config_started <= '0';
             ping_all_started   <= '1';
@@ -457 +459 @@
             FTM_ftu_rs485_control_State <= PING;
           elsif (new_config = '0' and  ping_all = '0' and read_rates = '1') then
+            read_rates_done <= '0';--
             new_config_started <= '0';
             ping_all_started   <= '0';
@@ -836 +839 @@
         when PING_END =>  -- add final ping statistics to FTU-list
           if (FTU_list_header_cnt < FTU_LIST_RAM_OFFSET) then
-            FTU_list_header_cnt <= FTU_list_header_cnt + 1;
+            --FTU_list_header_cnt <= FTU_list_header_cnt + 1;
             FTM_ftu_rs485_control_State <= PING_END_1;
           else
@@ -854 +857 @@
           if (FTUlist_RAM_busy = '0') then
             write_FTUlist_RAM <= '1';
-            addr_FTUlist_RAM <= conv_std_logic_vector((FTU_list_header_cnt - 1), FTU_LIST_RAM_ADDR_WIDTH);
-            if ((FTU_list_header_cnt - 1) = 0) then
+            --addr_FTUlist_RAM <= conv_std_logic_vector((FTU_list_header_cnt - 1), FTU_LIST_RAM_ADDR_WIDTH);
+            addr_FTUlist_RAM <= conv_std_logic_vector((FTU_list_header_cnt), FTU_LIST_RAM_ADDR_WIDTH);
+            --if ((FTU_list_header_cnt - 1) = 0) then
+            if ((FTU_list_header_cnt) = 0) then
               data_FTUlist_RAM <= conv_std_logic_vector(no_of_FTU_answer_sig, 16);
-            elsif ((FTU_list_header_cnt - 1) < 5) then
-              data_FTUlist_RAM <= conv_std_logic_vector(FTU_answer_array_sig(FTU_list_header_cnt - 2), 16);
-            elsif ((FTU_list_header_cnt - 1) < 9) then
-              data_FTUlist_RAM <= active_FTU_array_sig(FTU_list_header_cnt - 6);
+            --elsif ((FTU_list_header_cnt - 1) < 5) then
+            elsif ((FTU_list_header_cnt) < 5) then
+              --data_FTUlist_RAM <= conv_std_logic_vector(FTU_answer_array_sig(FTU_list_header_cnt - 2), 16);
+              data_FTUlist_RAM <= conv_std_logic_vector(FTU_answer_array_sig(FTU_list_header_cnt - 1), 16);
+            --elsif ((FTU_list_header_cnt - 1) < 9) then
+            elsif ((FTU_list_header_cnt) < 9) then
+              --data_FTUlist_RAM <= active_FTU_array_sig(FTU_list_header_cnt - 6);
+              --data_FTUlist_RAM <= conv_std_logic_vector(FTU_list_header_cnt - 6, 16);
+              data_FTUlist_RAM <= active_FTU_array_sig(FTU_list_header_cnt - 5);
             end if;
             FTM_ftu_rs485_control_State <= PING_END_2;
@@ -873 +883 @@
         when PING_END_3 =>
           if (FTUlist_RAM_ready = '1') then
+            FTU_list_header_cnt <= FTU_list_header_cnt + 1;
             FTM_ftu_rs485_control_State <= PING_END;
           end if;