chore: add .gitattributes to enforce LF line endings for new files

- Phase A: Remove self-blessing golden test from FPGA regression, wire
  MF co-sim (4 scenarios) into run_regression.sh, add opcode count guards
  to cross-layer tests (+3 tests)
- Phase B: Add radar_params.vh parser and architectural param consistency
  tests (+7 tests), add banned stale-value pattern scanner (+1 test)
- Separate WaveformConfig.range_resolution_m (physical, bandwidth-dependent)
  from bin_spacing_m (sample-rate dependent); rename all callers
- Remove 151 lines of dead golden generate/compare code from
  tb_radar_receiver_final.v; testbench now runs structural + bounds only
- Untrack generated MF co-sim CSV files, gitignore tb/golden/ directory

CI: 256 tests total (168 python + 40 cross-layer + 27 FPGA + 21 MCU), all green

.gitignore

@@ -63,17 +63,3 @@ build*_reports/
 
 # UART capture logs (generated by tools/uart_capture.py)
 logs/
-
-# Local schematic files
-# Schematic and board files (untracked)
-4_Schematics and Boards Layout/4_6_Schematics/FMC_TestBoard/*
-4_Schematics and Boards Layout/4_6_Schematics/Main_Board/*.kicad_sch
-4_Schematics and Boards Layout/4_6_Schematics/Main_Board/*.kicad_pcb
-4_Schematics and Boards Layout/4_6_Schematics/Main_Board/*.bak
-4_Schematics and Boards Layout/4_6_Schematics/Main_Board/*.tmp
-4_Schematics and Boards Layout/4_6_Schematics/Main_Board/*.net
-4_Schematics and Boards Layout/4_6_Schematics/Main_Board/*.dcm
-4_Schematics and Boards Layout/4_6_Schematics/Main_Board/*.svg
-4_Schematics and Boards Layout/4_6_Schematics/Main_Board/*.pdf
-4_Schematics and Boards Layout/4_6_Schematics/Main_Board/*.sch-bak
-4_Schematics and Boards Layout/4_6_Schematics/Main_Board/backup/

9_Firmware/9_1_Microcontroller/9_1_1_C_Cpp_Libraries/RadarSettings.cpp

@@ -14,8 +14,8 @@ void RadarSettings::resetToDefaults() {
     freq_max = 30.0e6;           // 30 MHz
     prf1 = 1000.0;               // 1 kHz
     prf2 = 2000.0;               // 2 kHz
-    max_distance = 3072.0;       // 3072 m (512 bins × 6 m, 3 km mode)
+    max_distance = 1536.0;       // 1536 m (64 bins × 24 m, 3 km mode)
-    map_size = 3072.0;           // 3072 m
+    map_size = 1536.0;           // 1536 m
     
     settings_valid = true;
 }

9_Firmware/9_1_Microcontroller/9_1_3_C_Cpp_Code/main.cpp

@@ -885,22 +885,8 @@ void handleSystemError(SystemError_t error) {
         HAL_Delay(200);
     }
 
-    // Critical errors trigger emergency shutdown.
+    // Critical errors trigger emergency shutdown
-    //
+    if (error >= ERROR_RF_PA_OVERCURRENT && error <= ERROR_POWER_SUPPLY) {
-    // Safety-critical range: any fault that can damage the PAs or leave the
-    // system in an undefined state must cut the RF rails via Emergency_Stop().
-    // This covers:
-    //   ERROR_RF_PA_OVERCURRENT .. ERROR_POWER_SUPPLY (9..13) -- PA/supply faults
-    //   ERROR_TEMPERATURE_HIGH  (14) -- >75 C on the PA thermal sensors;
-    //                                  without cutting bias + 5V/5V5/RFPA rails
-    //                                  the GaN QPA2962 stage can thermal-runaway.
-    //   ERROR_WATCHDOG_TIMEOUT  (16) -- health-check loop has stalled (>60 s);
-    //                                  transmitter state is unknown, safest to
-    //                                  latch Emergency_Stop rather than rely on
-    //                                  IWDG reset (which re-energises the rails).
-    if ((error >= ERROR_RF_PA_OVERCURRENT && error <= ERROR_POWER_SUPPLY) ||
-        error == ERROR_TEMPERATURE_HIGH ||
-        error == ERROR_WATCHDOG_TIMEOUT) {
         DIAG_ERR("SYS", "CRITICAL ERROR (code %d: %s) -- initiating Emergency_Stop()", error, error_strings[error]);
         snprintf(error_msg, sizeof(error_msg),
                  "CRITICAL ERROR! Initiating emergency shutdown.\r\n");

9_Firmware/9_1_Microcontroller/tests/.gitignore

@@ -24,4 +24,3 @@ test_gap3_emergency_stop_rails
 test_gap3_idq_periodic_reread
 test_gap3_iwdg_config
 test_gap3_temperature_max
-test_gap3_overtemp_emergency_stop

9_Firmware/9_1_Microcontroller/tests/Makefile

@@ -64,8 +64,7 @@ TESTS_STANDALONE := test_bug12_pa_cal_loop_inverted \
                     test_gap3_iwdg_config \
                     test_gap3_temperature_max \
                     test_gap3_idq_periodic_reread \
-                    test_gap3_emergency_state_ordering \
+                    test_gap3_emergency_state_ordering
-                    test_gap3_overtemp_emergency_stop
 
 # Tests that need platform_noos_stm32.o + mocks
 TESTS_WITH_PLATFORM := test_bug11_platform_spi_transmit_only
@@ -77,8 +76,7 @@ ALL_TESTS := $(TESTS_WITH_REAL) $(TESTS_MOCK_ONLY) $(TESTS_STANDALONE) $(TESTS_W
 
 .PHONY: all build test clean \
         $(addprefix test_,bug1 bug2 bug3 bug4 bug5 bug6 bug7 bug8 bug9 bug10 bug11 bug12 bug13 bug14 bug15) \
-        test_gap3_estop test_gap3_iwdg test_gap3_temp test_gap3_idq test_gap3_order \
+        test_gap3_estop test_gap3_iwdg test_gap3_temp test_gap3_idq test_gap3_order
-        test_gap3_overtemp
 
 all: build test
 
@@ -164,9 +162,6 @@ test_gap3_idq_periodic_reread: test_gap3_idq_periodic_reread.c
 test_gap3_emergency_state_ordering: test_gap3_emergency_state_ordering.c
 	$(CC) $(CFLAGS) $< -o $@
 
-test_gap3_overtemp_emergency_stop: test_gap3_overtemp_emergency_stop.c
-	$(CC) $(CFLAGS) $< -o $@
-
 # Tests that need platform_noos_stm32.o + mocks
 $(TESTS_WITH_PLATFORM): %: %.c $(MOCK_OBJS) $(PLATFORM_OBJ)
 	$(CC) $(CFLAGS) $(INCLUDES) $< $(MOCK_OBJS) $(PLATFORM_OBJ) -o $@
@@ -251,9 +246,6 @@ test_gap3_idq: test_gap3_idq_periodic_reread
 test_gap3_order: test_gap3_emergency_state_ordering
 	./test_gap3_emergency_state_ordering
 
-test_gap3_overtemp: test_gap3_overtemp_emergency_stop
-	./test_gap3_overtemp_emergency_stop
-
 # --- Clean ---
 
 clean:

9_Firmware/9_1_Microcontroller/tests/test_gap3_emergency_state_ordering.c

@@ -34,25 +34,22 @@ static void Mock_Emergency_Stop(void)
     state_was_true_when_estop_called = system_emergency_state;
 }
 
-/* Error codes (subset matching main.cpp SystemError_t) */
+/* Error codes (subset matching main.cpp) */
 typedef enum {
     ERROR_NONE = 0,
     ERROR_RF_PA_OVERCURRENT = 9,
     ERROR_RF_PA_BIAS = 10,
-    ERROR_STEPPER_MOTOR = 11,
+    ERROR_STEPPER_FAULT = 11,
     ERROR_FPGA_COMM = 12,
     ERROR_POWER_SUPPLY = 13,
     ERROR_TEMPERATURE_HIGH = 14,
-    ERROR_MEMORY_ALLOC = 15,
-    ERROR_WATCHDOG_TIMEOUT = 16,
 } SystemError_t;
 
-/* Extracted critical-error handling logic (matches post-fix main.cpp predicate) */
+/* Extracted critical-error handling logic (post-fix ordering) */
 static void simulate_handleSystemError_critical(SystemError_t error)
 {
-    if ((error >= ERROR_RF_PA_OVERCURRENT && error <= ERROR_POWER_SUPPLY) ||
+    /* Only critical errors (PA overcurrent through power supply) trigger e-stop */
-        error == ERROR_TEMPERATURE_HIGH ||
+    if (error >= ERROR_RF_PA_OVERCURRENT && error <= ERROR_POWER_SUPPLY) {
-        error == ERROR_WATCHDOG_TIMEOUT) {
         /* FIX 5: set flag BEFORE calling Emergency_Stop */
         system_emergency_state = true;
         Mock_Emergency_Stop();
@@ -96,39 +93,17 @@ int main(void)
     assert(state_was_true_when_estop_called == true);
     printf("PASS\n");
 
-    /* Test 4: Overtemp → MUST trigger e-stop (was incorrectly non-critical before fix) */
+    /* Test 4: Non-critical error → no e-stop, flag stays false */
-    printf("  Test 4: Overtemp triggers e-stop... ");
+    printf("  Test 4: Non-critical error (no e-stop)... ");
     system_emergency_state = false;
     emergency_stop_called = false;
-    state_was_true_when_estop_called = false;
     simulate_handleSystemError_critical(ERROR_TEMPERATURE_HIGH);
-    assert(emergency_stop_called == true);
-    assert(system_emergency_state == true);
-    assert(state_was_true_when_estop_called == true);
-    printf("PASS\n");
-
-    /* Test 5: Watchdog timeout → MUST trigger e-stop */
-    printf("  Test 5: Watchdog timeout triggers e-stop... ");
-    system_emergency_state = false;
-    emergency_stop_called = false;
-    state_was_true_when_estop_called = false;
-    simulate_handleSystemError_critical(ERROR_WATCHDOG_TIMEOUT);
-    assert(emergency_stop_called == true);
-    assert(system_emergency_state == true);
-    assert(state_was_true_when_estop_called == true);
-    printf("PASS\n");
-
-    /* Test 6: Non-critical error (memory alloc) → no e-stop */
-    printf("  Test 6: Non-critical error (no e-stop)... ");
-    system_emergency_state = false;
-    emergency_stop_called = false;
-    simulate_handleSystemError_critical(ERROR_MEMORY_ALLOC);
     assert(emergency_stop_called == false);
     assert(system_emergency_state == false);
     printf("PASS\n");
 
-    /* Test 7: ERROR_NONE → no e-stop */
+    /* Test 5: ERROR_NONE → no e-stop */
-    printf("  Test 7: ERROR_NONE (no action)... ");
+    printf("  Test 5: ERROR_NONE (no action)... ");
     system_emergency_state = false;
     emergency_stop_called = false;
     simulate_handleSystemError_critical(ERROR_NONE);
@@ -136,6 +111,6 @@ int main(void)
     assert(system_emergency_state == false);
     printf("PASS\n");
 
-    printf("\n=== Gap-3 Fix 5: ALL 7 TESTS PASSED ===\n\n");
+    printf("\n=== Gap-3 Fix 5: ALL TESTS PASSED ===\n\n");
     return 0;
 }

9_Firmware/9_1_Microcontroller/tests/test_gap3_overtemp_emergency_stop.c

@@ -1,119 +0,0 @@
-/*******************************************************************************
- * test_gap3_overtemp_emergency_stop.c
- *
- * Safety bug: handleSystemError() did not escalate ERROR_TEMPERATURE_HIGH
- * (or ERROR_WATCHDOG_TIMEOUT) to Emergency_Stop().
- *
- * Before fix:  The critical-error gate was
- *                if (error >= ERROR_RF_PA_OVERCURRENT &&
- *                    error <= ERROR_POWER_SUPPLY) { Emergency_Stop(); }
- *              So overtemp (code 14) and watchdog timeout (code 16) fell
- *              through to attemptErrorRecovery()'s default branch (log and
- *              continue), leaving the 10 W GaN PAs biased at >75 °C.
- *
- * After fix:   The gate also matches ERROR_TEMPERATURE_HIGH and
- *              ERROR_WATCHDOG_TIMEOUT, so thermal and watchdog faults
- *              latch Emergency_Stop() exactly like PA overcurrent.
- *
- * Test strategy:
- *   Replicate the critical-error predicate and assert that every error
- *   enum value which threatens RF/power safety is accepted, and that the
- *   non-critical ones (comm, sensor, memory) are not.
- ******************************************************************************/
-#include <assert.h>
-#include <stdio.h>
-
-/* Mirror of SystemError_t from main.cpp (keep in lockstep). */
-typedef enum {
-    ERROR_NONE = 0,
-    ERROR_AD9523_CLOCK,
-    ERROR_ADF4382_TX_UNLOCK,
-    ERROR_ADF4382_RX_UNLOCK,
-    ERROR_ADAR1000_COMM,
-    ERROR_ADAR1000_TEMP,
-    ERROR_IMU_COMM,
-    ERROR_BMP180_COMM,
-    ERROR_GPS_COMM,
-    ERROR_RF_PA_OVERCURRENT,
-    ERROR_RF_PA_BIAS,
-    ERROR_STEPPER_MOTOR,
-    ERROR_FPGA_COMM,
-    ERROR_POWER_SUPPLY,
-    ERROR_TEMPERATURE_HIGH,
-    ERROR_MEMORY_ALLOC,
-    ERROR_WATCHDOG_TIMEOUT
-} SystemError_t;
-
-/* Extracted post-fix predicate: returns 1 when Emergency_Stop() must fire. */
-static int triggers_emergency_stop(SystemError_t e)
-{
-    return ((e >= ERROR_RF_PA_OVERCURRENT && e <= ERROR_POWER_SUPPLY) ||
-            e == ERROR_TEMPERATURE_HIGH ||
-            e == ERROR_WATCHDOG_TIMEOUT);
-}
-
-int main(void)
-{
-    printf("=== Safety fix: overtemp / watchdog -> Emergency_Stop() ===\n");
-
-    /* --- Errors that MUST latch Emergency_Stop --- */
-    printf("  Test 1: ERROR_RF_PA_OVERCURRENT triggers... ");
-    assert(triggers_emergency_stop(ERROR_RF_PA_OVERCURRENT));
-    printf("PASS\n");
-
-    printf("  Test 2: ERROR_RF_PA_BIAS triggers... ");
-    assert(triggers_emergency_stop(ERROR_RF_PA_BIAS));
-    printf("PASS\n");
-
-    printf("  Test 3: ERROR_STEPPER_MOTOR triggers... ");
-    assert(triggers_emergency_stop(ERROR_STEPPER_MOTOR));
-    printf("PASS\n");
-
-    printf("  Test 4: ERROR_FPGA_COMM triggers... ");
-    assert(triggers_emergency_stop(ERROR_FPGA_COMM));
-    printf("PASS\n");
-
-    printf("  Test 5: ERROR_POWER_SUPPLY triggers... ");
-    assert(triggers_emergency_stop(ERROR_POWER_SUPPLY));
-    printf("PASS\n");
-
-    printf("  Test 6: ERROR_TEMPERATURE_HIGH triggers (regression)... ");
-    assert(triggers_emergency_stop(ERROR_TEMPERATURE_HIGH));
-    printf("PASS\n");
-
-    printf("  Test 7: ERROR_WATCHDOG_TIMEOUT triggers (regression)... ");
-    assert(triggers_emergency_stop(ERROR_WATCHDOG_TIMEOUT));
-    printf("PASS\n");
-
-    /* --- Errors that MUST NOT escalate (recoverable / informational) --- */
-    printf("  Test 8: ERROR_NONE does not trigger... ");
-    assert(!triggers_emergency_stop(ERROR_NONE));
-    printf("PASS\n");
-
-    printf("  Test 9: ERROR_AD9523_CLOCK does not trigger... ");
-    assert(!triggers_emergency_stop(ERROR_AD9523_CLOCK));
-    printf("PASS\n");
-
-    printf("  Test 10: ERROR_ADF4382_TX_UNLOCK does not trigger (recoverable)... ");
-    assert(!triggers_emergency_stop(ERROR_ADF4382_TX_UNLOCK));
-    printf("PASS\n");
-
-    printf("  Test 11: ERROR_ADAR1000_COMM does not trigger... ");
-    assert(!triggers_emergency_stop(ERROR_ADAR1000_COMM));
-    printf("PASS\n");
-
-    printf("  Test 12: ERROR_IMU_COMM does not trigger... ");
-    assert(!triggers_emergency_stop(ERROR_IMU_COMM));
-    printf("PASS\n");
-
-    printf("  Test 13: ERROR_GPS_COMM does not trigger... ");
-    assert(!triggers_emergency_stop(ERROR_GPS_COMM));
-    printf("PASS\n");
-
-    printf("  Test 14: ERROR_MEMORY_ALLOC does not trigger... ");
-    assert(!triggers_emergency_stop(ERROR_MEMORY_ALLOC));
-    printf("PASS\n");
-
-    printf("\n=== Safety fix: ALL TESTS PASSED ===\n\n");
-    return 0;
-}

9_Firmware/9_2_FPGA/cfar_ca.v

@@ -16,9 +16,9 @@
  *
  *   Phase 2 (CFAR): After frame_complete pulse from Doppler processor,
  *     process each Doppler column independently:
- *     a) Read 512 magnitudes from BRAM for one Doppler bin (ST_COL_LOAD)
+ *     a) Read 64 magnitudes from BRAM for one Doppler bin (ST_COL_LOAD)
  *     b) Compute initial sliding window sums (ST_CFAR_INIT)
- *     c) Slide CUT through all 512 range bins:
+ *     c) Slide CUT through all 64 range bins:
  *        - 3 sub-cycles per CUT:
  *          ST_CFAR_THR: register noise_sum (mode select + cross-multiply)
  *          ST_CFAR_MUL: compute alpha * noise_sum_reg in DSP
@@ -47,23 +47,21 @@
  *   typically clutter).
  *
  * Timing:
- *   Phase 2 takes ~(514 + T + 3*512) * 32 ≈ 55000 cycles per frame @ 100 MHz
+ *   Phase 2 takes ~(66 + T + 3*64) * 32 ≈ 8500 cycles per frame @ 100 MHz
- *   = 0.55 ms. Frame period @ PRF=1932 Hz, 32 chirps = 16.6 ms. Fits easily.
+ *   = 85 µs. Frame period @ PRF=1932 Hz, 32 chirps = 16.6 ms. Fits easily.
  *   (3 cycles per CUT due to pipeline: THR → MUL → CMP)
  *
  * Resources:
- *   - 1 BRAM36K for magnitude buffer (16384 x 17 bits)
+ *   - 1 BRAM18K for magnitude buffer (2048 x 17 bits)
  *   - 1 DSP48 for alpha multiply
  *   - ~300 LUTs for FSM + sliding window + comparators
  *
  * Clock domain: clk (100 MHz, same as Doppler processor)
  */
 
-`include "radar_params.vh"
-
 module cfar_ca #(
-    parameter NUM_RANGE_BINS   = `RP_NUM_RANGE_BINS,    // 512
+    parameter NUM_RANGE_BINS   = 64,
-    parameter NUM_DOPPLER_BINS = `RP_NUM_DOPPLER_BINS,  // 32
+    parameter NUM_DOPPLER_BINS = 32,
     parameter MAG_WIDTH        = 17,
     parameter ALPHA_WIDTH      = 8,
     parameter MAX_GUARD        = 8,
@@ -76,7 +74,7 @@ module cfar_ca #(
     input wire [31:0] doppler_data,
     input wire        doppler_valid,
     input wire [4:0]  doppler_bin_in,
-    input wire [`RP_RANGE_BIN_BITS-1:0] range_bin_in,  // 9-bit
+    input wire [5:0]  range_bin_in,
     input wire        frame_complete,
 
     // ========== CONFIGURATION ==========
@@ -90,7 +88,7 @@ module cfar_ca #(
     // ========== DETECTION OUTPUTS ==========
     output reg        detect_flag,
     output reg        detect_valid,
-    output reg [`RP_RANGE_BIN_BITS-1:0] detect_range,  // 9-bit
+    output reg [5:0]  detect_range,
     output reg [4:0]  detect_doppler,
     output reg [MAG_WIDTH-1:0] detect_magnitude,
     output reg [MAG_WIDTH-1:0] detect_threshold,
@@ -105,11 +103,11 @@ module cfar_ca #(
 // INTERNAL PARAMETERS
 // ============================================================================
 localparam TOTAL_CELLS = NUM_RANGE_BINS * NUM_DOPPLER_BINS;
-localparam ADDR_WIDTH  = `RP_CFAR_MAG_ADDR_W;  // 14
+localparam ADDR_WIDTH  = 11;
 localparam COL_BITS    = 5;
-localparam ROW_BITS    = `RP_RANGE_BIN_BITS;    // 9
+localparam ROW_BITS    = 6;
-localparam SUM_WIDTH   = MAG_WIDTH + ROW_BITS;  // 26 bits: sum of up to 512 magnitudes
+localparam SUM_WIDTH   = MAG_WIDTH + 6;  // 23 bits: sum of up to 64 magnitudes
-localparam PROD_WIDTH  = SUM_WIDTH + ALPHA_WIDTH;  // 34 bits
+localparam PROD_WIDTH  = SUM_WIDTH + ALPHA_WIDTH;  // 31 bits
 localparam ALPHA_FRAC_BITS = 4;  // Q4.4
 
 // ============================================================================
@@ -138,7 +136,7 @@ wire [15:0] abs_q = dop_q[15] ? (~dop_q + 16'd1) : dop_q;
 wire [MAG_WIDTH-1:0] cur_mag = {1'b0, abs_i} + {1'b0, abs_q};
 
 // ============================================================================
-// MAGNITUDE BRAM (16384 x 17 bits)
+// MAGNITUDE BRAM (2048 x 17 bits)
 // ============================================================================
 reg                    mag_we;
 reg [ADDR_WIDTH-1:0]   mag_waddr;
@@ -155,7 +153,7 @@ always @(posedge clk) begin
 end
 
 // ============================================================================
-// COLUMN LINE BUFFER (512 x 17 bits — BRAM)
+// COLUMN LINE BUFFER (64 x 17 bits — distributed RAM)
 // ============================================================================
 reg [MAG_WIDTH-1:0] col_buf [0:NUM_RANGE_BINS-1];
 reg [ROW_BITS:0] col_load_idx;
@@ -208,31 +206,20 @@ wire lead_rem_valid = (lead_rem_idx >= 0) && (lead_rem_idx < NUM_RANGE_BINS);
 wire lag_rem_valid  = (lag_rem_idx  >= 0) && (lag_rem_idx  < NUM_RANGE_BINS);
 wire lag_add_valid  = (lag_add_idx  >= 0) && (lag_add_idx  < NUM_RANGE_BINS);
 
-// Safe col_buf read with bounds checking (combinational — feeds pipeline regs)
+// Safe col_buf read with bounds checking (combinational)
 wire [MAG_WIDTH-1:0] lead_add_val = lead_add_valid ? col_buf[lead_add_idx[ROW_BITS-1:0]] : {MAG_WIDTH{1'b0}};
 wire [MAG_WIDTH-1:0] lead_rem_val = lead_rem_valid ? col_buf[lead_rem_idx[ROW_BITS-1:0]] : {MAG_WIDTH{1'b0}};
 wire [MAG_WIDTH-1:0] lag_rem_val  = lag_rem_valid  ? col_buf[lag_rem_idx[ROW_BITS-1:0]]  : {MAG_WIDTH{1'b0}};
 wire [MAG_WIDTH-1:0] lag_add_val  = lag_add_valid  ? col_buf[lag_add_idx[ROW_BITS-1:0]]  : {MAG_WIDTH{1'b0}};
 
-// ============================================================================
+// Net deltas
-// PIPELINE REGISTERS: Break col_buf mux tree out of ST_CFAR_CMP critical path
+wire signed [SUM_WIDTH:0] lead_delta = (lead_add_valid ? $signed({1'b0, lead_add_val}) : 0)
-// ============================================================================
+                                      - (lead_rem_valid ? $signed({1'b0, lead_rem_val}) : 0);
-// Captured in ST_CFAR_THR (col_buf indices depend only on cut_idx/r_guard/r_train,
+wire signed [1:0] lead_cnt_delta = (lead_add_valid ? 1 : 0) - (lead_rem_valid ? 1 : 0);
-// all stable during THR). Used in ST_CFAR_CMP for delta/sum computation.
-// This removes ~6-8 logic levels (9-level mux tree) from the CMP critical path.
-reg [MAG_WIDTH-1:0] lead_add_val_r, lead_rem_val_r;
-reg [MAG_WIDTH-1:0] lag_rem_val_r,  lag_add_val_r;
-reg                 lead_add_valid_r, lead_rem_valid_r;
-reg                 lag_rem_valid_r,  lag_add_valid_r;
 
-// Net deltas (computed from registered col_buf values — combinational in CMP)
+wire signed [SUM_WIDTH:0] lag_delta = (lag_add_valid ? $signed({1'b0, lag_add_val}) : 0)
-wire signed [SUM_WIDTH:0] lead_delta = (lead_add_valid_r ? $signed({1'b0, lead_add_val_r}) : 0)
+                                     - (lag_rem_valid ? $signed({1'b0, lag_rem_val}) : 0);
-                                      - (lead_rem_valid_r ? $signed({1'b0, lead_rem_val_r}) : 0);
+wire signed [1:0] lag_cnt_delta = (lag_add_valid ? 1 : 0) - (lag_rem_valid ? 1 : 0);
-wire signed [1:0] lead_cnt_delta = (lead_add_valid_r ? 1 : 0) - (lead_rem_valid_r ? 1 : 0);
-
-wire signed [SUM_WIDTH:0] lag_delta = (lag_add_valid_r ? $signed({1'b0, lag_add_val_r}) : 0)
-                                     - (lag_rem_valid_r ? $signed({1'b0, lag_rem_val_r}) : 0);
-wire signed [1:0] lag_cnt_delta = (lag_add_valid_r ? 1 : 0) - (lag_rem_valid_r ? 1 : 0);
 
 // ============================================================================
 // NOISE ESTIMATE COMPUTATION (combinational for CFAR mode selection)
@@ -280,7 +267,7 @@ always @(posedge clk or negedge reset_n) begin
         state          <= ST_IDLE;
         detect_flag    <= 1'b0;
         detect_valid   <= 1'b0;
-        detect_range   <= {ROW_BITS{1'b0}};
+        detect_range   <= 6'd0;
         detect_doppler <= 5'd0;
         detect_magnitude <= {MAG_WIDTH{1'b0}};
         detect_threshold <= {MAG_WIDTH{1'b0}};
@@ -301,14 +288,6 @@ always @(posedge clk or negedge reset_n) begin
         noise_sum_reg  <= 0;
         noise_product  <= 0;
         adaptive_thr   <= 0;
-        lead_add_val_r <= 0;
-        lead_rem_val_r <= 0;
-        lag_rem_val_r  <= 0;
-        lag_add_val_r  <= 0;
-        lead_add_valid_r <= 0;
-        lead_rem_valid_r <= 0;
-        lag_rem_valid_r  <= 0;
-        lag_add_valid_r  <= 0;
         r_guard        <= 4'd2;
         r_train        <= 5'd8;
         r_alpha        <= 8'h30;
@@ -385,7 +364,7 @@ always @(posedge clk or negedge reset_n) begin
                 if (r_enable) begin
                     col_idx      <= 0;
                     col_load_idx <= 0;
-                    mag_raddr    <= {{ROW_BITS{1'b0}}, 5'd0};
+                    mag_raddr    <= {6'd0, 5'd0};
                     state        <= ST_COL_LOAD;
                 end else begin
                     state <= ST_DONE;
@@ -403,14 +382,14 @@ always @(posedge clk or negedge reset_n) begin
 
             if (col_load_idx == 0) begin
                 // First address already presented, advance to range=1
-                mag_raddr    <= {{{(ROW_BITS-1){1'b0}}, 1'b1}, col_idx};
+                mag_raddr    <= {6'd1, col_idx};
                 col_load_idx <= 1;
             end else if (col_load_idx <= NUM_RANGE_BINS) begin
                 // Capture previous read
                 col_buf[col_load_idx - 1] <= mag_rdata;
 
                 if (col_load_idx < NUM_RANGE_BINS) begin
-                    mag_raddr <= {col_load_idx[ROW_BITS-1:0] + {{(ROW_BITS-1){1'b0}}, 1'b1}, col_idx};
+                    mag_raddr <= {col_load_idx[ROW_BITS-1:0] + 6'd1, col_idx};
                 end
 
                 col_load_idx <= col_load_idx + 1;
@@ -462,19 +441,6 @@ always @(posedge clk or negedge reset_n) begin
             cfar_status <= {4'd4, 1'b0, col_idx[2:0]};
 
             noise_sum_reg <= noise_sum_comb;
-
-            // Pipeline: register col_buf reads for next CUT's window update.
-            // Indices depend only on cut_idx/r_guard/r_train (all stable here).
-            // Breaks the 9-level col_buf mux tree out of ST_CFAR_CMP.
-            lead_add_val_r   <= lead_add_val;
-            lead_rem_val_r   <= lead_rem_val;
-            lag_rem_val_r    <= lag_rem_val;
-            lag_add_val_r    <= lag_add_val;
-            lead_add_valid_r <= lead_add_valid;
-            lead_rem_valid_r <= lead_rem_valid;
-            lag_rem_valid_r  <= lag_rem_valid;
-            lag_add_valid_r  <= lag_add_valid;
-
             state <= ST_CFAR_MUL;
         end
 
@@ -547,7 +513,7 @@ always @(posedge clk or negedge reset_n) begin
             if (col_idx < NUM_DOPPLER_BINS - 1) begin
                 col_idx      <= col_idx + 1;
                 col_load_idx <= 0;
-                mag_raddr    <= {{ROW_BITS{1'b0}}, col_idx + 5'd1};
+                mag_raddr    <= {6'd0, col_idx + 5'd1};
                 state        <= ST_COL_LOAD;
             end else begin
                 state <= ST_DONE;

9_Firmware/9_2_FPGA/chirp_memory_loader_param.v

@@ -4,6 +4,10 @@ module chirp_memory_loader_param #(
     parameter LONG_Q_FILE_SEG0 = "long_chirp_seg0_q.mem",
     parameter LONG_I_FILE_SEG1 = "long_chirp_seg1_i.mem",
     parameter LONG_Q_FILE_SEG1 = "long_chirp_seg1_q.mem",
+    parameter LONG_I_FILE_SEG2 = "long_chirp_seg2_i.mem",
+    parameter LONG_Q_FILE_SEG2 = "long_chirp_seg2_q.mem",
+    parameter LONG_I_FILE_SEG3 = "long_chirp_seg3_i.mem",
+    parameter LONG_Q_FILE_SEG3 = "long_chirp_seg3_q.mem",
     parameter SHORT_I_FILE = "short_chirp_i.mem",
     parameter SHORT_Q_FILE = "short_chirp_q.mem",
     parameter DEBUG = 1
@@ -13,17 +17,17 @@ module chirp_memory_loader_param #(
     input wire [1:0] segment_select,
     input wire mem_request,
     input wire use_long_chirp,
-    input wire [10:0] sample_addr,
+    input wire [9:0] sample_addr,
     output reg [15:0] ref_i,
     output reg [15:0] ref_q,
     output reg mem_ready
 );
 
-// Memory declarations — 2 long segments × 2048 = 4096 samples
+// Memory declarations - now 4096 samples for 4 segments
 (* ram_style = "block" *) reg [15:0] long_chirp_i [0:4095];
 (* ram_style = "block" *) reg [15:0] long_chirp_q [0:4095];
-(* ram_style = "block" *) reg [15:0] short_chirp_i [0:2047];
+(* ram_style = "block" *) reg [15:0] short_chirp_i [0:1023];
-(* ram_style = "block" *) reg [15:0] short_chirp_q [0:2047];
+(* ram_style = "block" *) reg [15:0] short_chirp_q [0:1023];
 
 // Initialize memory
 integer i;
@@ -31,47 +35,66 @@ integer i;
 initial begin
     `ifdef SIMULATION
     if (DEBUG) begin
-        $display("[MEM] Starting memory initialization for 2 long chirp segments");
+        $display("[MEM] Starting memory initialization for 4 long chirp segments");
     end
     `endif
     
-    // === LOAD LONG CHIRP — 2 SEGMENTS ===
+    // === LOAD LONG CHIRP - 4 SEGMENTS ===
-    // Segment 0 (addresses 0-2047)
+    // Segment 0 (addresses 0-1023)
-    $readmemh(LONG_I_FILE_SEG0, long_chirp_i, 0, 2047);
+    $readmemh(LONG_I_FILE_SEG0, long_chirp_i, 0, 1023);
-    $readmemh(LONG_Q_FILE_SEG0, long_chirp_q, 0, 2047);
+    $readmemh(LONG_Q_FILE_SEG0, long_chirp_q, 0, 1023);
     `ifdef SIMULATION
-    if (DEBUG) $display("[MEM] Loaded long chirp segment 0 (0-2047)");
+    if (DEBUG) $display("[MEM] Loaded long chirp segment 0 (0-1023)");
     `endif
     
-    // Segment 1 (addresses 2048-4095)
+    // Segment 1 (addresses 1024-2047)
-    $readmemh(LONG_I_FILE_SEG1, long_chirp_i, 2048, 4095);
+    $readmemh(LONG_I_FILE_SEG1, long_chirp_i, 1024, 2047);
-    $readmemh(LONG_Q_FILE_SEG1, long_chirp_q, 2048, 4095);
+    $readmemh(LONG_Q_FILE_SEG1, long_chirp_q, 1024, 2047);
     `ifdef SIMULATION
-    if (DEBUG) $display("[MEM] Loaded long chirp segment 1 (2048-4095)");
+    if (DEBUG) $display("[MEM] Loaded long chirp segment 1 (1024-2047)");
+    `endif
+    
+    // Segment 2 (addresses 2048-3071)
+    $readmemh(LONG_I_FILE_SEG2, long_chirp_i, 2048, 3071);
+    $readmemh(LONG_Q_FILE_SEG2, long_chirp_q, 2048, 3071);
+    `ifdef SIMULATION
+    if (DEBUG) $display("[MEM] Loaded long chirp segment 2 (2048-3071)");
+    `endif
+    
+    // Segment 3 (addresses 3072-4095)
+    $readmemh(LONG_I_FILE_SEG3, long_chirp_i, 3072, 4095);
+    $readmemh(LONG_Q_FILE_SEG3, long_chirp_q, 3072, 4095);
+    `ifdef SIMULATION
+    if (DEBUG) $display("[MEM] Loaded long chirp segment 3 (3072-4095)");
     `endif
     
     // === LOAD SHORT CHIRP ===
-    // Load first 50 samples (0-49)
+    // Load first 50 samples (0-49). Explicit range prevents iverilog warning
+    // about insufficient words for the full [0:1023] array.
     $readmemh(SHORT_I_FILE, short_chirp_i, 0, 49);
     $readmemh(SHORT_Q_FILE, short_chirp_q, 0, 49);
     `ifdef SIMULATION
     if (DEBUG) $display("[MEM] Loaded short chirp (0-49)");
     `endif
     
-    // Zero pad remaining samples (50-2047)
+    // Zero pad remaining 974 samples (50-1023)
-    for (i = 50; i < 2048; i = i + 1) begin
+    for (i = 50; i < 1024; i = i + 1) begin
         short_chirp_i[i] = 16'h0000;
         short_chirp_q[i] = 16'h0000;
     end
     `ifdef SIMULATION
-    if (DEBUG) $display("[MEM] Zero-padded short chirp from 50-2047");
+    if (DEBUG) $display("[MEM] Zero-padded short chirp from 50-1023");
     
     // === VERIFICATION ===
     if (DEBUG) begin
         $display("[MEM] Memory loading complete. Verification samples:");
         $display("  Long[0]:     I=%h Q=%h", long_chirp_i[0], long_chirp_q[0]);
+        $display("  Long[1023]:  I=%h Q=%h", long_chirp_i[1023], long_chirp_q[1023]);
+        $display("  Long[1024]:  I=%h Q=%h", long_chirp_i[1024], long_chirp_q[1024]);
         $display("  Long[2047]:  I=%h Q=%h", long_chirp_i[2047], long_chirp_q[2047]);
         $display("  Long[2048]:  I=%h Q=%h", long_chirp_i[2048], long_chirp_q[2048]);
+        $display("  Long[3071]:  I=%h Q=%h", long_chirp_i[3071], long_chirp_q[3071]);
+        $display("  Long[3072]:  I=%h Q=%h", long_chirp_i[3072], long_chirp_q[3072]);
         $display("  Long[4095]:  I=%h Q=%h", long_chirp_i[4095], long_chirp_q[4095]);
         $display("  Short[0]:    I=%h Q=%h", short_chirp_i[0], short_chirp_q[0]);
         $display("  Short[49]:   I=%h Q=%h", short_chirp_i[49], short_chirp_q[49]);
@@ -81,8 +104,8 @@ initial begin
 end
 
 // Memory access logic
-// long_addr: segment_select[0] selects segment (0 or 1), sample_addr[10:0] selects within
+// long_addr is combinational — segment_select[1:0] concatenated with sample_addr[9:0]
-wire [11:0] long_addr = {segment_select[0], sample_addr};
+wire [11:0] long_addr = {segment_select, sample_addr};
 
 // ---- BRAM read block (sync-only, sync reset) ----
 // REQP-1839/1840 fix: BRAM output registers cannot have async resets.
@@ -105,7 +128,7 @@ always @(posedge clk) begin
             end
             `endif
         end else begin
-            // Short chirp (0-2047)
+            // Short chirp (0-1023)
             ref_i <= short_chirp_i[sample_addr];
             ref_q <= short_chirp_q[sample_addr];
             

9_Firmware/9_2_FPGA/cic_decimator_4x_enhanced.v

@@ -1,7 +1,6 @@
 module cic_decimator_4x_enhanced (
     input wire clk,                 // 400MHz input clock
     input wire reset_n,
-    input wire reset_h,             // Pre-registered active-high reset from parent (avoids LUT1 inverter)
     input wire signed [17:0] data_in,  // 18-bit input
     input wire data_valid,
     output reg signed [17:0] data_out, // 18-bit output
@@ -33,15 +32,11 @@ localparam COMB_WIDTH = 28;
 // adjacent DSP48E1 tiles — zero fabric delay, guaranteed to meet 400+ MHz
 // on 7-series regardless of speed grade.
 //
-// Active-high reset provided by parent module (pre-registered).
+// Active-high reset derived from reset_n (inverted).
 // CEP (clock enable for P register) gated by data_valid.
 // ============================================================================
 
-// reset_h is now an input port from parent module (pre-registered active-high).
+wire reset_h = ~reset_n;  // active-high reset for DSP48E1 RSTP
-// Previously: wire reset_h = ~reset_n; — this LUT1 inverter + long routing to
-// 8 DSP48E1 RSTB pins was the root cause of 400 MHz timing failure (WNS=-0.074ns).
-// The parent ddc_400m.v already has a registered reset_400m derived from
-// the 2-stage sync reset, so we use that directly.
 
 // Sign-extended input for integrator_0 C port (48-bit)
 wire [ACC_WIDTH-1:0] data_in_c = {{(ACC_WIDTH-18){data_in[17]}}, data_in};
@@ -707,7 +702,7 @@ end
 // Sync reset: enables FDRE inference for better timing at 400 MHz.
 // Reset is already synchronous to clk via reset synchronizer in parent module.
 always @(posedge clk) begin
-    if (reset_h) begin
+    if (!reset_n) begin
         integrator_sampled <= 0;
         decimation_counter <= 0;
         data_valid_delayed <= 0;
@@ -762,7 +757,7 @@ end
 // Pipeline the valid signal for comb section
 // Sync reset: matches decimation control block reset style.
 always @(posedge clk) begin
-    if (reset_h) begin
+    if (!reset_n) begin
         data_valid_comb <= 0;
         data_valid_comb_pipe <= 0;
         data_valid_comb_0_out <= 0;
@@ -797,7 +792,7 @@ end
 //   - Each stage: comb[i] = comb[i-1] - comb_delay[i][last]
 
 always @(posedge clk) begin
-    if (reset_h) begin
+    if (!reset_n) begin
         for (i = 0; i < STAGES; i = i + 1) begin
             comb[i] <= 0;
             for (j = 0; j < COMB_DELAY; j = j + 1) begin

9_Firmware/9_2_FPGA/ddc_400m.v

@@ -566,7 +566,6 @@ wire cic_valid_i, cic_valid_q;
 cic_decimator_4x_enhanced cic_i_inst (
     .clk(clk_400m),
     .reset_n(reset_n_400m),
-    .reset_h(reset_400m),
     .data_in(mixed_i[33:16]),
     .data_valid(mixed_valid),
     .data_out(cic_i_out),
@@ -576,7 +575,6 @@ cic_decimator_4x_enhanced cic_i_inst (
 cic_decimator_4x_enhanced cic_q_inst (
     .clk(clk_400m),
     .reset_n(reset_n_400m),
-    .reset_h(reset_400m),
     .data_in(mixed_q[33:16]),
     .data_valid(mixed_valid),
     .data_out(cic_q_out),

9_Firmware/9_2_FPGA/doppler_processor.v

@@ -32,15 +32,13 @@
 //     w[n] = 0.54 - 0.46 * cos(2*pi*n/15), n=0..15
 // ============================================================================
 
-`include "radar_params.vh"
-
 module doppler_processor_optimized #(
-    parameter DOPPLER_FFT_SIZE   = `RP_DOPPLER_FFT_SIZE,    // 16
+    parameter DOPPLER_FFT_SIZE   = 16,     // FFT size per sub-frame (was 32)
-    parameter RANGE_BINS         = `RP_NUM_RANGE_BINS,      // 512
+    parameter RANGE_BINS         = 64,
-    parameter CHIRPS_PER_FRAME   = `RP_CHIRPS_PER_FRAME,    // 32
+    parameter CHIRPS_PER_FRAME   = 32,     // Total chirps in frame (16+16)
-    parameter CHIRPS_PER_SUBFRAME = `RP_CHIRPS_PER_SUBFRAME, // 16
+    parameter CHIRPS_PER_SUBFRAME = 16,    // Chirps per sub-frame
     parameter WINDOW_TYPE        = 0,      // 0=Hamming, 1=Rectangular
-    parameter DATA_WIDTH         = `RP_DATA_WIDTH           // 16
+    parameter DATA_WIDTH         = 16
 )(
     input wire clk,
     input wire reset_n,
@@ -50,7 +48,7 @@ module doppler_processor_optimized #(
     output reg [31:0] doppler_output,
     output reg doppler_valid,
     output reg [4:0] doppler_bin,      // {sub_frame, bin[3:0]}
-    output reg [`RP_RANGE_BIN_BITS-1:0] range_bin,  // 9-bit
+    output reg [5:0] range_bin,
     output reg sub_frame,              // 0=long PRI, 1=short PRI
     output wire processing_active,
     output wire frame_complete,
@@ -59,16 +57,16 @@ module doppler_processor_optimized #(
 `ifdef FORMAL
     ,
     output wire [2:0]  fv_state,
-    output wire [`RP_DOPPLER_MEM_ADDR_W-1:0] fv_mem_write_addr,
+    output wire [10:0] fv_mem_write_addr,
-    output wire [`RP_DOPPLER_MEM_ADDR_W-1:0] fv_mem_read_addr,
+    output wire [10:0] fv_mem_read_addr,
-    output wire [`RP_RANGE_BIN_BITS-1:0]     fv_write_range_bin,
+    output wire [5:0]  fv_write_range_bin,
     output wire [4:0]  fv_write_chirp_index,
-    output wire [`RP_RANGE_BIN_BITS-1:0]     fv_read_range_bin,
+    output wire [5:0]  fv_read_range_bin,
     output wire [4:0]  fv_read_doppler_index,
     output wire [9:0]  fv_processing_timeout,
     output wire        fv_frame_buffer_full,
     output wire        fv_mem_we,
-    output wire [`RP_DOPPLER_MEM_ADDR_W-1:0] fv_mem_waddr_r
+    output wire [10:0] fv_mem_waddr_r
 `endif
 );
 
@@ -117,9 +115,9 @@ localparam MEM_DEPTH = RANGE_BINS * CHIRPS_PER_FRAME;
 // ==============================================
 // Control Registers
 // ==============================================
-reg [`RP_RANGE_BIN_BITS-1:0] write_range_bin;
+reg [5:0] write_range_bin;
 reg [4:0] write_chirp_index;
-reg [`RP_RANGE_BIN_BITS-1:0] read_range_bin;
+reg [5:0] read_range_bin;
 reg [4:0] read_doppler_index;
 reg frame_buffer_full;
 reg [9:0] chirps_received;
@@ -149,8 +147,8 @@ wire fft_output_last;
 // ==============================================
 // Addressing
 // ==============================================
-wire [`RP_DOPPLER_MEM_ADDR_W-1:0] mem_write_addr;
+wire [10:0] mem_write_addr;
-wire [`RP_DOPPLER_MEM_ADDR_W-1:0] mem_read_addr;
+wire [10:0] mem_read_addr;
 
 assign mem_write_addr = (write_chirp_index * RANGE_BINS) + write_range_bin;
 assign mem_read_addr = (read_doppler_index * RANGE_BINS) + read_range_bin;
@@ -182,7 +180,7 @@ reg [9:0] processing_timeout;
 
 // Memory write enable and data signals
 reg mem_we;
-reg [`RP_DOPPLER_MEM_ADDR_W-1:0] mem_waddr_r;
+reg [10:0] mem_waddr_r;
 reg [DATA_WIDTH-1:0] mem_wdata_i, mem_wdata_q;
 
 // Memory read data
@@ -533,11 +531,6 @@ xfft_16 fft_inst (
 // Status Outputs
 // ==============================================
 assign processing_active = (state != S_IDLE);
-// NOTE: frame_complete is a LEVEL, not a pulse. It is high whenever the
-// doppler processor is idle with no buffered frame. radar_receiver_final.v
-// converts this to a single-cycle rising-edge pulse before routing to
-// downstream consumers (USB FT2232H, AGC, CFAR). Do NOT connect this
-// level output directly to modules that expect a pulse.
 assign frame_complete = (state == S_IDLE && frame_buffer_full == 0);
 
 endmodule

9_Firmware/9_2_FPGA/fft_engine.v

@@ -28,16 +28,13 @@
  * Clock domain: single clock (clk), active-low async reset (reset_n).
  */
 
-// Include single source of truth for default parameters
-`include "radar_params.vh"
-
 module fft_engine #(
-    parameter N            = `RP_FFT_SIZE,       // 2048
+    parameter N            = 1024,
-    parameter LOG2N        = `RP_LOG2_FFT_SIZE,  // 11
+    parameter LOG2N        = 10,
     parameter DATA_W       = 16,
     parameter INTERNAL_W   = 32,
     parameter TWIDDLE_W    = 16,
-    parameter TWIDDLE_FILE = "fft_twiddle_2048.mem"
+    parameter TWIDDLE_FILE = "fft_twiddle_1024.mem"
 )(
     input wire clk,
     input wire reset_n,

9_Firmware/9_2_FPGA/fft_twiddle_2048.mem

@@ -1,515 +0,0 @@
-// Quarter-wave cosine ROM for 2048-point FFT
-// 512 entries, 16-bit signed Q15 ($readmemh format)
-// cos(2*pi*k/2048) for k = 0..511
-7FFF
-7FFF
-7FFE
-7FFE
-7FFD
-7FFB
-7FF9
-7FF7
-7FF5
-7FF3
-7FF0
-7FEC
-7FE9
-7FE5
-7FE1
-7FDC
-7FD8
-7FD2
-7FCD
-7FC7
-7FC1
-7FBB
-7FB4
-7FAD
-7FA6
-7F9F
-7F97
-7F8F
-7F86
-7F7D
-7F74
-7F6B
-7F61
-7F57
-7F4D
-7F42
-7F37
-7F2C
-7F21
-7F15
-7F09
-7EFC
-7EEF
-7EE2
-7ED5
-7EC7
-7EB9
-7EAB
-7E9C
-7E8D
-7E7E
-7E6F
-7E5F
-7E4F
-7E3E
-7E2E
-7E1D
-7E0B
-7DFA
-7DE8
-7DD5
-7DC3
-7DB0
-7D9D
-7D89
-7D76
-7D62
-7D4D
-7D39
-7D24
-7D0E
-7CF9
-7CE3
-7CCD
-7CB6
-7C9F
-7C88
-7C71
-7C59
-7C41
-7C29
-7C10
-7BF8
-7BDE
-7BC5
-7BAB
-7B91
-7B77
-7B5C
-7B41
-7B26
-7B0A
-7AEE
-7AD2
-7AB6
-7A99
-7A7C
-7A5F
-7A41
-7A23
-7A05
-79E6
-79C8
-79A9
-7989
-796A
-794A
-7929
-7909
-78E8
-78C7
-78A5
-7884
-7862
-783F
-781D
-77FA
-77D7
-77B3
-778F
-776B
-7747
-7722
-76FE
-76D8
-76B3
-768D
-7667
-7641
-761A
-75F3
-75CC
-75A5
-757D
-7555
-752D
-7504
-74DB
-74B2
-7488
-745F
-7435
-740A
-73E0
-73B5
-738A
-735E
-7333
-7307
-72DB
-72AE
-7281
-7254
-7227
-71F9
-71CB
-719D
-716F
-7140
-7111
-70E2
-70B2
-7083
-7053
-7022
-6FF2
-6FC1
-6F90
-6F5E
-6F2C
-6EFB
-6EC8
-6E96
-6E63
-6E30
-6DFD
-6DC9
-6D95
-6D61
-6D2D
-6CF8
-6CC3
-6C8E
-6C59
-6C23
-6BED
-6BB7
-6B81
-6B4A
-6B13
-6ADC
-6AA4
-6A6D
-6A35
-69FD
-69C4
-698B
-6952
-6919
-68E0
-68A6
-686C
-6832
-67F7
-67BC
-6781
-6746
-670A
-66CF
-6693
-6656
-661A
-65DD
-65A0
-6563
-6525
-64E8
-64AA
-646C
-642D
-63EE
-63AF
-6370
-6331
-62F1
-62B1
-6271
-6231
-61F0
-61AF
-616E
-612D
-60EB
-60AA
-6068
-6025
-5FE3
-5FA0
-5F5D
-5F1A
-5ED7
-5E93
-5E4F
-5E0B
-5DC7
-5D82
-5D3E
-5CF9
-5CB3
-5C6E
-5C28
-5BE2
-5B9C
-5B56
-5B0F
-5AC9
-5A82
-5A3B
-59F3
-59AC
-5964
-591C
-58D3
-588B
-5842
-57F9
-57B0
-5767
-571D
-56D3
-568A
-563F
-55F5
-55AA
-5560
-5515
-54C9
-547E
-5432
-53E7
-539B
-534E
-5302
-52B5
-5268
-521B
-51CE
-5181
-5133
-50E5
-5097
-5049
-4FFB
-4FAC
-4F5D
-4F0E
-4EBF
-4E70
-4E20
-4DD1
-4D81
-4D31
-4CE0
-4C90
-4C3F
-4BEE
-4B9D
-4B4C
-4AFB
-4AA9
-4A58
-4A06
-49B4
-4961
-490F
-48BC
-4869
-4816
-47C3
-4770
-471C
-46C9
-4675
-4621
-45CD
-4578
-4524
-44CF
-447A
-4425
-43D0
-437B
-4325
-42D0
-427A
-4224
-41CE
-4177
-4121
-40CA
-4073
-401D
-3FC5
-3F6E
-3F17
-3EBF
-3E68
-3E10
-3DB8
-3D60
-3D07
-3CAF
-3C56
-3BFE
-3BA5
-3B4C
-3AF2
-3A99
-3A40
-39E6
-398C
-3933
-38D9
-387E
-3824
-37CA
-376F
-3715
-36BA
-365F
-3604
-35A8
-354D
-34F2
-3496
-343A
-33DF
-3383
-3326
-32CA
-326E
-3211
-31B5
-3158
-30FB
-309E
-3041
-2FE4
-2F87
-2F2A
-2ECC
-2E6E
-2E11
-2DB3
-2D55
-2CF7
-2C99
-2C3A
-2BDC
-2B7D
-2B1F
-2AC0
-2A61
-2A02
-29A3
-2944
-28E5
-2886
-2826
-27C7
-2767
-2708
-26A8
-2648
-25E8
-2588
-2528
-24C8
-2467
-2407
-23A6
-2346
-22E5
-2284
-2223
-21C2
-2161
-2100
-209F
-203E
-1FDD
-1F7B
-1F1A
-1EB8
-1E57
-1DF5
-1D93
-1D31
-1CCF
-1C6D
-1C0B
-1BA9
-1B47
-1AE5
-1A82
-1A20
-19BE
-195B
-18F9
-1896
-1833
-17D0
-176E
-170B
-16A8
-1645
-15E2
-157F
-151C
-14B9
-1455
-13F2
-138F
-132B
-12C8
-1264
-1201
-119D
-113A
-10D6
-1072
-100F
-0FAB
-0F47
-0EE3
-0E80
-0E1C
-0DB8
-0D54
-0CF0
-0C8C
-0C28
-0BC4
-0B5F
-0AFB
-0A97
-0A33
-09CF
-096A
-0906
-08A2
-083E
-07D9
-0775
-0711
-06AC
-0648
-05E3
-057F
-051B
-04B6
-0452
-03ED
-0389
-0324
-02C0
-025B
-01F7
-0192
-012E
-00C9
-0065

9_Firmware/9_2_FPGA/matched_filter_multi_segment.v

@@ -1,8 +1,5 @@
 `timescale 1ns / 1ps
 // matched_filter_multi_segment.v
-
-`include "radar_params.vh"
-
 module matched_filter_multi_segment (
     input wire clk,           // 100MHz
     input wire reset_n,
@@ -27,7 +24,7 @@ module matched_filter_multi_segment (
     
     // Memory system interface
     output reg [1:0] segment_request,
-    output wire [10:0] sample_addr_out,  // Tell memory which sample we need (11-bit for 2048)
+    output wire [9:0] sample_addr_out,  // Tell memory which sample we need
     output reg mem_request,
     input wire mem_ready,
     
@@ -41,18 +38,18 @@ module matched_filter_multi_segment (
 );
 
 // ========== FIXED PARAMETERS ==========
-parameter BUFFER_SIZE = `RP_FFT_SIZE;              // 2048
+parameter BUFFER_SIZE = 1024;
 parameter LONG_CHIRP_SAMPLES = 3000;  // Still 3000 samples total
-parameter SHORT_CHIRP_SAMPLES = 50;                // 0.5 us @ 100MHz
+parameter SHORT_CHIRP_SAMPLES = 50;   // 0.5�s @ 100MHz
-parameter OVERLAP_SAMPLES = `RP_OVERLAP_SAMPLES;   // 128
+parameter OVERLAP_SAMPLES = 128;      // Standard for 1024-pt FFT
-parameter SEGMENT_ADVANCE = `RP_SEGMENT_ADVANCE;   // 2048 - 128 = 1920 samples
+parameter SEGMENT_ADVANCE = BUFFER_SIZE - OVERLAP_SAMPLES;  // 896 samples
 parameter DEBUG = 1;                  // Debug output control
 
 // Calculate segments needed with overlap
-// For 3000 samples with 128 overlap:
+// For 3072 samples with 128 overlap: 
-// Segments = ceil((3000 - 2048) / 1920) + 1 = ceil(952/1920) + 1 = 2
+// Segments = ceil((3072 - 128) / 896) = ceil(2944/896) = 4
-parameter LONG_SEGMENTS = `RP_LONG_SEGMENTS_3KM;   // 2 segments
+parameter LONG_SEGMENTS = 4;          // Now exactly 4 segments!
-parameter SHORT_SEGMENTS = 1;                      // 50 samples padded to 2048
+parameter SHORT_SEGMENTS = 1;         // 50 samples padded to 1024
 
 // ========== FIXED INTERNAL SIGNALS ==========
 reg signed [31:0] pc_i, pc_q;
@@ -61,19 +58,19 @@ reg pc_valid;
 // Dual buffer for overlap-save — BRAM inferred for synthesis
 (* ram_style = "block" *) reg signed [15:0] input_buffer_i [0:BUFFER_SIZE-1];
 (* ram_style = "block" *) reg signed [15:0] input_buffer_q [0:BUFFER_SIZE-1];
-reg [11:0] buffer_write_ptr;    // 12-bit for 0..2048
+reg [10:0] buffer_write_ptr;
-reg [11:0] buffer_read_ptr;     // 12-bit for 0..2048
+reg [10:0] buffer_read_ptr;
 reg buffer_has_data;
 reg buffer_processing;
 reg [15:0] chirp_samples_collected;
 
 // BRAM write port signals
 reg        buf_we;
-reg [10:0] buf_waddr;           // 11-bit for 0..2047
+reg [9:0]  buf_waddr;
 reg signed [15:0] buf_wdata_i, buf_wdata_q;
 
 // BRAM read port signals
-reg [10:0] buf_raddr;           // 11-bit for 0..2047
+reg [9:0]  buf_raddr;
 reg signed [15:0] buf_rdata_i, buf_rdata_q;
 
 // State machine
@@ -96,22 +93,15 @@ reg chirp_complete;
 reg saw_chain_output;             // Flag: chain started producing output
 
 // Overlap cache — captured during ST_PROCESSING, written back in ST_OVERLAP_COPY
-// Uses sync-only write block to allow distributed RAM inference (not FFs).
-// 128 entries = distributed RAM (LUTRAM), NOT BRAM (too shallow).
 reg signed [15:0] overlap_cache_i [0:OVERLAP_SAMPLES-1];
 reg signed [15:0] overlap_cache_q [0:OVERLAP_SAMPLES-1];
 reg [7:0] overlap_copy_count;
 
-// Overlap cache write port signals (driven from FSM, used in sync-only block)
-reg        ov_we;
-reg [6:0]  ov_waddr;
-reg signed [15:0] ov_wdata_i, ov_wdata_q;
-
 // Microcontroller sync detection
 reg mc_new_chirp_prev, mc_new_elevation_prev, mc_new_azimuth_prev;
-wire chirp_start_pulse = mc_new_chirp ^ mc_new_chirp_prev;           // Toggle-to-pulse (any edge)
+wire chirp_start_pulse = mc_new_chirp && !mc_new_chirp_prev;
-wire elevation_change_pulse = mc_new_elevation ^ mc_new_elevation_prev; // Toggle-to-pulse
+wire elevation_change_pulse = mc_new_elevation && !mc_new_elevation_prev;
-wire azimuth_change_pulse = mc_new_azimuth ^ mc_new_azimuth_prev;     // Toggle-to-pulse
+wire azimuth_change_pulse = mc_new_azimuth && !mc_new_azimuth_prev;
 
 // Processing chain signals
 wire [15:0] fft_pc_i, fft_pc_q;
@@ -124,7 +114,7 @@ reg fft_input_valid;
 reg fft_start;
 
 // ========== SAMPLE ADDRESS OUTPUT ==========
-assign sample_addr_out = buffer_read_ptr[10:0];
+assign sample_addr_out = buffer_read_ptr;
 
 // ========== MICROCONTROLLER SYNC ==========
 always @(posedge clk or negedge reset_n) begin
@@ -161,16 +151,6 @@ always @(posedge clk) begin
     end
 end
 
-// ========== OVERLAP CACHE WRITE PORT (sync only — distributed RAM inference) ==========
-// Removing async reset from memory write path prevents Vivado from
-// synthesizing the 128x16 arrays as FFs + mux trees.
-always @(posedge clk) begin
-    if (ov_we) begin
-        overlap_cache_i[ov_waddr] <= ov_wdata_i;
-        overlap_cache_q[ov_waddr] <= ov_wdata_q;
-    end
-end
-
 // ========== BRAM READ PORT (synchronous, no async reset) ==========
 always @(posedge clk) begin
     buf_rdata_i <= input_buffer_i[buf_raddr];
@@ -202,17 +182,12 @@ always @(posedge clk or negedge reset_n) begin
         buf_wdata_i <= 0;
         buf_wdata_q <= 0;
         buf_raddr <= 0;
-        ov_we <= 0;
-        ov_waddr <= 0;
-        ov_wdata_i <= 0;
-        ov_wdata_q <= 0;
         overlap_copy_count <= 0;
     end else begin
         pc_valid <= 0;
         mem_request <= 0;
         fft_input_valid <= 0;
         buf_we <= 0;  // Default: no write
-        ov_we <= 0;   // Default: no overlap write
         
         case (state)
             ST_IDLE: begin
@@ -247,7 +222,7 @@ always @(posedge clk or negedge reset_n) begin
                 if (ddc_valid && buffer_write_ptr < BUFFER_SIZE) begin
                     // Store in buffer via BRAM write port
                     buf_we <= 1;
-                    buf_waddr <= buffer_write_ptr[10:0];
+                    buf_waddr <= buffer_write_ptr[9:0];
                     buf_wdata_i <= ddc_i[17:2] + ddc_i[1];
                     buf_wdata_q <= ddc_q[17:2] + ddc_q[1];
                     
@@ -282,8 +257,8 @@ always @(posedge clk or negedge reset_n) begin
                 // missing the transition when buffer_write_ptr updates via
                 // non-blocking assignment one cycle after the last write.
                 //
-                // Overlap-save fix: fill the FULL FFT_SIZE-sample buffer before
+                // Overlap-save fix: fill the FULL 1024-sample buffer before
-                // processing.  For segment 0 this means FFT_SIZE fresh samples.
+                // processing.  For segment 0 this means 1024 fresh samples.
                 // For segments 1+, write_ptr starts at OVERLAP_SAMPLES (128)
                 // so we collect 896 new samples to fill the buffer.
                 if (use_long_chirp) begin
@@ -320,7 +295,7 @@ always @(posedge clk or negedge reset_n) begin
             ST_ZERO_PAD: begin
                 // Zero-pad remaining buffer via BRAM write port
                 buf_we <= 1;
-                buf_waddr <= buffer_write_ptr[10:0];
+                buf_waddr <= buffer_write_ptr[9:0];
                 buf_wdata_i <= 16'd0;
                 buf_wdata_q <= 16'd0;
                 buffer_write_ptr <= buffer_write_ptr + 1;
@@ -340,7 +315,7 @@ always @(posedge clk or negedge reset_n) begin
             
             ST_WAIT_REF: begin
                 // Wait for memory to provide reference coefficients
-                buf_raddr <= 11'd0;  // Pre-present addr 0 so buf_rdata is ready next cycle
+                buf_raddr <= 10'd0;  // Pre-present addr 0 so buf_rdata is ready next cycle
                 if (mem_ready) begin
                     // Start processing — buf_rdata[0] will be valid on FIRST clock of ST_PROCESSING
                     buffer_processing <= 1;
@@ -369,12 +344,10 @@ always @(posedge clk or negedge reset_n) begin
                     // 2. Request corresponding reference sample
                     mem_request <= 1'b1;
                     
-                    // 3. Cache tail samples for overlap-save (via sync-only write port)
+                    // 3. Cache tail samples for overlap-save
                     if (buffer_read_ptr >= SEGMENT_ADVANCE) begin
-                        ov_we <= 1;
+                        overlap_cache_i[buffer_read_ptr - SEGMENT_ADVANCE] <= buf_rdata_i;
-                        ov_waddr <= buffer_read_ptr - SEGMENT_ADVANCE;  // 0..OVERLAP-1
+                        overlap_cache_q[buffer_read_ptr - SEGMENT_ADVANCE] <= buf_rdata_q;
-                        ov_wdata_i <= buf_rdata_i;
-                        ov_wdata_q <= buf_rdata_q;
                     end
                     
                     // Debug every 100 samples
@@ -388,7 +361,7 @@ always @(posedge clk or negedge reset_n) begin
                     end
                     
                     // Present NEXT read address (for next cycle)
-                    buf_raddr <= buffer_read_ptr[10:0] + 11'd1;
+                    buf_raddr <= buffer_read_ptr[9:0] + 10'd1;
                     buffer_read_ptr <= buffer_read_ptr + 1;
                     
                 end else if (buffer_read_ptr >= BUFFER_SIZE) begin
@@ -409,7 +382,7 @@ always @(posedge clk or negedge reset_n) begin
             
             ST_WAIT_FFT: begin
                 // Wait for the processing chain to complete ALL outputs.
-                // The chain streams FFT_SIZE samples (fft_pc_valid=1 for FFT_SIZE clocks),
+                // The chain streams 1024 samples (fft_pc_valid=1 for 1024 clocks),
                 // then transitions to ST_DONE (9) -> ST_IDLE (0).
                 // We track when output starts (saw_chain_output) and only
                 // proceed once the chain returns to idle after outputting.
@@ -481,7 +454,7 @@ always @(posedge clk or negedge reset_n) begin
             ST_OVERLAP_COPY: begin
                 // Write one cached overlap sample per cycle to BRAM
                 buf_we <= 1;
-                buf_waddr <= {{3{1'b0}}, overlap_copy_count};
+                buf_waddr <= {{2{1'b0}}, overlap_copy_count};
                 buf_wdata_i <= overlap_cache_i[overlap_copy_count];
                 buf_wdata_q <= overlap_cache_q[overlap_copy_count];
                 

9_Firmware/9_2_FPGA/matched_filter_processing_chain.v

@@ -21,22 +21,20 @@
  *
  * Clock domain: clk (100 MHz system clock)
  * Data format:  16-bit signed (Q15 fixed-point)
- * FFT size:     2048 points (parameterized via radar_params.vh)
+ * FFT size:     1024 points
  *
  * Pipeline states:
- *   IDLE -> FWD_FFT (collect 2048 samples + bit-reverse copy)
+ *   IDLE -> FWD_FFT (collect 1024 samples + bit-reverse copy)
  *        -> FWD_BUTTERFLY (forward FFT of signal)
  *        -> REF_BITREV (bit-reverse copy reference into work arrays)
  *        -> REF_BUTTERFLY (forward FFT of reference)
  *        -> MULTIPLY (conjugate multiply in freq domain)
  *        -> INV_BITREV (bit-reverse copy product)
  *        -> INV_BUTTERFLY (inverse FFT + 1/N scaling)
- *        -> OUTPUT (stream 2048 samples)
+ *        -> OUTPUT (stream 1024 samples)
  *        -> DONE -> IDLE
  */
 
-`include "radar_params.vh"
-
 module matched_filter_processing_chain (
     input wire clk,
     input wire reset_n,
@@ -68,8 +66,8 @@ module matched_filter_processing_chain (
 // ============================================================================
 // PARAMETERS
 // ============================================================================
-localparam FFT_SIZE   = `RP_FFT_SIZE;    // 2048
+localparam FFT_SIZE   = 1024;
-localparam ADDR_BITS  = `RP_LOG2_FFT_SIZE; // log2(2048) = 11
+localparam ADDR_BITS  = 10;    // log2(1024)
 
 // State encoding (4-bit, up to 16 states)
 localparam [3:0] ST_IDLE           = 4'd0;
@@ -89,8 +87,8 @@ reg [3:0] state;
 // SIGNAL BUFFERS
 // ============================================================================
 // Input sample counter
-reg [ADDR_BITS:0] fwd_in_count;     // 0..FFT_SIZE
+reg [ADDR_BITS:0] fwd_in_count;     // 0..1024
-reg fwd_frame_done;                  // All FFT_SIZE samples received
+reg fwd_frame_done;                  // All 1024 samples received
 
 // Signal time-domain buffer
 reg signed [15:0] fwd_buf_i [0:FFT_SIZE-1];
@@ -177,7 +175,7 @@ always @(posedge clk or negedge reset_n) begin
 
         case (state)
         // ================================================================
-        // IDLE: Wait for valid ADC data, start collecting 2048 samples
+        // IDLE: Wait for valid ADC data, start collecting 1024 samples
         // ================================================================
         ST_IDLE: begin
             fwd_in_count   <= 0;
@@ -200,7 +198,6 @@ always @(posedge clk or negedge reset_n) begin
 
         // ================================================================
         // FWD_FFT: Collect remaining samples, then bit-reverse copy signal
-        // (2048 samples total)
         // ================================================================
         ST_FWD_FFT: begin
             if (!fwd_frame_done) begin
@@ -440,7 +437,7 @@ always @(posedge clk or negedge reset_n) begin
                 end
             end
 
-            // Scale by 1/N (right shift by log2(2048) = 11) and store
+            // Scale by 1/N (right shift by log2(1024) = 10) and store
             for (i = 0; i < FFT_SIZE; i = i + 1) begin : ifft_scale
                 reg signed [31:0] scaled_re, scaled_im;
                 scaled_re = work_re[i] >>> ADDR_BITS;
@@ -470,7 +467,7 @@ always @(posedge clk or negedge reset_n) begin
         end
 
         // ================================================================
-        // OUTPUT: Stream out 2048 range profile samples, one per clock
+        // OUTPUT: Stream out 1024 range profile samples, one per clock
         // ================================================================
         ST_OUTPUT: begin
             if (out_count < FFT_SIZE) begin
@@ -534,16 +531,16 @@ end
 // ============================================================================
 // SYNTHESIS IMPLEMENTATION — Radix-2 DIT FFT via fft_engine
 // ============================================================================
-// Uses a single fft_engine instance (2048-pt) reused 3 times:
+// Uses a single fft_engine instance (1024-pt) reused 3 times:
 //   1. Forward FFT of signal
 //   2. Forward FFT of reference
 //   3. Inverse FFT of conjugate product
 // Conjugate multiply done via frequency_matched_filter (4-stage pipeline).
 //
 // Buffer scheme (BRAM-inferrable):
-//   sig_buf[2048]:  ADC input -> signal FFT output
+//   sig_buf[1024]:  ADC input -> signal FFT output
-//   ref_buf[2048]:  Reference input -> reference FFT output
+//   ref_buf[1024]:  Reference input -> reference FFT output
-//   prod_buf[2048]: Conjugate multiply output -> IFFT output
+//   prod_buf[1024]: Conjugate multiply output -> IFFT output
 //
 // Memory access is INSIDE always @(posedge clk) blocks (no async reset)
 // using local blocking variables. This eliminates NBA race conditions
@@ -555,12 +552,12 @@ end
 //   out_primed   — for output streaming
 // ============================================================================
 
-localparam FFT_SIZE  = `RP_FFT_SIZE;    // 2048
+localparam FFT_SIZE  = 1024;
-localparam ADDR_BITS = `RP_LOG2_FFT_SIZE; // 11
+localparam ADDR_BITS = 10;
 
 // State encoding
 localparam [3:0] ST_IDLE     = 4'd0,
-                 ST_COLLECT  = 4'd1,   // Collect FFT_SIZE ADC + ref samples
+                 ST_COLLECT  = 4'd1,   // Collect 1024 ADC + ref samples
                  ST_SIG_FFT  = 4'd2,   // Forward FFT of signal
                  ST_SIG_CAP  = 4'd3,   // Capture signal FFT output
                  ST_REF_FFT  = 4'd4,   // Forward FFT of reference
@@ -568,7 +565,7 @@ localparam [3:0] ST_IDLE     = 4'd0,
                  ST_MULTIPLY = 4'd6,   // Conjugate multiply (pipelined)
                  ST_INV_FFT  = 4'd7,   // Inverse FFT of product
                  ST_INV_CAP  = 4'd8,   // Capture IFFT output
-                 ST_OUTPUT   = 4'd9,   // Stream FFT_SIZE results
+                 ST_OUTPUT   = 4'd9,   // Stream 1024 results
                  ST_DONE     = 4'd10;
 
 reg [3:0] state;
@@ -591,11 +588,11 @@ reg signed [15:0] prod_rdata_i, prod_rdata_q;
 // ============================================================================
 // COUNTERS
 // ============================================================================
-reg [ADDR_BITS:0] collect_count;   // 0..FFT_SIZE for sample collection
+reg [ADDR_BITS:0] collect_count;   // 0..1024 for sample collection
-reg [ADDR_BITS:0] feed_count;      // 0..FFT_SIZE for feeding FFT engine
+reg [ADDR_BITS:0] feed_count;      // 0..1024 for feeding FFT engine
-reg [ADDR_BITS:0] cap_count;       // 0..FFT_SIZE for capturing FFT output
+reg [ADDR_BITS:0] cap_count;       // 0..1024 for capturing FFT output
-reg [ADDR_BITS:0] mult_count;      // 0..FFT_SIZE for multiply feeding
+reg [ADDR_BITS:0] mult_count;      // 0..1024 for multiply feeding
-reg [ADDR_BITS:0] out_count;       // 0..FFT_SIZE for output streaming
+reg [ADDR_BITS:0] out_count;       // 0..1024 for output streaming
 
 // BRAM read latency pipeline flags
 reg feed_primed;   // 1 = BRAM rdata valid for feed operations
@@ -620,7 +617,7 @@ fft_engine #(
     .DATA_W(16),
     .INTERNAL_W(32),
     .TWIDDLE_W(16),
-    .TWIDDLE_FILE("fft_twiddle_2048.mem")
+    .TWIDDLE_FILE("fft_twiddle_1024.mem")
 ) fft_inst (
     .clk(clk),
     .reset_n(reset_n),
@@ -971,7 +968,7 @@ always @(posedge clk or negedge reset_n) begin
         end
 
         // ================================================================
-        // COLLECT: Gather 2048 ADC + reference samples
+        // COLLECT: Gather 1024 ADC + reference samples
         // Writes happen in sig/ref BRAM ports (they see state==ST_COLLECT)
         // ================================================================
         ST_COLLECT: begin
@@ -980,7 +977,7 @@ always @(posedge clk or negedge reset_n) begin
             end
 
             if (collect_count == FFT_SIZE) begin
-                // All 2048 samples collected — start signal FFT
+                // All 1024 samples collected — start signal FFT
                 state       <= ST_SIG_FFT;
                 fft_start   <= 1'b1;
                 fft_inverse <= 1'b0;  // Forward FFT
@@ -1094,7 +1091,7 @@ always @(posedge clk or negedge reset_n) begin
         // ================================================================
         // MULTIPLY: Stream sig FFT and ref FFT through freq_matched_filter
         // Both sig_buf and ref_buf are read simultaneously (separate BRAM
-        // ports). Pipeline latency = 4 clocks. Feed 2048 pairs, then flush.
+        // ports). Pipeline latency = 4 clocks. Feed 1024 pairs, then flush.
         // ================================================================
         ST_MULTIPLY: begin
             if (mult_count < FFT_SIZE) begin
@@ -1183,7 +1180,7 @@ always @(posedge clk or negedge reset_n) begin
         end
 
         // ================================================================
-        // OUTPUT: Stream 2048 range profile samples
+        // OUTPUT: Stream 1024 range profile samples
         // BRAM read latency: present address, data valid next cycle.
         // ================================================================
         ST_OUTPUT: begin

9_Firmware/9_2_FPGA/mti_canceller.v

@@ -19,33 +19,25 @@
  *     mti_out_i[r] = current_i[r] - previous_i[r]
  *     mti_out_q[r] = current_q[r] - previous_q[r]
  *
- * The previous chirp's 512 range bins are stored in BRAM (inferred via
+ * The previous chirp's 64 range bins are stored in a small BRAM.
- * sync-only read/write always blocks — NO async reset on memory arrays).
  * On the very first chirp after reset (or enable), there is no previous
  * data — output is zero (muted) for that first chirp.
  *
- * When mti_enable=0, the module is a transparent pass-through.
+ * When mti_enable=0, the module is a transparent pass-through with zero
+ * latency penalty (data goes straight through combinationally registered).
  *
- * BRAM inference note:
+ * Resources:
- *   prev_i/prev_q arrays use dedicated sync-only always blocks for read
+ *   - 2 BRAM18 (64 x 16-bit I + 64 x 16-bit Q) or distributed RAM
- *   and write. This ensures Vivado infers BRAM (RAMB18) instead of fabric
+ *   - ~30 LUTs (subtract + mux)
- *   FFs + mux trees. The registered read adds 1 cycle of latency, which
+ *   - ~40 FFs (pipeline + control)
- *   is compensated by a pipeline stage on the input data path.
- *
- * Resources (target):
- *   - 2 BRAM18 (512 x 16-bit I + 512 x 16-bit Q)
- *   - ~30 LUTs (subtract + mux + saturation)
- *   - ~80 FFs (pipeline + control)
  *   - 0 DSP48
  *
  * Clock domain: clk (100 MHz)
  */
 
-`include "radar_params.vh"
-
 module mti_canceller #(
-    parameter NUM_RANGE_BINS = `RP_NUM_RANGE_BINS,    // 512
+    parameter NUM_RANGE_BINS = 64,
-    parameter DATA_WIDTH     = `RP_DATA_WIDTH         // 16
+    parameter DATA_WIDTH     = 16
 ) (
     input wire clk,
     input wire reset_n,
@@ -54,13 +46,13 @@ module mti_canceller #(
     input wire signed [DATA_WIDTH-1:0] range_i_in,
     input wire signed [DATA_WIDTH-1:0] range_q_in,
     input wire                         range_valid_in,
-    input wire [`RP_RANGE_BIN_BITS-1:0] range_bin_in,   // 9-bit
+    input wire [5:0]                   range_bin_in,
 
     // ========== OUTPUT (to Doppler processor) ==========
     output reg signed [DATA_WIDTH-1:0] range_i_out,
     output reg signed [DATA_WIDTH-1:0] range_q_out,
     output reg                         range_valid_out,
-    output reg [`RP_RANGE_BIN_BITS-1:0] range_bin_out,   // 9-bit
+    output reg [5:0]                   range_bin_out,
 
     // ========== CONFIGURATION ==========
     input wire mti_enable,   // 1=MTI active, 0=pass-through
@@ -70,79 +62,30 @@ module mti_canceller #(
 );
 
 // ============================================================================
-// PREVIOUS CHIRP BUFFER (512 x 16-bit I, 512 x 16-bit Q)
+// PREVIOUS CHIRP BUFFER (64 x 16-bit I, 64 x 16-bit Q)
 // ============================================================================
-// BRAM-inferred on XC7A50T/200T (512 entries, sync-only read/write).
+// Small enough for distributed RAM on XC7A200T (64 entries).
-// Using separate I/Q arrays for clean dual-port inference.
+// Using separate I/Q arrays for clean read/write.
 
-(* ram_style = "block" *) reg signed [DATA_WIDTH-1:0] prev_i [0:NUM_RANGE_BINS-1];
+reg signed [DATA_WIDTH-1:0] prev_i [0:NUM_RANGE_BINS-1];
-(* ram_style = "block" *) reg signed [DATA_WIDTH-1:0] prev_q [0:NUM_RANGE_BINS-1];
+reg signed [DATA_WIDTH-1:0] prev_q [0:NUM_RANGE_BINS-1];
-
-// ============================================================================
-// INPUT PIPELINE STAGE (1 cycle delay to match BRAM read latency)
-// ============================================================================
-// Declarations must precede the BRAM write block that references them.
-
-reg signed [DATA_WIDTH-1:0] range_i_d1, range_q_d1;
-reg                         range_valid_d1;
-reg [`RP_RANGE_BIN_BITS-1:0] range_bin_d1;
-reg                         mti_enable_d1;
-
-always @(posedge clk or negedge reset_n) begin
-    if (!reset_n) begin
-        range_i_d1     <= {DATA_WIDTH{1'b0}};
-        range_q_d1     <= {DATA_WIDTH{1'b0}};
-        range_valid_d1 <= 1'b0;
-        range_bin_d1   <= {`RP_RANGE_BIN_BITS{1'b0}};
-        mti_enable_d1  <= 1'b0;
-    end else begin
-        range_i_d1     <= range_i_in;
-        range_q_d1     <= range_q_in;
-        range_valid_d1 <= range_valid_in;
-        range_bin_d1   <= range_bin_in;
-        mti_enable_d1  <= mti_enable;
-    end
-end
-
-// ============================================================================
-// BRAM WRITE PORT (sync only — NO async reset for BRAM inference)
-// ============================================================================
-// Writes the current chirp sample into prev_i/prev_q for next chirp's
-// subtraction. Uses the delayed (d1) signals so the write happens 1 cycle
-// after the read address is presented, avoiding RAW hazards.
-
-always @(posedge clk) begin
-    if (range_valid_d1) begin
-        prev_i[range_bin_d1] <= range_i_d1;
-        prev_q[range_bin_d1] <= range_q_d1;
-    end
-end
-
-// ============================================================================
-// BRAM READ PORT (sync only — 1 cycle read latency)
-// ============================================================================
-// Address is always driven by range_bin_in (cycle 0). Read data appears
-// on prev_i_rd / prev_q_rd at cycle 1, aligned with the d1 pipeline stage.
-
-reg signed [DATA_WIDTH-1:0] prev_i_rd, prev_q_rd;
-
-always @(posedge clk) begin
-    prev_i_rd <= prev_i[range_bin_in];
-    prev_q_rd <= prev_q[range_bin_in];
-end
 
 // Track whether we have valid previous data
 reg has_previous;
 
 // ============================================================================
-// MTI PROCESSING (operates on d1 pipeline stage + BRAM read data)
+// MTI PROCESSING
 // ============================================================================
 
+// Read previous chirp data (combinational)
+wire signed [DATA_WIDTH-1:0] prev_i_rd = prev_i[range_bin_in];
+wire signed [DATA_WIDTH-1:0] prev_q_rd = prev_q[range_bin_in];
+
 // Compute difference with saturation
 // Subtraction can produce DATA_WIDTH+1 bits; saturate back to DATA_WIDTH.
-wire signed [DATA_WIDTH:0] diff_i_full = {range_i_d1[DATA_WIDTH-1], range_i_d1}
+wire signed [DATA_WIDTH:0] diff_i_full = {range_i_in[DATA_WIDTH-1], range_i_in}
                                         - {prev_i_rd[DATA_WIDTH-1], prev_i_rd};
-wire signed [DATA_WIDTH:0] diff_q_full = {range_q_d1[DATA_WIDTH-1], range_q_d1}
+wire signed [DATA_WIDTH:0] diff_q_full = {range_q_in[DATA_WIDTH-1], range_q_in}
                                         - {prev_q_rd[DATA_WIDTH-1], prev_q_rd};
 
 // Saturate to DATA_WIDTH bits
@@ -162,28 +105,32 @@ assign diff_q_sat = (diff_q_full > $signed({{2{1'b0}}, {(DATA_WIDTH-1){1'b1}}}))
                   : diff_q_full[DATA_WIDTH-1:0];
 
 // ============================================================================
-// MAIN OUTPUT LOGIC (operates on d1 pipeline stage)
+// MAIN LOGIC
 // ============================================================================
 always @(posedge clk or negedge reset_n) begin
     if (!reset_n) begin
         range_i_out     <= {DATA_WIDTH{1'b0}};
         range_q_out     <= {DATA_WIDTH{1'b0}};
         range_valid_out <= 1'b0;
-        range_bin_out   <= {`RP_RANGE_BIN_BITS{1'b0}};
+        range_bin_out   <= 6'd0;
         has_previous    <= 1'b0;
         mti_first_chirp <= 1'b1;
     end else begin
         // Default: no valid output
         range_valid_out <= 1'b0;
 
-        if (range_valid_d1) begin
+        if (range_valid_in) begin
-            // Output path — range_bin is from the delayed pipeline
+            // Always store current sample as "previous" for next chirp
-            range_bin_out <= range_bin_d1;
+            prev_i[range_bin_in] <= range_i_in;
+            prev_q[range_bin_in] <= range_q_in;
 
-            if (!mti_enable_d1) begin
+            // Output path
+            range_bin_out <= range_bin_in;
+
+            if (!mti_enable) begin
                 // Pass-through mode: no MTI processing
-                range_i_out     <= range_i_d1;
+                range_i_out     <= range_i_in;
-                range_q_out     <= range_q_d1;
+                range_q_out     <= range_q_in;
                 range_valid_out <= 1'b1;
                 // Reset first-chirp state when MTI is disabled
                 has_previous    <= 1'b0;
@@ -197,7 +144,7 @@ always @(posedge clk or negedge reset_n) begin
                 range_valid_out <= 1'b1;
 
                 // After last range bin of first chirp, mark previous as valid
-                if (range_bin_d1 == NUM_RANGE_BINS - 1) begin
+                if (range_bin_in == NUM_RANGE_BINS - 1) begin
                     has_previous    <= 1'b1;
                     mti_first_chirp <= 1'b0;
                 end

9_Firmware/9_2_FPGA/radar_mode_controller.v

@@ -1,7 +1,5 @@
 `timescale 1ns / 1ps
 
-`include "radar_params.vh"
-
 /**
  * radar_mode_controller.v
  *
@@ -20,18 +18,12 @@
  *   - 32 chirps per elevation
  *   - 31 elevations per azimuth
  *   - 50 azimuths per full scan
+ *   - Each chirp: Long chirp → Listen → Guard → Short chirp → Listen
  *
- * Chirp sequence depends on range_mode (host_range_mode, opcode 0x20):
+ * Modes of operation:
- *   range_mode 2'b00 (3 km):  All short chirps only. Long chirp blind zone
- *     (4500 m) exceeds 3 km max range, so long chirps are useless.
- *   range_mode 2'b01 (long-range): Dual chirp — Long chirp → Listen → Guard
- *     → Short chirp → Listen. First half of chirps_per_elev are long, second
- *     half are short (blind-zone fill).
- *
- * Modes of operation (host_radar_mode, opcode 0x01):
  *   mode[1:0]:
  *     2'b00 = STM32-driven (pass through stm32 toggle signals)
- *     2'b01 = Free-running auto-scan (internal timing, short chirps only)
+ *     2'b01 = Free-running auto-scan (internal timing)
  *     2'b10 = Single-chirp (fire one chirp per trigger, for debug)
  *     2'b11 = Reserved
  *
@@ -39,7 +31,7 @@
  */
 
 module radar_mode_controller #(
-    parameter CHIRPS_PER_ELEVATION  = `RP_DEF_CHIRPS_PER_ELEV,
+    parameter CHIRPS_PER_ELEVATION = 32,
     parameter ELEVATIONS_PER_AZIMUTH = 31,
     parameter AZIMUTHS_PER_SCAN = 50,
 
@@ -49,24 +41,18 @@ module radar_mode_controller #(
     // Guard: 175.4us = 17540 cycles
     // Short chirp: 0.5us = 50 cycles
     // Short listen: 174.5us = 17450 cycles
-    parameter LONG_CHIRP_CYCLES   = `RP_DEF_LONG_CHIRP_CYCLES,
+    parameter LONG_CHIRP_CYCLES   = 3000,
-    parameter LONG_LISTEN_CYCLES  = `RP_DEF_LONG_LISTEN_CYCLES,
+    parameter LONG_LISTEN_CYCLES  = 13700,
-    parameter GUARD_CYCLES        = `RP_DEF_GUARD_CYCLES,
+    parameter GUARD_CYCLES        = 17540,
-    parameter SHORT_CHIRP_CYCLES  = `RP_DEF_SHORT_CHIRP_CYCLES,
+    parameter SHORT_CHIRP_CYCLES  = 50,
-    parameter SHORT_LISTEN_CYCLES = `RP_DEF_SHORT_LISTEN_CYCLES
+    parameter SHORT_LISTEN_CYCLES = 17450
 ) (
     input wire clk,
     input wire reset_n,
 
-    // Mode selection (host_radar_mode, opcode 0x01)
+    // Mode selection
     input wire [1:0] mode,          // 00=STM32, 01=auto, 10=single, 11=rsvd
 
-    // Range mode (host_range_mode, opcode 0x20)
-    // Determines chirp type selection in pass-through and auto-scan modes.
-    //   2'b00 = 3 km  (all short chirps — long blind zone > max range)
-    //   2'b01 = Long-range (dual chirp: first half long, second half short)
-    input wire [1:0] range_mode,
-
     // STM32 pass-through inputs (active in mode 00)
     input wire stm32_new_chirp,
     input wire stm32_new_elevation,
@@ -75,8 +61,10 @@ module radar_mode_controller #(
     // Single-chirp trigger (active in mode 10)
     input wire trigger,
 
-    // Runtime-configurable timing inputs from host USB commands.
+    // Gap 2: Runtime-configurable timing inputs from host USB commands.
     // When connected, these override the compile-time parameters.
+    // When left at default (tied to parameter values at instantiation),
+    // behavior is identical to pre-Gap-2.
     input wire [15:0] cfg_long_chirp_cycles,
     input wire [15:0] cfg_long_listen_cycles,
     input wire [15:0] cfg_guard_cycles,
@@ -168,7 +156,7 @@ always @(posedge clk or negedge reset_n) begin
     if (!reset_n) begin
         scan_state      <= S_IDLE;
         timer           <= 18'd0;
-        use_long_chirp  <= 1'b0;  // Default short chirp (safe for 3 km mode)
+        use_long_chirp  <= 1'b1;
         mc_new_chirp    <= 1'b0;
         mc_new_elevation <= 1'b0;
         mc_new_azimuth  <= 1'b0;
@@ -184,12 +172,7 @@ always @(posedge clk or negedge reset_n) begin
         // ================================================================
         // MODE 00: STM32-driven pass-through
         // The STM32 firmware controls timing; we just detect toggle edges
-        // and forward them to the receiver chain. Chirp type is determined
+        // and forward them to the receiver chain.
-        // by range_mode:
-        //   range_mode 00 (3 km):  ALL chirps are short (long blind zone
-        //     4500 m exceeds 3072 m max range, so long chirps are useless).
-        //   range_mode 01 (long-range): First half of chirps_per_elev are
-        //     long, second half are short (blind-zone fill).
         // ================================================================
         2'b00: begin
             // Reset auto-scan state
@@ -199,29 +182,9 @@ always @(posedge clk or negedge reset_n) begin
             // Pass through toggle signals
             if (stm32_chirp_toggle) begin
                 mc_new_chirp <= ~mc_new_chirp;  // Toggle output
+                use_long_chirp <= 1'b1;         // Default to long chirp
 
-                // Determine chirp type based on range_mode
+                // Track chirp count (Gap 2: use runtime cfg_chirps_per_elev)
-                case (range_mode)
-                `RP_RANGE_MODE_3KM: begin
-                    // 3 km mode: all short chirps
-                    use_long_chirp <= 1'b0;
-                end
-                `RP_RANGE_MODE_LONG: begin
-                    // Long-range: first half long, second half short.
-                    // chirps_per_elev is typically 32 (16 long + 16 short).
-                    // Use cfg_chirps_per_elev[5:1] as the halfway point.
-                    if (chirp_count < {1'b0, cfg_chirps_per_elev[5:1]})
-                        use_long_chirp <= 1'b1;
-                    else
-                        use_long_chirp <= 1'b0;
-                end
-                default: begin
-                    // Reserved modes: default to short chirp (safe)
-                    use_long_chirp <= 1'b0;
-                end
-                endcase
-
-                // Track chirp count
                 if (chirp_count < cfg_chirps_per_elev - 1)
                     chirp_count <= chirp_count + 1;
                 else
@@ -254,33 +217,21 @@ always @(posedge clk or negedge reset_n) begin
         // ================================================================
         // MODE 01: Free-running auto-scan
         // Internally generates chirp timing matching the transmitter.
-        // For 3 km mode (range_mode 00): short chirps only. The long chirp
-        // blind zone (4500 m) exceeds the 3072 m max range, making long
-        // chirps useless. State machine skips S_LONG_CHIRP/LISTEN/GUARD.
-        // For long-range mode (range_mode 01): full dual-chirp sequence.
-        // NOTE: Auto-scan is primarily for bench testing without STM32.
         // ================================================================
         2'b01: begin
             case (scan_state)
             S_IDLE: begin
                 // Start first chirp immediately
+                scan_state     <= S_LONG_CHIRP;
                 timer          <= 18'd0;
+                use_long_chirp <= 1'b1;
+                mc_new_chirp   <= ~mc_new_chirp;  // Toggle to start chirp
                 chirp_count    <= 6'd0;
                 elevation_count <= 6'd0;
                 azimuth_count  <= 6'd0;
-                mc_new_chirp    <= ~mc_new_chirp;  // Toggle to start chirp
-
-                // For 3 km mode, skip directly to short chirp
-                if (range_mode == `RP_RANGE_MODE_3KM) begin
-                    scan_state     <= S_SHORT_CHIRP;
-                    use_long_chirp <= 1'b0;
-                end else begin
-                    scan_state     <= S_LONG_CHIRP;
-                    use_long_chirp <= 1'b1;
-                end
 
                 `ifdef SIMULATION
-                $display("[MODE_CTRL] Auto-scan starting, range_mode=%0d", range_mode);
+                $display("[MODE_CTRL] Auto-scan starting");
                 `endif
             end
 
@@ -334,19 +285,13 @@ always @(posedge clk or negedge reset_n) begin
 
             S_ADVANCE: begin
                 // Advance chirp/elevation/azimuth counters
+                // (Gap 2: use runtime cfg_chirps_per_elev)
                 if (chirp_count < cfg_chirps_per_elev - 1) begin
                     // Next chirp in current elevation
                     chirp_count  <= chirp_count + 1;
                     mc_new_chirp <= ~mc_new_chirp;
-
-                    // For 3 km mode: short chirps only, skip long phases
-                    if (range_mode == `RP_RANGE_MODE_3KM) begin
-                        scan_state     <= S_SHORT_CHIRP;
-                        use_long_chirp <= 1'b0;
-                    end else begin
                     scan_state   <= S_LONG_CHIRP;
                     use_long_chirp <= 1'b1;
-                    end
                 end else begin
                     chirp_count <= 6'd0;
 
@@ -355,14 +300,8 @@ always @(posedge clk or negedge reset_n) begin
                         elevation_count  <= elevation_count + 1;
                         mc_new_chirp     <= ~mc_new_chirp;
                         mc_new_elevation <= ~mc_new_elevation;
-
-                        if (range_mode == `RP_RANGE_MODE_3KM) begin
-                            scan_state     <= S_SHORT_CHIRP;
-                            use_long_chirp <= 1'b0;
-                        end else begin
                         scan_state       <= S_LONG_CHIRP;
                         use_long_chirp   <= 1'b1;
-                        end
                     end else begin
                         elevation_count <= 6'd0;
 
@@ -372,14 +311,8 @@ always @(posedge clk or negedge reset_n) begin
                             mc_new_chirp     <= ~mc_new_chirp;
                             mc_new_elevation <= ~mc_new_elevation;
                             mc_new_azimuth   <= ~mc_new_azimuth;
-
-                            if (range_mode == `RP_RANGE_MODE_3KM) begin
-                                scan_state     <= S_SHORT_CHIRP;
-                                use_long_chirp <= 1'b0;
-                            end else begin
                             scan_state       <= S_LONG_CHIRP;
                             use_long_chirp   <= 1'b1;
-                            end
                         end else begin
                             // Full scan complete — restart
                             azimuth_count   <= 6'd0;
@@ -387,14 +320,8 @@ always @(posedge clk or negedge reset_n) begin
                             mc_new_chirp    <= ~mc_new_chirp;
                             mc_new_elevation <= ~mc_new_elevation;
                             mc_new_azimuth  <= ~mc_new_azimuth;
-
-                            if (range_mode == `RP_RANGE_MODE_3KM) begin
-                                scan_state     <= S_SHORT_CHIRP;
-                                use_long_chirp <= 1'b0;
-                            end else begin
                             scan_state      <= S_LONG_CHIRP;
                             use_long_chirp  <= 1'b1;
-                            end
 
                             `ifdef SIMULATION
                             $display("[MODE_CTRL] Full scan complete, restarting");
@@ -410,27 +337,16 @@ always @(posedge clk or negedge reset_n) begin
 
         // ================================================================
         // MODE 10: Single-chirp (debug mode)
-        // Fire one chirp per trigger pulse, no scanning.
+        // Fire one long chirp per trigger pulse, no scanning.
-        // Chirp type depends on range_mode:
-        //   3 km:  short chirp only
-        //   Long-range: long chirp (for testing long-chirp path)
         // ================================================================
         2'b10: begin
             case (scan_state)
             S_IDLE: begin
                 if (trigger_pulse) begin
-                    timer        <= 18'd0;
-                    mc_new_chirp <= ~mc_new_chirp;
-
-                    if (range_mode == `RP_RANGE_MODE_3KM) begin
-                        // 3 km: fire short chirp
-                        scan_state     <= S_SHORT_CHIRP;
-                        use_long_chirp <= 1'b0;
-                    end else begin
-                        // Long-range: fire long chirp
                     scan_state     <= S_LONG_CHIRP;
+                    timer          <= 18'd0;
                     use_long_chirp <= 1'b1;
-                    end
+                    mc_new_chirp   <= ~mc_new_chirp;
                 end
             end
 
@@ -447,27 +363,7 @@ always @(posedge clk or negedge reset_n) begin
                 if (timer < cfg_long_listen_cycles - 1)
                     timer <= timer + 1;
                 else begin
-                    // Single long chirp done, return to idle
+                    // Single chirp done, return to idle
-                    timer      <= 18'd0;
-                    scan_state <= S_IDLE;
-                end
-            end
-
-            S_SHORT_CHIRP: begin
-                use_long_chirp <= 1'b0;
-                if (timer < cfg_short_chirp_cycles - 1)
-                    timer <= timer + 1;
-                else begin
-                    timer <= 18'd0;
-                    scan_state <= S_SHORT_LISTEN;
-                end
-            end
-
-            S_SHORT_LISTEN: begin
-                if (timer < cfg_short_listen_cycles - 1)
-                    timer <= timer + 1;
-                else begin
-                    // Single short chirp done, return to idle
                     timer      <= 18'd0;
                     scan_state <= S_IDLE;
                 end

9_Firmware/9_2_FPGA/radar_params.vh

@@ -10,36 +10,27 @@
 // optionally alias macros to localparams for readability.
 //
 // BOARD VARIANTS:
-//   SUPPORT_LONG_RANGE = 0  (50T, USB_MODE=1)  — 3 km mode only
+//   SUPPORT_LONG_RANGE = 0  (50T, USB_MODE=1)  — 3 km mode only, 64 range bins
-//   SUPPORT_LONG_RANGE = 1  (200T, USB_MODE=0) — 3 km + 20 km modes
+//   SUPPORT_LONG_RANGE = 1  (200T, USB_MODE=0) — 3 km + 20 km modes, up to 1024 bins
-//
-// RADAR MODES (runtime, via host_radar_mode register, opcode 0x01):
-//   2'b00 = STM32 pass-through (production — STM32 controls chirp timing)
-//   2'b01 = Auto-scan 3 km     (FPGA-timed, short chirps only)
-//   2'b10 = Single-chirp debug (one long chirp per trigger)
-//   2'b11 = Reserved / idle
 //
 // RANGE MODES (runtime, via host_range_mode register, opcode 0x20):
-//   2'b00 = 3 km   (default — pass-through treats all chirps as short)
+//   2'b00 = 3 km  (default on both boards)
-//   2'b01 = Long-range (pass-through: first half long, second half short)
+//   2'b01 = 20 km (200T only; clamped to 3 km on 50T)
 //   2'b10 = Reserved
 //   2'b11 = Reserved
 //
 // USAGE:
 //   `include "radar_params.vh"
-//   Then reference `RP_FFT_SIZE, `RP_NUM_RANGE_BINS, etc.
+//   Then reference `RP_FFT_SIZE, `RP_MAX_OUTPUT_BINS, etc.
 //
 // PHYSICAL CONSTANTS (derived from hardware):
 //   ADC clock:           400 MSPS
 //   CIC decimation:      4x
 //   Processing rate:     100 MSPS (post-DDC)
 //   Range per sample:    c / (2 * 100e6) = 1.5 m
-//   FFT size:            2048
+//   Decimation factor:   16 (1024 FFT bins -> 64 output bins per segment)
-//   Decimation factor:   4  (2048 FFT bins -> 512 output range bins)
+//   Range per dec. bin:  1.5 m * 16 = 24.0 m
-//   Range per dec. bin:  1.5 m * 4 = 6.0 m
-//   Max range (3 km):    512 * 6.0 = 3072 m
 //   Carrier frequency:   10.5 GHz
-//   IF frequency:        120 MHz
 //
 // CHIRP BANDWIDTH (Phase 1 target — currently 20 MHz, planned 30 MHz):
 //   Range resolution:    c / (2 * BW)
@@ -68,13 +59,11 @@
 // FFT AND PROCESSING CONSTANTS (fixed, both modes)
 // ============================================================================
 
-`define RP_FFT_SIZE             2048    // Range FFT points per segment
+`define RP_FFT_SIZE             1024    // Range FFT points per segment
-`define RP_LOG2_FFT_SIZE        11      // log2(2048)
 `define RP_OVERLAP_SAMPLES      128     // Overlap between adjacent segments
-`define RP_SEGMENT_ADVANCE      1920    // FFT_SIZE - OVERLAP = 2048 - 128
+`define RP_SEGMENT_ADVANCE      896     // FFT_SIZE - OVERLAP = 1024 - 128
-`define RP_DECIMATION_FACTOR    4       // Range bin decimation (2048 -> 512)
+`define RP_DECIMATION_FACTOR    16      // Range bin decimation (1024 -> 64)
-`define RP_NUM_RANGE_BINS       512     // FFT_SIZE / DECIMATION_FACTOR
+`define RP_BINS_PER_SEGMENT     64      // FFT_SIZE / DECIMATION_FACTOR
-`define RP_RANGE_BIN_BITS       9       // ceil(log2(512))
 `define RP_DOPPLER_FFT_SIZE     16      // Per sub-frame Doppler FFT
 `define RP_CHIRPS_PER_FRAME     32      // Total chirps (16 long + 16 short)
 `define RP_CHIRPS_PER_SUBFRAME  16      // Chirps per Doppler sub-frame
@@ -86,35 +75,36 @@
 // ============================================================================
 
 `define RP_LONG_CHIRP_SAMPLES_3KM   3000    // 30 us at 100 MSPS
-`define RP_LONG_SEGMENTS_3KM        2       // ceil((3000-2048)/1920) + 1 = 2
+`define RP_LONG_SEGMENTS_3KM        4       // ceil((3000-1024)/896) + 1 = 4
+`define RP_OUTPUT_RANGE_BINS_3KM    64      // Downstream pipeline expects 64 range bins (NOTE: will become 128 after 2048-pt FFT upgrade)
 `define RP_SHORT_CHIRP_SAMPLES      50      // 0.5 us at 100 MSPS (same both modes)
 `define RP_SHORT_SEGMENTS           1       // Single segment for short chirp
 
 // Derived 3 km limits
-`define RP_MAX_RANGE_3KM            3072    // 512 bins * 6 m = 3072 m
+`define RP_MAX_RANGE_3KM            1536    // 64 bins * 24 m = 1536 m
 
 // ============================================================================
-// 20 KM MODE PARAMETERS (200T only — Phase 2)
+// 20 KM MODE PARAMETERS (200T only)
 // ============================================================================
 
 `define RP_LONG_CHIRP_SAMPLES_20KM  13700   // 137 us at 100 MSPS (= listen window)
-`define RP_LONG_SEGMENTS_20KM       8       // 1 + ceil((13700-2048)/1920) = 1 + 7 = 8
+`define RP_LONG_SEGMENTS_20KM       16      // ceil((13700-1024)/896) + 1 = 16
-`define RP_OUTPUT_RANGE_BINS_20KM   4096    // 8 segments * 512 dec. bins each
+`define RP_OUTPUT_RANGE_BINS_20KM   1024    // 16 segments * 64 dec. bins each
 
 // Derived 20 km limits
-`define RP_MAX_RANGE_20KM           24576   // 4096 bins * 6 m = 24576 m
+`define RP_MAX_RANGE_20KM           24576   // 1024 bins * 24 m = 24576 m
 
 // ============================================================================
 // MAX VALUES (for sizing buffers — compile-time, based on board variant)
 // ============================================================================
 
 `ifdef SUPPORT_LONG_RANGE
-  `define RP_MAX_SEGMENTS           8
+  `define RP_MAX_SEGMENTS           16
-  `define RP_MAX_OUTPUT_BINS        4096
+  `define RP_MAX_OUTPUT_BINS        1024
   `define RP_MAX_CHIRP_SAMPLES      13700
 `else
-  `define RP_MAX_SEGMENTS           2
+  `define RP_MAX_SEGMENTS           4
-  `define RP_MAX_OUTPUT_BINS        512
+  `define RP_MAX_OUTPUT_BINS        64
   `define RP_MAX_CHIRP_SAMPLES      3000
 `endif
 
@@ -123,22 +113,25 @@
 // ============================================================================
 
 // Segment index: ceil(log2(MAX_SEGMENTS))
-//   50T:  log2(2) = 1 bit  (use 2 for safety)
+//   50T:  log2(4)  = 2 bits
-//   200T: log2(8) = 3 bits
+//   200T: log2(16) = 4 bits
 `ifdef SUPPORT_LONG_RANGE
-  `define RP_SEGMENT_IDX_WIDTH      3
+  `define RP_SEGMENT_IDX_WIDTH      4
-  `define RP_RANGE_BIN_WIDTH_MAX    12      // ceil(log2(4096))
+  `define RP_RANGE_BIN_WIDTH        10
-  `define RP_DOPPLER_MEM_ADDR_W     17      // ceil(log2(4096*32)) = 17
+  `define RP_CHIRP_MEM_ADDR_W       14      // log2(16*1024) = 14
-  `define RP_CFAR_MAG_ADDR_W        17      // ceil(log2(4096*32)) = 17
+  `define RP_DOPPLER_MEM_ADDR_W     15      // log2(1024*32) = 15
+  `define RP_CFAR_MAG_ADDR_W        15      // log2(1024*32) = 15
 `else
   `define RP_SEGMENT_IDX_WIDTH      2
-  `define RP_RANGE_BIN_WIDTH_MAX    9       // ceil(log2(512))
+  `define RP_RANGE_BIN_WIDTH        6
-  `define RP_DOPPLER_MEM_ADDR_W     14      // ceil(log2(512*32)) = 14
+  `define RP_CHIRP_MEM_ADDR_W       12      // log2(4*1024) = 12
-  `define RP_CFAR_MAG_ADDR_W        14      // ceil(log2(512*32)) = 14
+  `define RP_DOPPLER_MEM_ADDR_W     11      // log2(64*32) = 11
+  `define RP_CFAR_MAG_ADDR_W        11      // log2(64*32) = 11
 `endif
 
 // Derived depths (for memory declarations)
-// Usage: reg [15:0] mem [0:`RP_DOPPLER_MEM_DEPTH-1];
+// Usage: reg [15:0] mem [0:`RP_CHIRP_MEM_DEPTH-1];
+`define RP_CHIRP_MEM_DEPTH      (`RP_MAX_SEGMENTS * `RP_FFT_SIZE)
 `define RP_DOPPLER_MEM_DEPTH    (`RP_MAX_OUTPUT_BINS * `RP_CHIRPS_PER_FRAME)
 `define RP_CFAR_MAG_DEPTH       (`RP_MAX_OUTPUT_BINS * `RP_NUM_DOPPLER_BINS)
 
@@ -168,11 +161,11 @@
 // PHYSICAL CONSTANTS (integer-scaled for Verilog — use in comments/assertions)
 // ============================================================================
 // Range per ADC sample:     1.5 m  (stored as 15 in units of 0.1 m)
-// Range per decimated bin:  6.0 m  (stored as 60 in units of 0.1 m)
+// Range per decimated bin: 24.0 m  (stored as 240 in units of 0.1 m)
 // Processing rate:         100 MSPS
 
 `define RP_RANGE_PER_SAMPLE_DM      15      // 1.5 m in decimeters
-`define RP_RANGE_PER_BIN_DM         60      // 6.0 m in decimeters
+`define RP_RANGE_PER_BIN_DM         240     // 24.0 m in decimeters
 `define RP_PROCESSING_RATE_MHZ      100
 
 // ============================================================================
@@ -197,32 +190,11 @@
 `define RP_DEF_DETECT_THRESHOLD     10000
 
 // ============================================================================
-// RADAR MODE ENCODING (host_radar_mode, opcode 0x01)
+// RANGE MODE ENCODING
-// ============================================================================
-`define RP_MODE_STM32_PASSTHROUGH   2'b00
-`define RP_MODE_AUTO_3KM            2'b01
-`define RP_MODE_SINGLE_DEBUG        2'b10
-`define RP_MODE_RESERVED            2'b11
-
-// ============================================================================
-// RANGE MODE ENCODING (host_range_mode, opcode 0x20)
 // ============================================================================
 `define RP_RANGE_MODE_3KM           2'b00
-`define RP_RANGE_MODE_LONG          2'b01
+`define RP_RANGE_MODE_20KM          2'b01
 `define RP_RANGE_MODE_RSVD2         2'b10
 `define RP_RANGE_MODE_RSVD3         2'b11
 
-// ============================================================================
-// STREAM CONTROL (host_stream_control, opcode 0x04, 6-bit)
-// ============================================================================
-// Bits [2:0]: Stream enable mask
-//   Bit 0 = range profile stream
-//   Bit 1 = doppler map stream
-//   Bit 2 = cfar/detection stream
-// Bits [5:3]: Stream format control
-//   Bit 3 = mag_only    (0=I/Q pairs, 1=Manhattan magnitude only)
-//   Bit 4 = sparse_det  (0=dense detection flags, 1=sparse detection list)
-//   Bit 5 = reserved (was frame_decimate, not needed with mag-only fitting)
-`define RP_STREAM_CTRL_DEFAULT      6'b001_111  // all streams, mag-only mode
-
 `endif // RADAR_PARAMS_VH

9_Firmware/9_2_FPGA/radar_receiver_final.v

@@ -1,7 +1,5 @@
 `timescale 1ns / 1ps
 
-`include "radar_params.vh"
-
 module radar_receiver_final (
     input wire clk,           // 100MHz    
 	 input wire reset_n,
@@ -19,22 +17,17 @@ module radar_receiver_final (
     output wire [31:0] doppler_output,
     output wire doppler_valid,
     output wire [4:0] doppler_bin,
-    output wire [`RP_RANGE_BIN_BITS-1:0] range_bin,  // 9-bit
+    output wire [5:0] range_bin,
     
-    // Raw matched-filter output (debug/bring-up)
+    // Matched filter range profile output (for USB)
     output wire signed [15:0] range_profile_i_out,
     output wire signed [15:0] range_profile_q_out,
     output wire range_profile_valid_out,
     
-    // Decimated 512-bin range profile (for USB bulk frames / downstream consumers)
-    output wire [15:0] decimated_range_mag_out,
-    output wire decimated_range_valid_out,
-    
     // Host command inputs (Gap 4: USB Read Path, CDC-synchronized)
     // CDC-synchronized in radar_system_top.v before reaching here
     input wire [1:0] host_mode,      // Radar mode: 00=STM32, 01=auto-scan, 10=single-chirp
     input wire host_trigger,          // Single-chirp trigger pulse (1 clk cycle)
-    input wire [1:0] host_range_mode, // Range mode: 00=3km (short only), 01=long-range (dual chirp)
 
     // Gap 2: Host-configurable chirp timing (CDC-synchronized in radar_system_top.v)
     input wire [15:0] host_long_chirp_cycles,
@@ -123,36 +116,20 @@ wire [31:0] doppler_spectrum;
 wire doppler_spectrum_valid;
 wire [4:0] doppler_bin_out;
 wire doppler_processing;
-
+wire doppler_frame_done;
-// frame_complete from doppler_processor is a LEVEL signal (high whenever
-// state == S_IDLE && !frame_buffer_full). Downstream consumers (USB FT2232H,
-// AGC, CFAR) expect a single-cycle PULSE. Convert here at the source so all
-// consumers are safe.
-wire doppler_frame_done_level;  // raw level from doppler_processor
-reg  doppler_frame_done_prev;
-wire doppler_frame_done;        // rising-edge pulse (1 clk cycle)
-
-always @(posedge clk or negedge reset_n) begin
-    if (!reset_n)
-        doppler_frame_done_prev <= 1'b0;
-    else
-        doppler_frame_done_prev <= doppler_frame_done_level;
-end
-
-assign doppler_frame_done = doppler_frame_done_level & ~doppler_frame_done_prev;
 assign doppler_frame_done_out = doppler_frame_done;
 
 // ========== RANGE BIN DECIMATOR SIGNALS ==========
 wire signed [15:0] decimated_range_i;
 wire signed [15:0] decimated_range_q;
 wire decimated_range_valid;
-wire [`RP_RANGE_BIN_BITS-1:0] decimated_range_bin;  // 9-bit
+wire [5:0] decimated_range_bin;
 
 // ========== MTI CANCELLER SIGNALS ==========
 wire signed [15:0] mti_range_i;
 wire signed [15:0] mti_range_q;
 wire mti_range_valid;
-wire [`RP_RANGE_BIN_BITS-1:0] mti_range_bin;  // 9-bit
+wire [5:0] mti_range_bin;
 wire mti_first_chirp;
 
 // ========== RADAR MODE CONTROLLER SIGNALS ==========
@@ -170,7 +147,6 @@ radar_mode_controller rmc (
     .clk(clk),
     .reset_n(reset_n),
     .mode(host_mode),                     // Controlled by host via USB (default: 2'b01 auto-scan)
-    .range_mode(host_range_mode),          // Range mode: 00=3km, 01=long-range (drives chirp type)
     .stm32_new_chirp(stm32_new_chirp_rx),
     .stm32_new_elevation(stm32_new_elevation_rx),
     .stm32_new_azimuth(stm32_new_azimuth_rx),
@@ -289,7 +265,7 @@ rx_gain_control gain_ctrl (
 );
 
 // 3. Dual Chirp Memory Loader
-wire [10:0] sample_addr_from_chain;
+wire [9:0] sample_addr_from_chain;
 
 chirp_memory_loader_param chirp_mem (
     .clk(clk),
@@ -303,6 +279,18 @@ chirp_memory_loader_param chirp_mem (
     .mem_ready(mem_ready)
 );
 
+// Sample address generator
+reg [9:0] sample_addr_reg;
+always @(posedge clk or negedge reset_n) begin
+    if (!reset_n) begin
+        sample_addr_reg <= 0;
+    end else if (mem_request) begin
+        sample_addr_reg <= sample_addr_reg + 1;
+        if (sample_addr_reg == 1023) sample_addr_reg <= 0;
+    end
+end
+// sample_addr_wire removed — was unused implicit wire (synthesis warning)
+
 // 4. CRITICAL: Reference Chirp Latency Buffer
 // This aligns reference data with FFT output (3187 cycle delay)
 // TODO: verify empirically during hardware bring-up with correlation test
@@ -336,12 +324,6 @@ wire range_valid;
 assign range_profile_i_out = range_profile_i;
 assign range_profile_q_out = range_profile_q;
 assign range_profile_valid_out = range_valid;
-// Manhattan magnitude: |I| + |Q|, saturated to 16 bits
-wire [15:0] abs_mti_i = mti_range_i[15] ? (~mti_range_i + 16'd1) : mti_range_i;
-wire [15:0] abs_mti_q = mti_range_q[15] ? (~mti_range_q + 16'd1) : mti_range_q;
-wire [16:0] manhattan_sum = {1'b0, abs_mti_i} + {1'b0, abs_mti_q};
-assign decimated_range_mag_out = manhattan_sum[16] ? 16'hFFFF : manhattan_sum[15:0];
-assign decimated_range_valid_out = mti_range_valid;
 
 matched_filter_multi_segment mf_dual (
     .clk(clk),
@@ -366,11 +348,11 @@ matched_filter_multi_segment mf_dual (
 );
 
 // ========== CRITICAL: RANGE BIN DECIMATOR ==========
-// Convert 2048 range bins to 512 bins for Doppler
+// Convert 1024 range bins to 64 bins for Doppler
 range_bin_decimator #(
-    .INPUT_BINS(`RP_FFT_SIZE),              // 2048
+    .INPUT_BINS(1024),
-    .OUTPUT_BINS(`RP_NUM_RANGE_BINS),       // 512
+    .OUTPUT_BINS(64),
-    .DECIMATION_FACTOR(`RP_DECIMATION_FACTOR)  // 4
+    .DECIMATION_FACTOR(16)
 ) range_decim (
     .clk(clk),
     .reset_n(reset_n),
@@ -382,7 +364,7 @@ range_bin_decimator #(
     .range_valid_out(decimated_range_valid),
     .range_bin_index(decimated_range_bin),
     .decimation_mode(2'b01),           // Peak detection mode
-    .start_bin(11'd0),
+    .start_bin(10'd0),
     .watchdog_timeout()                // Diagnostic — unconnected (monitored via ILA if needed)
 );
 
@@ -391,8 +373,8 @@ range_bin_decimator #(
 // H(z) = 1 - z^{-1} → null at DC Doppler, removes stationary clutter.
 // When host_mti_enable=0: transparent pass-through.
 mti_canceller #(
-    .NUM_RANGE_BINS(`RP_NUM_RANGE_BINS),    // 512
+    .NUM_RANGE_BINS(64),
-    .DATA_WIDTH(`RP_DATA_WIDTH)             // 16
+    .DATA_WIDTH(16)
 ) mti_inst (
     .clk(clk),
     .reset_n(reset_n),
@@ -446,10 +428,10 @@ assign range_data_valid = mti_range_valid;
 
 // ========== DOPPLER PROCESSOR ==========
 doppler_processor_optimized #(
-    .DOPPLER_FFT_SIZE(`RP_DOPPLER_FFT_SIZE),        // 16
+    .DOPPLER_FFT_SIZE(16),
-    .RANGE_BINS(`RP_NUM_RANGE_BINS),                // 512
+    .RANGE_BINS(64),
-    .CHIRPS_PER_FRAME(`RP_CHIRPS_PER_FRAME),        // 32
+    .CHIRPS_PER_FRAME(32),
-    .CHIRPS_PER_SUBFRAME(`RP_CHIRPS_PER_SUBFRAME)   // 16
+    .CHIRPS_PER_SUBFRAME(16)
 ) doppler_proc (
     .clk(clk),
     .reset_n(reset_n),
@@ -465,7 +447,7 @@ doppler_processor_optimized #(
     
     // Status
     .processing_active(doppler_processing),
-    .frame_complete(doppler_frame_done_level),
+    .frame_complete(doppler_frame_done),
     .status()
 );
 

9_Firmware/9_2_FPGA/radar_system_top.v

@@ -1,7 +1,5 @@
 `timescale 1ns / 1ps
 
-`include "radar_params.vh"
-
 /**
  * radar_system_top.v
  * 
@@ -124,7 +122,7 @@ module radar_system_top (
     output wire [31:0] dbg_doppler_data,
     output wire dbg_doppler_valid,
     output wire [4:0] dbg_doppler_bin,
-    output wire [`RP_RANGE_BIN_BITS-1:0] dbg_range_bin,
+    output wire [5:0] dbg_range_bin,
     
     // System status
     output wire [3:0] system_status,
@@ -178,11 +176,9 @@ wire tx_current_chirp_sync_valid;
 wire [31:0] rx_doppler_output;
 wire rx_doppler_valid;
 wire [4:0] rx_doppler_bin;
-wire [`RP_RANGE_BIN_BITS-1:0] rx_range_bin;
+wire [5:0] rx_range_bin;
 wire [31:0] rx_range_profile;
 wire rx_range_valid;
-wire [15:0] rx_range_profile_decimated;
-wire rx_range_profile_decimated_valid;
 wire [15:0] rx_doppler_real;
 wire [15:0] rx_doppler_imag;
 wire rx_doppler_data_valid;
@@ -227,7 +223,7 @@ wire [15:0] usb_cmd_value;
 reg [1:0]  host_radar_mode;
 reg        host_trigger_pulse;
 reg [15:0] host_detect_threshold;  // (was host_cfar_threshold)
-reg [5:0]  host_stream_control;
+reg [2:0]  host_stream_control;
 
 // Fix 3: Digital gain control register
 // [3]=direction: 0=amplify, 1=attenuate. [2:0]=shift amount 0..7.
@@ -254,12 +250,13 @@ reg        host_status_request;       // Opcode 0xFF (self-clearing pulse)
 localparam DOPPLER_FRAME_CHIRPS = 32; // Total chirps per Doppler frame
 reg        chirps_mismatch_error;     // Set if host tried to set chirps != FFT size
 
-// Range-mode register (opcode 0x20)
+// Fix 7: Range-mode register (opcode 0x20)
-// Controls chirp type selection in the mode controller:
+// Future-proofing for 3km/10km antenna switching.
-//   2'b00 = 3 km mode (all short chirps — long blind zone > max range)
+//   2'b00 = Auto (default — system selects based on scene)
-//   2'b01 = Long-range (dual chirp: first half long, second half short)
+//   2'b01 = Short-range (3km)
-//   2'b10 = Reserved
+//   2'b10 = Long-range (10km)
 //   2'b11 = Reserved
+// Currently a configuration store only — antenna/timing switching TBD.
 reg [1:0]  host_range_mode;
 
 // CFAR configuration registers (host-configurable via USB)
@@ -522,16 +519,14 @@ radar_receiver_final rx_inst (
     .doppler_bin(rx_doppler_bin),
     .range_bin(rx_range_bin),
     
-    // Range-profile outputs
+    // Matched filter range profile (for USB)
     .range_profile_i_out(rx_range_profile[15:0]),
     .range_profile_q_out(rx_range_profile[31:16]),
     .range_profile_valid_out(rx_range_valid),
-    .decimated_range_mag_out(rx_range_profile_decimated),
-    .decimated_range_valid_out(rx_range_profile_decimated_valid),
     
+    // Host command inputs (Gap 4: USB Read Path)
     .host_mode(host_radar_mode),
     .host_trigger(host_trigger_pulse),
-    .host_range_mode(host_range_mode),
     // Gap 2: Host-configurable chirp timing
     .host_long_chirp_cycles(host_long_chirp_cycles),
     .host_long_listen_cycles(host_long_listen_cycles),
@@ -601,7 +596,7 @@ assign dc_notch_active = (host_dc_notch_width != 3'd0) &&
 wire [31:0] notched_doppler_data  = dc_notch_active ? 32'd0 : rx_doppler_output;
 wire        notched_doppler_valid = rx_doppler_valid;
 wire [4:0]  notched_doppler_bin   = rx_doppler_bin;
-wire [`RP_RANGE_BIN_BITS-1:0]  notched_range_bin     = rx_range_bin;
+wire [5:0]  notched_range_bin     = rx_range_bin;
 
 // ============================================================================
 // CFAR DETECTOR (replaces simple threshold detector)
@@ -612,7 +607,7 @@ wire [`RP_RANGE_BIN_BITS-1:0]  notched_range_bin     = rx_range_bin;
 
 wire cfar_detect_flag;
 wire cfar_detect_valid;
-wire [`RP_RANGE_BIN_BITS-1:0]  cfar_detect_range;
+wire [5:0]  cfar_detect_range;
 wire [4:0]  cfar_detect_doppler;
 wire [16:0] cfar_detect_magnitude;
 wire [16:0] cfar_detect_threshold;
@@ -703,10 +698,9 @@ end
 // DATA PACKING FOR USB
 // ============================================================================
 
-// USB range profile must match the advertised 512-bin frame payload, so source it
+// Range profile from matched filter output (wired through radar_receiver_final)
-// from the decimated range stream that feeds Doppler rather than raw MF samples.
+assign usb_range_profile = rx_range_profile;
-assign usb_range_profile = {16'd0, rx_range_profile_decimated};
+assign usb_range_valid = rx_range_valid;
-assign usb_range_valid = rx_range_profile_decimated_valid;
 
 assign usb_doppler_real = rx_doppler_real;
 assign usb_doppler_imag = rx_doppler_imag;
@@ -809,11 +803,6 @@ end else begin : gen_ft2232h
         .cfar_detection(usb_detect_flag),
         .cfar_valid(usb_detect_valid),
 
-        // Bulk frame protocol inputs
-        .range_bin_in(notched_range_bin),
-        .doppler_bin_in(notched_doppler_bin),
-        .frame_complete(rx_frame_complete),
-
         // FT2232H Interface
         .ft_data(ft_data),
         .ft_rxf_n(ft_rxf_n),
@@ -922,7 +911,7 @@ always @(posedge clk_100m_buf or negedge sys_reset_n) begin
         host_radar_mode    <= 2'b01;   // Default: auto-scan
         host_trigger_pulse <= 1'b0;
         host_detect_threshold <= 16'd10000; // Default threshold
-        host_stream_control <= `RP_STREAM_CTRL_DEFAULT; // Default: all streams, mag-only mode
+        host_stream_control <= 3'b111;    // Default: all streams enabled
         host_gain_shift     <= 4'd0;      // Default: pass-through (no gain change)
         // Gap 2: chirp timing defaults (match radar_mode_controller parameters)
         host_long_chirp_cycles  <= 16'd3000;
@@ -933,7 +922,7 @@ always @(posedge clk_100m_buf or negedge sys_reset_n) begin
         host_chirps_per_elev    <= 6'd32;
         host_status_request     <= 1'b0;
         chirps_mismatch_error   <= 1'b0;
-        host_range_mode         <= 2'b00;     // Default: 3 km mode (all short chirps)
+        host_range_mode         <= 2'b00;     // Default: auto
         // CFAR defaults (disabled by default — backward-compatible)
         host_cfar_guard         <= 4'd2;      // 2 guard cells each side
         host_cfar_train         <= 5'd8;      // 8 training cells each side
@@ -960,7 +949,7 @@ always @(posedge clk_100m_buf or negedge sys_reset_n) begin
                 8'h01: host_radar_mode     <= usb_cmd_value[1:0];
                 8'h02: host_trigger_pulse  <= 1'b1;
                 8'h03: host_detect_threshold <= usb_cmd_value;
-                8'h04: host_stream_control <= usb_cmd_value[5:0];
+                8'h04: host_stream_control <= usb_cmd_value[2:0];
                 // Gap 2: chirp timing configuration
                 8'h10: host_long_chirp_cycles  <= usb_cmd_value;
                 8'h11: host_long_listen_cycles <= usb_cmd_value;
@@ -983,7 +972,7 @@ always @(posedge clk_100m_buf or negedge sys_reset_n) begin
                     end
                 end
                 8'h16: host_gain_shift         <= usb_cmd_value[3:0];  // Fix 3: digital gain
-                8'h20: host_range_mode         <= usb_cmd_value[1:0];  // Range mode
+                8'h20: host_range_mode         <= usb_cmd_value[1:0];  // Fix 7: range mode
                 // CFAR configuration opcodes
                 8'h21: host_cfar_guard         <= usb_cmd_value[3:0];
                 8'h22: host_cfar_train         <= usb_cmd_value[4:0];

9_Firmware/9_2_FPGA/range_bin_decimator.v

@@ -3,7 +3,7 @@
 /**
  * range_bin_decimator.v
  *
- * Reduces 2048 range bins from the matched filter output down to 512 bins
+ * Reduces 1024 range bins from the matched filter output down to 64 bins
  * for the Doppler processor. Supports multiple decimation modes:
  *
  *   Mode 2'b00: Simple decimation (take every Nth sample)
@@ -11,31 +11,29 @@
  *   Mode 2'b10: Averaging (sum group and divide by N)
  *   Mode 2'b11: Reserved
  *
- * Interface contract (from radar_receiver_final.v):
+ * Interface contract (from radar_receiver_final.v line 229):
  *   .clk, .reset_n
- *   .range_i_in, .range_q_in, .range_valid_in   <- from matched_filter output
+ *   .range_i_in, .range_q_in, .range_valid_in   ← from matched_filter output
- *   .range_i_out, .range_q_out, .range_valid_out -> to Doppler processor
+ *   .range_i_out, .range_q_out, .range_valid_out → to Doppler processor
- *   .range_bin_index                             -> 9-bit output bin index
+ *   .range_bin_index                             → 6-bit output bin index
- *   .decimation_mode                             <- 2-bit mode select
+ *   .decimation_mode                             ← 2-bit mode select
- *   .start_bin                                   <- 11-bit start offset
+ *   .start_bin                                   ← 10-bit start offset
  *
  * start_bin usage:
  *   When start_bin > 0, the decimator skips the first 'start_bin' valid
  *   input samples before beginning decimation. This allows selecting a
- *   region of interest within the 2048 range bins (e.g., to focus on
+ *   region of interest within the 1024 range bins (e.g., to focus on
  *   near-range or far-range targets). When start_bin = 0 (default),
- *   all 2048 bins are processed starting from bin 0.
+ *   all 1024 bins are processed starting from bin 0.
  *
  * Clock domain: clk (100 MHz)
- * Decimation: 2048 -> 512 (factor of 4)
+ * Decimation: 1024 → 64 (factor of 16)
  */
 
-`include "radar_params.vh"
-
 module range_bin_decimator #(
-    parameter INPUT_BINS        = `RP_FFT_SIZE,          // 2048
+    parameter INPUT_BINS        = 1024,
-    parameter OUTPUT_BINS       = `RP_NUM_RANGE_BINS,    // 512
+    parameter OUTPUT_BINS       = 64,
-    parameter DECIMATION_FACTOR = `RP_DECIMATION_FACTOR  // 4
+    parameter DECIMATION_FACTOR = 16
 ) (
     input wire clk,
     input wire reset_n,
@@ -49,11 +47,11 @@ module range_bin_decimator #(
     output reg signed [15:0] range_i_out,
     output reg signed [15:0] range_q_out,
     output reg range_valid_out,
-    output reg [`RP_RANGE_BIN_BITS-1:0] range_bin_index,  // 9-bit
+    output reg [5:0] range_bin_index,
 
     // Configuration
     input wire [1:0] decimation_mode,  // 00=decimate, 01=peak, 10=average
-    input wire [10:0] start_bin,       // First input bin to process (11-bit for 2048)
+    input wire [9:0] start_bin,        // First input bin to process
 
     // Diagnostics
     output reg watchdog_timeout        // Pulses high for 1 cycle on watchdog reset
@@ -61,10 +59,10 @@ module range_bin_decimator #(
 `ifdef FORMAL
     ,
     output wire [2:0]  fv_state,
-    output wire [10:0] fv_in_bin_count,
+    output wire [9:0]  fv_in_bin_count,
-    output wire [1:0]  fv_group_sample_count,
+    output wire [3:0]  fv_group_sample_count,
-    output wire [8:0]  fv_output_bin_count,
+    output wire [5:0]  fv_output_bin_count,
-    output wire [10:0] fv_skip_count
+    output wire [9:0]  fv_skip_count
 `endif
 );
 
@@ -77,12 +75,12 @@ localparam WATCHDOG_LIMIT = 10'd256;
 // INTERNAL SIGNALS
 // ============================================================================
 
-// Input bin counter (0..2047)
+// Input bin counter (0..1023)
-reg [10:0] in_bin_count;
+reg [9:0] in_bin_count;
 
 // Group tracking
-reg [1:0] group_sample_count;   // 0..3 within current group of 4
+reg [3:0] group_sample_count;  // 0..15 within current group of 16
-reg [8:0] output_bin_count;     // 0..511 output bin index
+reg [5:0] output_bin_count;    // 0..63 output bin index
 
 // State machine
 reg [2:0] state;
@@ -93,7 +91,7 @@ localparam ST_EMIT    = 3'd3;
 localparam ST_DONE    = 3'd4;
 
 // Skip counter for start_bin
-reg [10:0] skip_count;
+reg [9:0] skip_count;
 
 // Watchdog counter — counts consecutive clocks with no range_valid_in
 reg [9:0] watchdog_count;
@@ -109,7 +107,7 @@ assign fv_skip_count         = skip_count;
 // ============================================================================
 // PEAK DETECTION (Mode 01)
 // ============================================================================
-// Track the sample with the largest magnitude in the current group of 4
+// Track the sample with the largest magnitude in the current group of 16
 reg signed [15:0] peak_i, peak_q;
 reg [16:0] peak_mag;  // |I| + |Q| approximation
 wire [16:0] cur_mag;
@@ -122,8 +120,8 @@ assign cur_mag = {1'b0, abs_i} + {1'b0, abs_q};
 // ============================================================================
 // AVERAGING (Mode 10)
 // ============================================================================
-// Accumulate I and Q separately, then divide by DECIMATION_FACTOR (>>2)
+// Accumulate I and Q separately, then divide by DECIMATION_FACTOR (>>4)
-reg signed [17:0] sum_i, sum_q;  // 16 + 2 guard bits for sum of 4 values
+reg signed [19:0] sum_i, sum_q;  // 16 + 4 guard bits for sum of 16 values
 
 // ============================================================================
 // SIMPLE DECIMATION (Mode 00)
@@ -137,21 +135,21 @@ reg signed [15:0] decim_i, decim_q;
 always @(posedge clk or negedge reset_n) begin
     if (!reset_n) begin
         state             <= ST_IDLE;
-        in_bin_count      <= 11'd0;
+        in_bin_count      <= 10'd0;
-        group_sample_count <= 2'd0;
+        group_sample_count <= 4'd0;
-        output_bin_count  <= 9'd0;
+        output_bin_count  <= 6'd0;
-        skip_count        <= 11'd0;
+        skip_count        <= 10'd0;
         watchdog_count    <= 10'd0;
         watchdog_timeout  <= 1'b0;
         range_valid_out   <= 1'b0;
         range_i_out       <= 16'd0;
         range_q_out       <= 16'd0;
-        range_bin_index   <= {`RP_RANGE_BIN_BITS{1'b0}};
+        range_bin_index   <= 6'd0;
         peak_i            <= 16'd0;
         peak_q            <= 16'd0;
         peak_mag          <= 17'd0;
-        sum_i             <= 18'd0;
+        sum_i             <= 20'd0;
-        sum_q             <= 18'd0;
+        sum_q             <= 20'd0;
         decim_i           <= 16'd0;
         decim_q           <= 16'd0;
     end else begin
@@ -164,33 +162,33 @@ always @(posedge clk or negedge reset_n) begin
         // IDLE: Wait for first valid input
         // ================================================================
         ST_IDLE: begin
-            in_bin_count       <= 11'd0;
+            in_bin_count       <= 10'd0;
-            group_sample_count <= 2'd0;
+            group_sample_count <= 4'd0;
-            output_bin_count   <= 9'd0;
+            output_bin_count   <= 6'd0;
-            skip_count         <= 11'd0;
+            skip_count         <= 10'd0;
             watchdog_count     <= 10'd0;
             peak_i             <= 16'd0;
             peak_q             <= 16'd0;
             peak_mag           <= 17'd0;
-            sum_i              <= 18'd0;
+            sum_i              <= 20'd0;
-            sum_q              <= 18'd0;
+            sum_q              <= 20'd0;
 
             if (range_valid_in) begin
-                in_bin_count <= 11'd1;
+                in_bin_count <= 10'd1;
 
-                if (start_bin > 11'd0) begin
+                if (start_bin > 10'd0) begin
                     // Need to skip 'start_bin' samples first
-                    skip_count <= 11'd1;
+                    skip_count <= 10'd1;
                     state      <= ST_SKIP;
                 end else begin
                     // No skip — process first sample immediately
                     state              <= ST_PROCESS;
-                    group_sample_count <= 2'd1;
+                    group_sample_count <= 4'd1;
 
                     // Mode-specific first sample handling
                     case (decimation_mode)
                     2'b00: begin  // Simple decimation — check if center sample
-                        if (2'd0 == (DECIMATION_FACTOR / 2)) begin
+                        if (4'd0 == (DECIMATION_FACTOR / 2)) begin
                             decim_i <= range_i_in;
                             decim_q <= range_q_in;
                         end
@@ -201,8 +199,8 @@ always @(posedge clk or negedge reset_n) begin
                         peak_mag <= cur_mag;
                     end
                     2'b10: begin  // Averaging
-                        sum_i <= {{2{range_i_in[15]}}, range_i_in};
+                        sum_i <= {{4{range_i_in[15]}}, range_i_in};
-                        sum_q <= {{2{range_q_in[15]}}, range_q_in};
+                        sum_q <= {{4{range_q_in[15]}}, range_q_in};
                     end
                     default: ;
                     endcase
@@ -221,11 +219,11 @@ always @(posedge clk or negedge reset_n) begin
                 if (skip_count >= start_bin) begin
                     // Done skipping — this sample is the first to process
                     state              <= ST_PROCESS;
-                    group_sample_count <= 2'd1;
+                    group_sample_count <= 4'd1;
 
                     case (decimation_mode)
                     2'b00: begin
-                        if (2'd0 == (DECIMATION_FACTOR / 2)) begin
+                        if (4'd0 == (DECIMATION_FACTOR / 2)) begin
                             decim_i <= range_i_in;
                             decim_q <= range_q_in;
                         end
@@ -236,8 +234,8 @@ always @(posedge clk or negedge reset_n) begin
                         peak_mag <= cur_mag;
                     end
                     2'b10: begin
-                        sum_i <= {{2{range_i_in[15]}}, range_i_in};
+                        sum_i <= {{4{range_i_in[15]}}, range_i_in};
-                        sum_q <= {{2{range_q_in[15]}}, range_q_in};
+                        sum_q <= {{4{range_q_in[15]}}, range_q_in};
                     end
                     default: ;
                     endcase
@@ -283,8 +281,8 @@ always @(posedge clk or negedge reset_n) begin
                     end
                 end
                 2'b10: begin  // Averaging
-                    sum_i <= sum_i + {{2{range_i_in[15]}}, range_i_in};
+                    sum_i <= sum_i + {{4{range_i_in[15]}}, range_i_in};
-                    sum_q <= sum_q + {{2{range_q_in[15]}}, range_q_in};
+                    sum_q <= sum_q + {{4{range_q_in[15]}}, range_q_in};
                 end
                 default: ;
                 endcase
@@ -293,7 +291,7 @@ always @(posedge clk or negedge reset_n) begin
                 if (group_sample_count == DECIMATION_FACTOR - 1) begin
                     // Group complete — emit output
                     state <= ST_EMIT;
-                    group_sample_count <= 2'd0;
+                    group_sample_count <= 4'd0;
                 end else if (in_bin_count >= INPUT_BINS - 1) begin
                     // Overflow guard: consumed all input bins but group
                     // is not yet complete. Stop to prevent corruption of
@@ -333,9 +331,9 @@ always @(posedge clk or negedge reset_n) begin
                 range_i_out <= peak_i;
                 range_q_out <= peak_q;
             end
-            2'b10: begin  // Averaging (sum >> 2 = divide by 4)
+            2'b10: begin  // Averaging (sum >> 4 = divide by 16)
-                range_i_out <= sum_i[17:2];
+                range_i_out <= sum_i[19:4];
-                range_q_out <= sum_q[17:2];
+                range_q_out <= sum_q[19:4];
             end
             default: begin
                 range_i_out <= 16'd0;
@@ -347,8 +345,8 @@ always @(posedge clk or negedge reset_n) begin
             peak_i   <= 16'd0;
             peak_q   <= 16'd0;
             peak_mag <= 17'd0;
-            sum_i    <= 18'd0;
+            sum_i    <= 20'd0;
-            sum_q    <= 18'd0;
+            sum_q    <= 20'd0;
 
             // Advance output bin
             output_bin_count <= output_bin_count + 1;
@@ -360,12 +358,12 @@ always @(posedge clk or negedge reset_n) begin
                 // If we already have valid input waiting, process it immediately
                 if (range_valid_in) begin
                     state              <= ST_PROCESS;
-                    group_sample_count <= 2'd1;
+                    group_sample_count <= 4'd1;
                     in_bin_count       <= in_bin_count + 1;
 
                     case (decimation_mode)
                     2'b00: begin
-                        if (2'd0 == (DECIMATION_FACTOR / 2)) begin
+                        if (4'd0 == (DECIMATION_FACTOR / 2)) begin
                             decim_i <= range_i_in;
                             decim_q <= range_q_in;
                         end
@@ -376,20 +374,20 @@ always @(posedge clk or negedge reset_n) begin
                         peak_mag <= cur_mag;
                     end
                     2'b10: begin
-                        sum_i <= {{2{range_i_in[15]}}, range_i_in};
+                        sum_i <= {{4{range_i_in[15]}}, range_i_in};
-                        sum_q <= {{2{range_q_in[15]}}, range_q_in};
+                        sum_q <= {{4{range_q_in[15]}}, range_q_in};
                     end
                     default: ;
                     endcase
                 end else begin
                     state <= ST_PROCESS;
-                    group_sample_count <= 2'd0;
+                    group_sample_count <= 4'd0;
                 end
             end
         end
 
         // ================================================================
-        // DONE: All 512 output bins emitted, return to idle
+        // DONE: All 64 output bins emitted, return to idle
         // ================================================================
         ST_DONE: begin
             state <= ST_IDLE;

9_Firmware/9_2_FPGA/run_regression.sh

@@ -315,79 +315,11 @@ run_mf_cosim() {
     PASS=$((PASS + 1))
 }
 
-# ---------------------------------------------------------------------------
-# Helper: compile, run, and compare a Doppler co-sim scenario
-#   run_doppler_cosim <scenario_name> <define_flag>
-# ---------------------------------------------------------------------------
-run_doppler_cosim() {
-    local name="$1"
-    local define="$2"
-    local vvp="tb/tb_doppler_cosim_${name}.vvp"
-
-    printf "  %-45s " "Doppler Co-Sim ($name)"
-
-    # Compile — build command as string to handle optional define
-    local cmd="iverilog -g2001 -DSIMULATION"
-    if [[ -n "$define" ]]; then
-        cmd="$cmd $define"
-    fi
-    cmd="$cmd -o $vvp tb/tb_doppler_cosim.v doppler_processor.v xfft_16.v fft_engine.v"
-
-    if ! eval "$cmd" 2>/tmp/iverilog_err_$$; then
-        echo -e "${RED}COMPILE FAIL${NC}"
-        ERRORS="$ERRORS\n  Doppler Co-Sim ($name): compile error ($(head -1 /tmp/iverilog_err_$$))"
-        FAIL=$((FAIL + 1))
-        return
-    fi
-
-    # Run TB
-    local output
-    output=$(timeout 120 vvp "$vvp" 2>&1) || true
-    rm -f "$vvp"
-
-    # Check TB internal pass/fail
-    local tb_fail
-    tb_fail=$(echo "$output" | grep -Ec '^\[FAIL' || true)
-    if [[ "$tb_fail" -gt 0 ]]; then
-        echo -e "${RED}FAIL${NC} (TB internal failure)"
-        ERRORS="$ERRORS\n  Doppler Co-Sim ($name): TB internal failure"
-        FAIL=$((FAIL + 1))
-        return
-    fi
-
-    # Run Python compare
-    if command -v python3 >/dev/null 2>&1; then
-        local compare_out
-        local compare_rc=0
-        compare_out=$(python3 tb/cosim/compare_doppler.py "$name" 2>&1) || compare_rc=$?
-        if [[ "$compare_rc" -ne 0 ]]; then
-            echo -e "${RED}FAIL${NC} (compare_doppler.py mismatch)"
-            ERRORS="$ERRORS\n  Doppler Co-Sim ($name): Python compare failed"
-            FAIL=$((FAIL + 1))
-            return
-        fi
-    else
-        echo -e "${YELLOW}SKIP${NC} (RTL passed, python3 not found — compare skipped)"
-        SKIP=$((SKIP + 1))
-        return
-    fi
-
-    echo -e "${GREEN}PASS${NC} (RTL + Python compare)"
-    PASS=$((PASS + 1))
-}
-
 # ---------------------------------------------------------------------------
 # Helper: compile and run a single testbench
 #   run_test <name> <vvp_path> <iverilog_args...>
 # ---------------------------------------------------------------------------
 run_test() {
-    # Optional: --timeout=N as first arg overrides default 120s
-    local timeout_secs=120
-    if [[ "$1" == --timeout=* ]]; then
-        timeout_secs="${1#--timeout=}"
-        shift
-    fi
-
     local name="$1"
     local vvp="$2"
     shift 2
@@ -405,7 +337,7 @@ run_test() {
 
     # Run
     local output
-    output=$(timeout "$timeout_secs" vvp "$vvp" 2>&1) || true
+    output=$(timeout 120 vvp "$vvp" 2>&1) || true
 
     # Count PASS/FAIL in output (testbenches use explicit [PASS]/[FAIL] markers)
     local test_pass test_fail
@@ -497,9 +429,9 @@ run_test "Chirp Contract" \
     tb/tb_chirp_ctr_reg.vvp \
     tb/tb_chirp_contract.v plfm_chirp_controller.v
 
-run_doppler_cosim "stationary"   ""
+run_test "Doppler Processor (DSP48)" \
-run_doppler_cosim "moving"       "-DSCENARIO_MOVING"
+    tb/tb_doppler_reg.vvp \
-run_doppler_cosim "two_targets"  "-DSCENARIO_TWO"
+    tb/tb_doppler_cosim.v doppler_processor.v xfft_16.v fft_engine.v
 
 run_test "Threshold Detector (detection bugs)" \
     tb/tb_threshold_detector.vvp \
@@ -555,23 +487,6 @@ if [[ "$QUICK" -eq 0 ]]; then
     # A proper full-pipeline co-sim (DDC→MF→Decim→Doppler vs Python) is
     # planned as a replacement (Phase C of CI test plan).
 
-    # Receiver integration (structural + bounds + pulse assertions)
-    # Tests the full RX pipeline: ADC stub → DDC → MF → Decim → Doppler
-    # Verifies doppler_frame_done is a single-cycle pulse (catches
-    # level-vs-pulse wiring bugs at module boundaries).
-    run_test --timeout=600 "Receiver Integration (tb_radar_receiver_final)" \
-        tb/tb_rx_final_reg.vvp \
-        tb/tb_radar_receiver_final.v \
-        radar_receiver_final.v tb/ad9484_interface_400m_stub.v \
-        ddc_400m.v nco_400m_enhanced.v cic_decimator_4x_enhanced.v \
-        cdc_modules.v fir_lowpass.v ddc_input_interface.v \
-        rx_gain_control.v \
-        chirp_memory_loader_param.v latency_buffer.v \
-        matched_filter_multi_segment.v matched_filter_processing_chain.v \
-        range_bin_decimator.v mti_canceller.v \
-        doppler_processor.v xfft_16.v fft_engine.v \
-        radar_mode_controller.v
-
     # Full system top (monitoring-only, legacy)
     run_test "System Top (radar_system_tb)" \
         tb/tb_system_reg.vvp \

9_Firmware/9_2_FPGA/rx_gain_control.v

@@ -54,7 +54,7 @@ module rx_gain_control (
     input  wire [3:0]  agc_decay,      // 0x2B: amplification step when weak (default 1)
     input  wire [3:0]  agc_holdoff,    // 0x2C: frames to wait before gain-up (default 4)
 
-    // Frame boundary pulse (1 clk cycle, from edge detector in radar_receiver_final)
+    // Frame boundary pulse (1 clk cycle, from Doppler frame_complete)
     input  wire        frame_boundary,
 
     // Data output (to matched filter)

9_Firmware/9_2_FPGA/tb/cosim/compare_doppler.py

@@ -34,8 +34,8 @@ sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 # =============================================================================
 
 DOPPLER_FFT = 32
-RANGE_BINS = 512
+RANGE_BINS = 64
-TOTAL_OUTPUTS = RANGE_BINS * DOPPLER_FFT  # 16384
+TOTAL_OUTPUTS = RANGE_BINS * DOPPLER_FFT  # 2048
 SUBFRAME_SIZE = 16
 
 SCENARIOS = {
@@ -246,7 +246,7 @@ def compare_scenario(name, config, base_dir):
     # ---- Pass/Fail ----
     checks = []
 
-    checks.append(('RTL output count == 16384', count_ok))
+    checks.append(('RTL output count == 2048', count_ok))
 
     energy_ok = (ENERGY_RATIO_MIN < energy_ratio < ENERGY_RATIO_MAX)
     checks.append((f'Energy ratio in bounds '

9_Firmware/9_2_FPGA/tb/cosim/compare_mf.py

@@ -36,7 +36,7 @@ sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 # Configuration
 # =============================================================================
 
-FFT_SIZE = 2048
+FFT_SIZE = 1024
 
 SCENARIOS = {
     'chirp': {
@@ -243,7 +243,7 @@ def compare_scenario(scenario_name, config, base_dir):
 
     # Check 2: RTL produced expected sample count
     correct_count = len(rtl_i) == FFT_SIZE
-    checks.append(('Correct output count (2048)', correct_count))
+    checks.append(('Correct output count (1024)', correct_count))
 
     # Check 3: Energy ratio within generous bounds
     # Allow very wide range since twiddle differences cause large gain variation

9_Firmware/9_2_FPGA/tb/cosim/fpga_model.py

@@ -709,23 +709,14 @@ class DDCInputInterface:
 # FFT Engine (1024-point radix-2 DIT, in-place, 32-bit internal)
 # =============================================================================
 
-def load_twiddle_rom(filepath=None, n=2048):
+def load_twiddle_rom(filepath=None):
     """
-    Load quarter-wave cosine ROM from hex file.
+    Load 256-entry quarter-wave cosine ROM from hex file.
-    Returns list of N/4 signed 16-bit integers.
+    Returns list of 256 signed 16-bit integers.
-
-    For N=2048: loads fft_twiddle_2048.mem (512 entries).
-    For N=1024: loads fft_twiddle_1024.mem (256 entries).
-    For N=16:   loads fft_twiddle_16.mem (4 entries).
     """
     if filepath is None:
         # Default path relative to this file
         base = os.path.dirname(os.path.abspath(__file__))
-        if n == 2048:
-            filepath = os.path.join(base, '..', '..', 'fft_twiddle_2048.mem')
-        elif n == 16:
-            filepath = os.path.join(base, '..', '..', 'fft_twiddle_16.mem')
-        else:
         filepath = os.path.join(base, '..', '..', 'fft_twiddle_1024.mem')
 
     values = []
@@ -768,17 +759,17 @@ class FFTEngine:
     """
     Bit-accurate model of fft_engine.v
 
-    2048-point radix-2 DIT FFT/IFFT.
+    1024-point radix-2 DIT FFT/IFFT.
     Internal: 32-bit signed working data.
     Twiddle: 16-bit Q15 from quarter-wave cosine ROM.
     Butterfly: multiply 32x16->49 bits, >>>15, add/subtract.
     Output: saturate 32->16 bits. IFFT also >>>LOG2N before saturate.
     """
 
-    def __init__(self, n=2048, twiddle_file=None):
+    def __init__(self, n=1024, twiddle_file=None):
         self.N = n
         self.LOG2N = n.bit_length() - 1
-        self.cos_rom = load_twiddle_rom(twiddle_file, n=n)
+        self.cos_rom = load_twiddle_rom(twiddle_file)
         # Working memory (32-bit signed I/Q pairs)
         self.mem_re = [0] * n
         self.mem_im = [0] * n
@@ -951,21 +942,21 @@ class MatchedFilterChain:
     Uses a single FFTEngine instance (as in RTL, engine is reused).
     """
 
-    def __init__(self, fft_size=2048, twiddle_file=None):
+    def __init__(self, fft_size=1024, twiddle_file=None):
         self.fft_size = fft_size
         self.fft = FFTEngine(n=fft_size, twiddle_file=twiddle_file)
         self.conj_mult = FreqMatchedFilter()
 
     def process(self, sig_re, sig_im, ref_re, ref_im):
         """
-        Run matched filter on signal + reference.
+        Run matched filter on 1024-sample signal + reference.
 
         Args:
-            sig_re/im: signal I/Q (16-bit signed, fft_size samples)
+            sig_re/im: signal I/Q (16-bit signed, 1024 samples)
-            ref_re/im: reference chirp I/Q (16-bit signed, fft_size samples)
+            ref_re/im: reference chirp I/Q (16-bit signed, 1024 samples)
 
         Returns:
-            (range_profile_re, range_profile_im): fft_size x 16-bit signed
+            (range_profile_re, range_profile_im): 1024 x 16-bit signed
         """
         # Forward FFT of signal
         sig_fft_re, sig_fft_im = self.fft.compute(sig_re, sig_im, inverse=False)
@@ -993,27 +984,27 @@ class RangeBinDecimator:
     Bit-accurate model of range_bin_decimator.v
 
     Three modes:
-      00: Simple decimation (take center sample at index 2)
+      00: Simple decimation (take center sample at index 8)
       01: Peak detection (max |I|+|Q|)
-      10: Averaging (sum >> 2, truncation)
+      10: Averaging (sum >> 4, truncation)
       11: Reserved (output 0)
     """
 
-    DECIMATION_FACTOR = 4
+    DECIMATION_FACTOR = 16
-    OUTPUT_BINS = 512
+    OUTPUT_BINS = 64
 
     @staticmethod
     def decimate(range_re, range_im, mode=1, start_bin=0):
         """
-        Decimate 2048 range bins to 512.
+        Decimate 1024 range bins to 64.
 
         Args:
-            range_re/im: 2048 x signed 16-bit
+            range_re/im: 1024 x signed 16-bit
             mode: 0=center, 1=peak, 2=average, 3=zero
-            start_bin: first input bin to process (0-2047)
+            start_bin: first input bin to process (0-1023)
 
         Returns:
-            (out_re, out_im): 512 x signed 16-bit
+            (out_re, out_im): 64 x signed 16-bit
         """
         out_re = []
         out_im = []
@@ -1061,9 +1052,9 @@ class RangeBinDecimator:
                     if idx < len(range_re):
                         sum_re += sign_extend(range_re[idx] & 0xFFFF, 16)
                         sum_im += sign_extend(range_im[idx] & 0xFFFF, 16)
-                # Truncate (arithmetic right shift by 2), take 16 bits
+                # Truncate (arithmetic right shift by 4), take 16 bits
-                out_re.append(sign_extend((sum_re >> 2) & 0xFFFF, 16))
+                out_re.append(sign_extend((sum_re >> 4) & 0xFFFF, 16))
-                out_im.append(sign_extend((sum_im >> 2) & 0xFFFF, 16))
+                out_im.append(sign_extend((sum_im >> 4) & 0xFFFF, 16))
 
             else:
                 # Mode 3: reserved, output 0
@@ -1099,7 +1090,7 @@ class DopplerProcessor:
     """
 
     DOPPLER_FFT_SIZE = 16     # Per sub-frame
-    RANGE_BINS = 512
+    RANGE_BINS = 64
     CHIRPS_PER_FRAME = 32
     CHIRPS_PER_SUBFRAME = 16
 
@@ -1135,11 +1126,11 @@ class DopplerProcessor:
         Process one complete Doppler frame using dual 16-pt FFTs.
 
         Args:
-            chirp_data_i: 2D array [32 chirps][512 range bins] of signed 16-bit I
+            chirp_data_i: 2D array [32 chirps][64 range bins] of signed 16-bit I
-            chirp_data_q: 2D array [32 chirps][512 range bins] of signed 16-bit Q
+            chirp_data_q: 2D array [32 chirps][64 range bins] of signed 16-bit Q
 
         Returns:
-            (doppler_map_i, doppler_map_q): 2D arrays [512 range bins][32 doppler bins]
+            (doppler_map_i, doppler_map_q): 2D arrays [64 range bins][32 doppler bins]
                                             of signed 16-bit
                                             Bins 0-15 = sub-frame 0 (long PRI)
                                             Bins 16-31 = sub-frame 1 (short PRI)
@@ -1222,7 +1213,7 @@ class SignalChain:
     IF_FREQ = 120_000_000    # IF frequency
     FTW_120MHZ = 0x4CCCCCCD  # Phase increment for 120 MHz at 400 MSPS
 
-    def __init__(self, twiddle_file_2048=None, twiddle_file_16=None):
+    def __init__(self, twiddle_file_1024=None, twiddle_file_16=None):
         self.nco = NCO()
         self.mixer = Mixer()
         self.cic_i = CICDecimator()
@@ -1230,7 +1221,7 @@ class SignalChain:
         self.fir_i = FIRFilter()
         self.fir_q = FIRFilter()
         self.ddc_interface = DDCInputInterface()
-        self.matched_filter = MatchedFilterChain(fft_size=2048, twiddle_file=twiddle_file_2048)
+        self.matched_filter = MatchedFilterChain(fft_size=1024, twiddle_file=twiddle_file_1024)
         self.range_decimator = RangeBinDecimator()
         self.doppler = DopplerProcessor(twiddle_file_16=twiddle_file_16)
 

9_Firmware/9_2_FPGA/tb/cosim/gen_chirp_mem.py

@@ -2,22 +2,34 @@
 """
 gen_chirp_mem.py — Generate all chirp .mem files for AERIS-10 FPGA.
 
-Generates the 6 chirp .mem files used by chirp_memory_loader_param.v:
+Generates the 10 chirp .mem files used by chirp_memory_loader_param.v:
-  - long_chirp_seg{0,1}_{i,q}.mem  (4 files, 2048 lines each)
+  - long_chirp_seg{0,1,2,3}_{i,q}.mem  (8 files, 1024 lines each)
   - short_chirp_{i,q}.mem              (2 files, 50 lines each)
 
 Long chirp:
   The 3000-sample baseband chirp (30 us at 100 MHz system clock) is
-  segmented into 2 blocks of 2048 samples.  Each segment covers a
+  segmented into 4 blocks of 1024 samples.  Each segment covers a
   different time window of the chirp:
-    seg0: samples    0 .. 2047
+    seg0: samples   0 .. 1023
-    seg1: samples 2048 .. 4095  (only 952 valid chirp samples; 1096 zeros)
+    seg1: samples 1024 .. 2047
+    seg2: samples 2048 .. 3071  (only 952 valid chirp samples; 72 zeros)
+    seg3: all zeros (seg3 starts at sample 3072, past chirp end at 3000)
 
-  The memory loader stores 2*2048 = 4096 contiguous samples indexed
+  Wait — actually the memory loader stores 4*1024 = 4096 contiguous
-  by {segment_select[0], sample_addr[10:0]}.  The long chirp has
+  samples indexed by {segment_select[1:0], sample_addr[9:0]}.  The
-  3000 samples, so:
+  long chirp has 3000 samples, so:
-    seg0: chirp[0..2047] — all valid data
+    seg0: chirp[0..1023]
-    seg1: chirp[2048..2999] + 1096 zeros (samples past chirp end)
+    seg1: chirp[1024..2047]
+    seg2: chirp[2048..2999] + 24 zeros  (samples 2048..3071 but chirp
+          ends at 2999, so indices 3000..3071 relative to full chirp
+          => mem indices 952..1023 in seg2 file are zero)
+
+  Wait, let me re-count.  seg2 covers global indices 2048..3071.
+  The chirp has samples 0..2999 (3000 samples).  So seg2 has valid
+  data at global indices 2048..2999 = 952 valid samples (seg2 file
+  indices 0..951), then zeros at file indices 952..1023 (72 zeros).
+
+  seg3 covers global indices 3072..4095, all past chirp end => all zeros.
 
 Short chirp:
   50 samples (0.5 us at 100 MHz), same chirp formula with
@@ -44,10 +56,10 @@ CHIRP_BW = 20e6           # 20 MHz sweep bandwidth
 FS_SYS = 100e6            # System clock (100 MHz, post-CIC)
 T_LONG_CHIRP = 30e-6      # 30 us long chirp duration
 T_SHORT_CHIRP = 0.5e-6    # 0.5 us short chirp duration
-FFT_SIZE = 2048
+FFT_SIZE = 1024
 LONG_CHIRP_SAMPLES = int(T_LONG_CHIRP * FS_SYS)   # 3000
 SHORT_CHIRP_SAMPLES = int(T_SHORT_CHIRP * FS_SYS)  # 50
-LONG_SEGMENTS = 2
+LONG_SEGMENTS = 4
 SCALE = 0.9               # Q15 scaling factor (matches radar_scene.py)
 Q15_MAX = 32767
 
@@ -175,14 +187,13 @@ def main():
     # Check magnitude envelope
     max(math.sqrt(i*i + q*q) for i, q in zip(long_i, long_q, strict=False))
 
-    # Check seg1 zero padding (samples 3000-4095 should be zero)
+    # Check seg3 zero padding
-    seg1_i_path = os.path.join(MEM_DIR, 'long_chirp_seg1_i.mem')
+    seg3_i_path = os.path.join(MEM_DIR, 'long_chirp_seg3_i.mem')
-    with open(seg1_i_path) as f:
+    with open(seg3_i_path) as f:
-        seg1_lines = [line.strip() for line in f if line.strip()]
+        seg3_lines = [line.strip() for line in f if line.strip()]
-    # Indices 952..2047 in seg1 (global 3000..4095) should be zero
+    nonzero_seg3 = sum(1 for line in seg3_lines if line != '0000')
-    nonzero_tail = sum(1 for line in seg1_lines[952:] if line != '0000')
 
-    if nonzero_tail == 0:
+    if nonzero_seg3 == 0:
         pass
     else:
         pass

9_Firmware/9_2_FPGA/tb/cosim/gen_doppler_golden.py

@@ -35,9 +35,9 @@ from radar_scene import Target, generate_doppler_frame
 
 DOPPLER_FFT_SIZE = 16     # Per sub-frame
 DOPPLER_TOTAL_BINS = 32   # Total output (2 sub-frames x 16)
-RANGE_BINS = 512
+RANGE_BINS = 64
 CHIRPS_PER_FRAME = 32
-TOTAL_SAMPLES = CHIRPS_PER_FRAME * RANGE_BINS  # 16384
+TOTAL_SAMPLES = CHIRPS_PER_FRAME * RANGE_BINS  # 2048
 
 
 # =============================================================================

9_Firmware/9_2_FPGA/tb/cosim/gen_mf_cosim_golden.py

@@ -30,7 +30,7 @@ from fpga_model import (
 )
 
 
-FFT_SIZE = 2048
+FFT_SIZE = 1024
 
 
 def load_hex_16bit(filepath):
@@ -143,13 +143,9 @@ def main():
         bb_q = load_hex_16bit(bb_q_path)
         ref_i = load_hex_16bit(ref_i_path)
         ref_q = load_hex_16bit(ref_q_path)
-        # Zero-pad to FFT_SIZE if shorter (legacy 1024-entry files → 2048)
-        for lst in [bb_i, bb_q, ref_i, ref_q]:
-            while len(lst) < FFT_SIZE:
-                lst.append(0)
         r = generate_case("chirp", bb_i, bb_q, ref_i, ref_q,
                           "Radar chirp: 2 targets (500m, 1500m) vs ref chirp",
-                          base_dir, write_inputs=True)
+                          base_dir)
         results.append(r)
     else:
         pass

9_Firmware/9_2_FPGA/tb/cosim/gen_multiseg_golden.py

@@ -5,8 +5,8 @@ gen_multiseg_golden.py
 Generate golden reference data for matched_filter_multi_segment co-simulation.
 
 Tests the overlap-save segmented convolution wrapper:
-  - Long chirp: 3072 samples (2 segments x 2048, with overlap)
+  - Long chirp: 3072 samples (4 segments x 1024, with 128-sample overlap)
-  - Short chirp: 50 samples zero-padded to 2048 (1 segment)
+  - Short chirp: 50 samples zero-padded to 1024 (1 segment)
 
 The matched_filter_processing_chain is already verified bit-perfect.
 This test validates that the multi_segment wrapper:
@@ -17,7 +17,7 @@ This test validates that the multi_segment wrapper:
 
 Strategy:
   - Generate known input data (identifiable per-segment patterns)
-  - Generate per-segment reference chirp data (2048 samples each)
+  - Generate per-segment reference chirp data (1024 samples each)
   - Run each segment through MatchedFilterChain independently in Python
   - Compare RTL multi-segment outputs against per-segment Python outputs
 
@@ -64,7 +64,7 @@ def generate_long_chirp_test():
       - buffer_write_ptr starts at 0 (from ST_IDLE reset)
       - Collects 896 samples into positions [0:895]
       - Positions [896:1023] remain zero (from initial block)
-      - Processes full 2048-sample buffer
+      - Processes full 1024-sample buffer
 
     For segment 1 (ST_NEXT_SEGMENT):
       - Copies input_buffer[SEGMENT_ADVANCE+i] to input_buffer[i] for i=0..127
@@ -89,7 +89,7 @@ def generate_long_chirp_test():
                           positions 0-895: input data
                           positions 896-1023: zeros from initial block
 
-    Processing chain sees: 2048 samples = [data[0:1919], zeros[1920:2047]]
+    Processing chain sees: 1024 samples = [data[0:895], zeros[896:1023]]
 
     OVERLAP-SAVE (ST_NEXT_SEGMENT):
       - Copies buffer[SEGMENT_ADVANCE+i] -> buffer[i] for i=0..OVERLAP-1
@@ -105,12 +105,12 @@ def generate_long_chirp_test():
         It was 896 after segment 0, then continues: 896+768 = 1664
 
     Actually I realize the overlap-save implementation in this RTL has an issue:
-    For segment 0, the buffer is only partially filled (1920 out of 2048),
+    For segment 0, the buffer is only partially filled (896 out of 1024),
     with zeros in positions 896-1023. The "overlap" that gets carried to
     segment 1 is those zeros, not actual signal data.
 
     A proper overlap-save would:
-    1. Fill the entire 2048-sample buffer for each segment
+    1. Fill the entire 1024-sample buffer for each segment
     2. The overlap region is the LAST 128 samples of the previous segment
 
     But this RTL only fills 896 samples per segment and relies on the
@@ -140,7 +140,7 @@ def generate_long_chirp_test():
     [768 new data samples at positions [128:895]] +
     [128 stale/zero samples at positions [896:1023]]
 
-    This is NOT standard overlap-save. It's a 2048-pt buffer but only
+    This is NOT standard overlap-save. It's a 1024-pt buffer but only
     896 positions are "active" for triggering, and positions 896-1023
     are never filled after init.
 
@@ -153,16 +153,22 @@ def generate_long_chirp_test():
     """
 
     # Parameters matching RTL
-    BUFFER_SIZE = 2048
+    BUFFER_SIZE = 1024
     OVERLAP_SAMPLES = 128
-    SEGMENT_ADVANCE = BUFFER_SIZE - OVERLAP_SAMPLES  # 1920
+    SEGMENT_ADVANCE = BUFFER_SIZE - OVERLAP_SAMPLES  # 896
-    LONG_SEGMENTS = 2
+    LONG_SEGMENTS = 4
 
-    # Total input samples needed: seg0 needs 1920, seg1 needs 1792 (3712 total).
+    # Total input samples needed:
-    # chirp_complete triggers at chirp_samples_collected >= LONG_CHIRP_SAMPLES-1 (2999),
+    # Segment 0: 896 samples (ptr goes from 0 to 896)
-    # so the last segment may be truncated. We generate 3800 samples to be safe.
+    # Segment 1: 768 samples (ptr goes from 128 to 896)
+    # Segment 2: 768 samples (ptr goes from 128 to 896)
+    # Segment 3: 768 samples (ptr goes from 128 to 896)
+    # Total: 896 + 3*768 = 896 + 2304 = 3200
+    # But chirp_complete triggers at chirp_samples_collected >= LONG_CHIRP_SAMPLES-1 = 2999
+    # So the last segment may be truncated.
+    # Let's generate 3072 input samples (to be safe, more than 3000).
 
-    TOTAL_SAMPLES = 3800  # More than enough for 2 segments
+    TOTAL_SAMPLES = 3200  # More than enough for 4 segments
 
     # Generate input signal: identifiable pattern per segment
     # Use a tone at different frequencies for each expected segment region
@@ -178,7 +184,7 @@ def generate_long_chirp_test():
         input_q.append(saturate(val_q, 16))
 
     # Generate per-segment reference chirps (just use known patterns)
-    # Each segment gets a different reference (2048 samples each)
+    # Each segment gets a different reference (1024 samples each)
     ref_segs_i = []
     ref_segs_q = []
     for seg in range(LONG_SEGMENTS):
@@ -196,7 +202,7 @@ def generate_long_chirp_test():
         ref_segs_q.append(ref_q)
 
     # Now simulate the RTL's overlap-save algorithm in Python
-    mf_chain = MatchedFilterChain(fft_size=2048)
+    mf_chain = MatchedFilterChain(fft_size=1024)
 
     # Simulate the buffer exactly as RTL does it
     input_buffer_i = [0] * BUFFER_SIZE
@@ -304,7 +310,7 @@ def generate_long_chirp_test():
         f.write('segment,bin,golden_i,golden_q\n')
         for seg in range(LONG_SEGMENTS):
             out_re, out_im = segment_results[seg]
-            for b in range(2048):
+            for b in range(1024):
                 f.write(f'{seg},{b},{out_re[b]},{out_im[b]}\n')
 
 
@@ -315,9 +321,9 @@ def generate_short_chirp_test():
     """
     Generate test data for single-segment short chirp.
 
-    Short chirp: 50 samples of data, zero-padded to 2048.
+    Short chirp: 50 samples of data, zero-padded to 1024.
     """
-    BUFFER_SIZE = 2048
+    BUFFER_SIZE = 1024
     SHORT_SAMPLES = 50
 
     # Generate 50-sample input
@@ -330,7 +336,7 @@ def generate_short_chirp_test():
         input_i.append(saturate(val_i, 16))
         input_q.append(saturate(val_q, 16))
 
-    # Zero-pad to 2048 (as RTL does in ST_ZERO_PAD)
+    # Zero-pad to 1024 (as RTL does in ST_ZERO_PAD)
     # Note: padding computed here for documentation; actual buffer uses buf_i/buf_q below
     _padded_i = list(input_i) + [0] * (BUFFER_SIZE - SHORT_SAMPLES)
     _padded_q = list(input_q) + [0] * (BUFFER_SIZE - SHORT_SAMPLES)
@@ -353,7 +359,7 @@ def generate_short_chirp_test():
             buf_i.append(0)
             buf_q.append(0)
 
-    # Reference chirp (2048 samples)
+    # Reference chirp (1024 samples)
     ref_i = []
     ref_q = []
     for n in range(BUFFER_SIZE):
@@ -364,7 +370,7 @@ def generate_short_chirp_test():
         ref_q.append(saturate(val_q, 16))
 
     # Process through MF chain
-    mf_chain = MatchedFilterChain(fft_size=2048)
+    mf_chain = MatchedFilterChain(fft_size=1024)
     out_re, out_im = mf_chain.process(buf_i, buf_q, ref_i, ref_q)
 
     # Write hex files
@@ -388,7 +394,7 @@ def generate_short_chirp_test():
     csv_path = os.path.join(out_dir, 'multiseg_short_golden.csv')
     with open(csv_path, 'w') as f:
         f.write('bin,golden_i,golden_q\n')
-        for b in range(2048):
+        for b in range(1024):
             f.write(f'{b},{out_re[b]},{out_im[b]}\n')
 
     return out_re, out_im
@@ -403,7 +409,7 @@ if __name__ == '__main__':
         # Find peak
         max_mag = 0
         peak_bin = 0
-        for b in range(2048):
+        for b in range(1024):
             mag = abs(out_re[b]) + abs(out_im[b])
             if mag > max_mag:
                 max_mag = mag
@@ -412,7 +418,7 @@ if __name__ == '__main__':
     short_re, short_im = generate_short_chirp_test()
     max_mag = 0
     peak_bin = 0
-    for b in range(2048):
+    for b in range(1024):
         mag = abs(short_re[b]) + abs(short_im[b])
         if mag > max_mag:
             max_mag = mag

9_Firmware/9_2_FPGA/tb/cosim/radar_scene.py

@@ -53,8 +53,8 @@ N_SAMPLES_LISTEN = int(T_LISTEN_LONG * FS_ADC)  # 54800 samples
 
 # Processing chain
 CIC_DECIMATION = 4
-FFT_SIZE = 2048
+FFT_SIZE = 1024
-RANGE_BINS = 512
+RANGE_BINS = 64
 DOPPLER_FFT_SIZE = 16      # Per sub-frame
 DOPPLER_TOTAL_BINS = 32    # Total output bins (2 sub-frames x 16)
 CHIRPS_PER_SUBFRAME = 16

9_Firmware/9_2_FPGA/tb/cosim/real_data/golden_reference.py

@@ -69,7 +69,7 @@ FIR_COEFFS_HEX = [
 # DDC output interface
 DDC_OUT_BITS = 16                # 18 → 16 bit with rounding + saturation
 
-FFT_SIZE = 2048
+FFT_SIZE = 1024
 FFT_DATA_W = 16
 FFT_INTERNAL_W = 32
 FFT_TWIDDLE_W = 16
@@ -77,7 +77,7 @@ FFT_TWIDDLE_W = 16
 # Doppler — dual 16-pt FFT architecture
 DOPPLER_FFT_SIZE = 16            # per sub-frame
 DOPPLER_TOTAL_BINS = 32          # total output (2 sub-frames x 16)
-DOPPLER_RANGE_BINS = 512
+DOPPLER_RANGE_BINS = 64
 DOPPLER_CHIRPS = 32
 CHIRPS_PER_SUBFRAME = 16
 DOPPLER_WINDOW_TYPE = 0          # Hamming
@@ -109,8 +109,8 @@ AERIS_RX_LO_HZ = 10.38e9        # RX LO (ADF4382)
 AERIS_CHIRP_BW = 20e6           # Chirp bandwidth (target: 30 MHz Phase 1)
 AERIS_LONG_CHIRP_S = 30e-6      # Long chirp duration
 AERIS_PRI_S = 167e-6            # Pulse repetition interval
-AERIS_DECIMATION = 4            # Range bin decimation (2048 → 512)
+AERIS_DECIMATION = 16           # Range bin decimation (1024 → 64)
-AERIS_RANGE_PER_BIN = 6.0       # Meters per decimated bin
+AERIS_RANGE_PER_BIN = 24.0      # Meters per decimated bin
 
 
 # ===========================================================================
@@ -152,7 +152,7 @@ def load_and_quantize_adi_data(data_path, config_path, frame_idx=0):
     with a 120 MHz IF. We need to:
     1. Take one frame of 256 chirps x 1079 samples
     2. Use only 32 chirps (matching AERIS-10 CHIRPS_PER_FRAME)
-    3. Zero-pad to 2048 samples (matching FFT_SIZE)
+    3. Truncate to 1024 samples (matching FFT_SIZE)
     4. Upconvert to 120 MHz IF (add I*cos - Q*sin) to create real signal
     5. Quantize to 8-bit unsigned (matching AD9484)
     """
@@ -163,10 +163,8 @@ def load_and_quantize_adi_data(data_path, config_path, frame_idx=0):
     # Extract one frame
     frame = data[frame_idx]  # (256, 1079) complex
     
-    # Use first 32 chirps, zero-pad to FFT_SIZE samples
+    # Use first 32 chirps, first 1024 samples
-    n_available = min(frame.shape[1], FFT_SIZE)
+    iq_block = frame[:DOPPLER_CHIRPS, :FFT_SIZE]  # (32, 1024) complex
-    iq_block = np.zeros((DOPPLER_CHIRPS, FFT_SIZE), dtype=np.complex128)
-    iq_block[:, :n_available] = frame[:DOPPLER_CHIRPS, :n_available]
     
     # The ADI data is baseband complex IQ at 4 MSPS.
     # AERIS-10 sees a real signal at 400 MSPS with 120 MHz IF.
@@ -204,10 +202,7 @@ def load_and_quantize_adi_data(data_path, config_path, frame_idx=0):
     
     # Also create 8-bit ADC stimulus for DDC validation
     # Use just one chirp of real-valued data (I channel only, shifted to unsigned)
-    # Zero-pad if needed (ADI has 1079 samples, FFT_SIZE may be larger)
+    chirp0_real = np.real(frame[0, :FFT_SIZE])
-    chirp0_real = np.zeros(FFT_SIZE)
-    n_avail = min(frame.shape[1], FFT_SIZE)
-    chirp0_real[:n_avail] = np.real(frame[0, :n_avail])
     chirp0_norm = chirp0_real / np.max(np.abs(chirp0_real))
     adc_8bit = np.round(chirp0_norm * 127 + 128).astype(np.uint8)
     adc_8bit = np.clip(adc_8bit, 0, 255)
@@ -456,21 +451,21 @@ def fft_twiddle_lookup(k, N, cos_rom):
 
 def run_range_fft(iq_i, iq_q, twiddle_file=None):
     """
-    Bit-accurate radix-2 DIT FFT matching fft_engine.v.
+    Bit-accurate 1024-point radix-2 DIT FFT matching fft_engine.v.
     
-    Input: 16-bit signed I/Q arrays (N samples, N must be power of 2)
+    Input: 16-bit signed I/Q arrays (1024 samples)
-    Output: 16-bit signed I/Q arrays (N bins, saturated from 32-bit internal)
+    Output: 16-bit signed I/Q arrays (1024 bins, saturated from 32-bit internal)
     
     Matches RTL:
     - Bit-reversed input loading → sign-extended to 32-bit internal
-    - LOG2(N) stages of radix-2 butterflies
+    - 10 stages of radix-2 butterflies
     - Twiddle multiply: 32-bit * 16-bit = 48-bit, shift >>> 15
     - Add/subtract in 32-bit
     - Output: saturate 32-bit → 16-bit
     """
-    N = len(iq_i)
+    N = FFT_SIZE
     LOG2N = int(np.log2(N))
-    assert N == (1 << LOG2N), f"FFT size {N} is not a power of 2"
+    assert N == 1024 and LOG2N == 10
     
     # Load twiddle ROM
     if twiddle_file and os.path.exists(twiddle_file):
@@ -547,18 +542,18 @@ def run_range_fft(iq_i, iq_q, twiddle_file=None):
 # ===========================================================================
 def run_range_bin_decimator(range_fft_i, range_fft_q,
                             mode=1, start_bin=0,
-                            input_bins=2048, output_bins=512,
+                            input_bins=1024, output_bins=64,
-                            decimation_factor=4):
+                            decimation_factor=16):
     """
     Bit-accurate model of range_bin_decimator.v (peak detection mode).
 
-    Input:  range_fft_i/q — shape (N_chirps, input_bins), 16-bit signed
+    Input:  range_fft_i/q — shape (N_chirps, 1024), 16-bit signed
-    Output: decimated_i/q — shape (N_chirps, output_bins), 16-bit signed
+    Output: decimated_i/q — shape (N_chirps, 64), 16-bit signed
 
     Modes:
         0 = simple decimation (take center sample of each group)
-        1 = peak detection   (select max |I|+|Q| from each group)
+        1 = peak detection   (select max |I|+|Q| from each group of 16)
-        2 = averaging        (sum group >> log2(decimation_factor))
+        2 = averaging        (sum group >> 4)
 
     RTL detail: abs_i = I[15] ? (~I + 1) : I   (unsigned 16-bit)
                 cur_mag = {1'b0, abs_i} + {1'b0, abs_q}   (17-bit)
@@ -626,10 +621,9 @@ def run_range_bin_decimator(range_fft_i, range_fft_q,
                     sum_i += int(range_fft_i[c, in_idx])
                     sum_q += int(range_fft_q[c, in_idx])
                     in_idx += 1
-                # RTL: sum_i >> log2(decimation_factor), truncation (not rounding)
+                # RTL: sum_i[19:4], truncation (not rounding)
-                avg_shift = int(np.log2(decimation_factor))
+                decimated_i[c, obin] = int(sum_i) >> 4
-                decimated_i[c, obin] = int(sum_i) >> avg_shift
+                decimated_q[c, obin] = int(sum_q) >> 4
-                decimated_q[c, obin] = int(sum_q) >> avg_shift
 
 
     return decimated_i, decimated_q
@@ -642,7 +636,7 @@ def run_doppler_fft(range_data_i, range_data_q, twiddle_file_16=None):
     """
     Bit-accurate Doppler processor matching doppler_processor.v (dual 16-pt FFT).
 
-    Input: range_data_i/q shape (DOPPLER_CHIRPS, N_range_bins) — 16-bit signed
+    Input: range_data_i/q shape (DOPPLER_CHIRPS, FFT_SIZE) — 16-bit signed
            Only first DOPPLER_RANGE_BINS columns are processed.
     Output: doppler_map_i/q shape (DOPPLER_RANGE_BINS, DOPPLER_TOTAL_BINS) — 16-bit signed
 
@@ -1135,7 +1129,7 @@ def main():
         "amp_radar",
         "phaser_amp_4MSPS_500M_300u_256_m3dB_config.npy"
     )
-    twiddle_range = os.path.join(fpga_dir, "fft_twiddle_2048.mem")
+    twiddle_1024 = os.path.join(fpga_dir, "fft_twiddle_1024.mem")
     output_dir = os.path.join(script_dir, "hex")
     
     
@@ -1146,7 +1140,7 @@ def main():
         amp_data, amp_config, frame_idx=args.frame
     )
     
-    # iq_i, iq_q: (32, 2048) int64, 16-bit range — post-DDC equivalent (zero-padded)
+    # iq_i, iq_q: (32, 1024) int64, 16-bit range — post-DDC equivalent
     
     # -----------------------------------------------------------------------
     # Write stimulus files
@@ -1164,7 +1158,7 @@ def main():
     # -----------------------------------------------------------------------
     # Run range FFT on first chirp (bit-accurate)
     # -----------------------------------------------------------------------
-    range_fft_i, range_fft_q = run_range_fft(iq_i[0], iq_q[0], twiddle_range)
+    range_fft_i, range_fft_q = run_range_fft(iq_i[0], iq_q[0], twiddle_1024)
     write_hex_files(output_dir, range_fft_i, range_fft_q, "range_fft_chirp0")
     
     # Run range FFT on all 32 chirps
@@ -1172,7 +1166,7 @@ def main():
     all_range_q = np.zeros((DOPPLER_CHIRPS, FFT_SIZE), dtype=np.int64)
     
     for c in range(DOPPLER_CHIRPS):
-        ri, rq = run_range_fft(iq_i[c], iq_q[c], twiddle_range)
+        ri, rq = run_range_fft(iq_i[c], iq_q[c], twiddle_1024)
         all_range_i[c] = ri
         all_range_q[c] = rq
         if (c + 1) % 8 == 0:
@@ -1198,7 +1192,7 @@ def main():
         decimation_factor=FFT_SIZE // DOPPLER_RANGE_BINS
     )
     
-    # Write full-chain range FFT input: all 32 chirps x 2048 bins = 65536 samples
+    # Write full-chain range FFT input: all 32 chirps x 1024 bins = 32768 samples
     # This is the stimulus for the range_bin_decimator in the full-chain testbench.
     # Format: packed {Q[31:16], I[15:0]} per RTL range_data bus format
     fc_input_file = os.path.join(output_dir, "fullchain_range_input.hex")
@@ -1254,7 +1248,7 @@ def main():
     np.save(os.path.join(output_dir, "fullchain_mti_doppler_q.npy"), mti_doppler_q)
     
     # DC notch on MTI-Doppler data
-    DC_NOTCH_WIDTH = 2  # Default test value: zero bins {0, 1, 15, 16, 17, 31}
+    DC_NOTCH_WIDTH = 2  # Default test value: zero bins {0, 1, 31}
     notched_i, notched_q = run_dc_notch(mti_doppler_i, mti_doppler_q, width=DC_NOTCH_WIDTH)
     write_hex_files(output_dir, notched_i, notched_q, "fullchain_notched_ref")
     
@@ -1280,7 +1274,7 @@ def main():
     )
     
     # Write CFAR reference files
-    # 1. Magnitude map (17-bit unsigned, row-major: 512 range x 32 Doppler = 16384)
+    # 1. Magnitude map (17-bit unsigned, row-major: 64 range x 32 Doppler = 2048)
     cfar_mag_file = os.path.join(output_dir, "fullchain_cfar_mag.hex")
     with open(cfar_mag_file, 'w') as f:
         for rbin in range(DOPPLER_RANGE_BINS):