supleed2/EIE4-FYP
1
0
Fork 0
mirror of https://github.com/supleed2/EIE4-FYP.git synced 2024-12-22 14:15:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert genWave to 24bit int, floats fail to compile

Browse source
This commit is contained in:
Aadi Desai 2023-06-08 01:19:36 +01:00
parent 17bb4ae5cd
commit cfa699fe84
No known key found for this signature in database
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rtl/genWave.sv
View file

@ -5,7 +5,7 @@ module genWave
, input var i_rst48_n // Active low reset , input var i_rst48_n // Active low reset
, input var i_pause // Pause sample generation (backpressure) , input var i_pause // Pause sample generation (backpressure)
, input var [ 5:0] i_osc_sel // Oscillator select, to update target freq / waveform , input var [ 5:0] i_osc_sel // Oscillator select, to update target freq / waveform
, input var [27:0] i_t_freq // Target frequency for selected oscillator (24.4 fixed point) , input var [23:0] i_t_freq // Target frequency for selected oscillator
, input var i_tf_valid // Target frequency valid pulse (i_osc_sel must be set first) , input var i_tf_valid // Target frequency valid pulse (i_osc_sel must be set first)
, input var [ 7:0] i_wav_sel // Waveform select for selected oscillator , input var [ 7:0] i_wav_sel // Waveform select for selected oscillator
, input var i_ws_valid // Waveform select valid pulse (i_osc_sel must be set first) , input var i_ws_valid // Waveform select valid pulse (i_osc_sel must be set first)
@ -34,7 +34,7 @@ always_comb o_pulse = clk_48k && !clk_48k_past; // Detect rising edge of 48kHz c
// Per Oscillator Settings Capture ################################################################# // Per Oscillator Settings Capture #################################################################
logic [27:0] t_freq [0:63]; logic [23:0] t_freq [0:63];
always_ff @(posedge i_clk48) always_ff @(posedge i_clk48)
if (i_tf_valid) t_freq[i_osc_sel] <= i_t_freq; // Capture target frequency if (i_tf_valid) t_freq[i_osc_sel] <= i_t_freq; // Capture target frequency
@ -49,11 +49,11 @@ always_ff @(posedge i_clk48) // Count to 64 at 48MHz
if (!i_rst48_n) ps_clk <= '0; // Reset if (!i_rst48_n) ps_clk <= '0; // Reset
else ps_clk <= ps_clk + 1; // Increment else ps_clk <= ps_clk + 1; // Increment
logic [27:0] int_phase_step; // Phase step calc from target frequency logic [23:0] int_phase_step; // Phase step calc from target frequency
always_comb int_phase_step = (28'd699 * t_freq[ps_clk]); // 699 = (2^24 / 48000) * 2 (Approximately) always_comb int_phase_step = (24'd699 * t_freq[ps_clk]); // 699 = (2^24 / 48000) * 2 (Approximately)
logic [15:0] phase_step [0:63]; // Shift step right correctly (2^9) * (2^4) for fixed point logic [15:0] phase_step [0:63]; // Shift step right correctly (2^9)
always_ff @(posedge i_clk48) phase_step[ps_clk] <= {1'b0, int_phase_step[27:13]}; always_ff @(posedge i_clk48) phase_step[ps_clk] <= {1'b0, int_phase_step[23:9]};
// Per Oscillator Phase Generation ################################################################# // Per Oscillator Phase Generation #################################################################

2
testWave.py
View file

@ -20,7 +20,7 @@ class TestWave(Module, AutoCSR, ModuleDoc):
self.pads = pads self.pads = pads
self.osc = CSRStorage(size = 6, description = "Index of the Oscillator to Configure (0-63)") self.osc = CSRStorage(size = 6, description = "Index of the Oscillator to Configure (0-63)")
self.tf = CSRStorage(size = 28, description = "Target Frequency of the phase accumulator (24.4 bit fixed point, ie x16)") self.tf = CSRStorage(size = 24, description = "Target Frequency of the phase accumulator")
self.wav = CSRStorage(size = 8, description = "Waveform to Output (Saw, Square, Triangle, Sine)") self.wav = CSRStorage(size = 8, description = "Waveform to Output (Saw, Square, Triangle, Sine)")
# 48MHz Domain Signals # 48MHz Domain Signals