diff --git a/tridoracpu/tridoracpu.srcs/tdraudio.v b/tridoracpu/tridoracpu.srcs/tdraudio.v index 9cb1d74..9e3721f 100644 --- a/tridoracpu/tridoracpu.srcs/tdraudio.v +++ b/tridoracpu/tridoracpu.srcs/tdraudio.v @@ -46,7 +46,7 @@ module wavegen #(DATA_WIDTH=32, CLOCK_DIV_WIDTH=22, AMP_WIDTH=16) ( //assign rd_data = {{DATA_WIDTH-8-CLOCK_DIV_WIDTH{1'b0}}, div_count, {7{1'b0}}, channel_enable}; assign rd_data = {8'b0, amp_start, - {4{1'b0}}, amp_phase, direct_amp_enable, noise_enable, channel_enable}; + {6{1'b0}}, amp_phase, channel_enable}; assign amp_val = amp_out; assign running = channel_enable; @@ -146,7 +146,7 @@ module wavegen #(DATA_WIDTH=32, CLOCK_DIV_WIDTH=22, AMP_WIDTH=16) ( begin if (div_count == 0) // invert amplitude on clock tick begin - amp_out <= direct_amp_enable ? amp_start : + amp_out <= direct_amp_enable ? amp_start : noise_enable ? noise_out : amp_phase ? amp_start : ~amp_start; amp_phase <= ~amp_phase; diff --git a/tridoracpu/tridoracpu.xpr b/tridoracpu/tridoracpu.xpr index 4bbcb9d..9541c3d 100644 --- a/tridoracpu/tridoracpu.xpr +++ b/tridoracpu/tridoracpu.xpr @@ -356,15 +356,12 @@ - + - - Performs general area optimizations including changing the threshold for control set optimizations, forcing ternary adder implementation, applying lower thresholds for use of carry chain in comparators and also area optimized mux optimizations. + + Vivado Synthesis Defaults - - - - + @@ -381,18 +378,26 @@ - + - - Default settings for Implementation. + + To compensate for optimistic delay estimation, add extra delay cost to long distance and high fanout connections. low setting, least pessimistic) - + + + - + + + - - + + + + + +