pingu_98/fomu-workshop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small fixes.

Browse source
This commit is contained in:
Tim 'mithro' Ansell 2019-08-23 13:20:52 +02:00
parent 03f75ee45a
commit 95d7a9e488
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
verilog-blink-minimal/blink.v
View file

@ -21,7 +21,7 @@
`endif `endif
`endif `endif
module blink ( module top (
// 48MHz Clock input // 48MHz Clock input
// -------- // --------
input clki, input clki,
@ -57,7 +57,7 @@ module blink (
.GLOBAL_BUFFER_OUTPUT(clkosc) .GLOBAL_BUFFER_OUTPUT(clkosc)
); );
assign clk = clkosc; wire clk = clkosc;
// Configure user pins so that we can detect the user connecting // Configure user pins so that we can detect the user connecting
// 1-2 or 3-4 with conductive material. // 1-2 or 3-4 with conductive material.
@ -127,6 +127,19 @@ module blink (
outcnt <= counter >> LOG2DELAY; outcnt <= counter >> LOG2DELAY;
end end
// Instantiate iCE40 LED driver hard logic, connecting up
// latched button state, counter state, and LEDs.
SB_RGBA_DRV RGBA_DRIVER (
.CURREN(1'b1),
.RGBLEDEN(1'b1),
.`BLUEPWM(enable_blue), // Blue
.`REDPWM(enable_red), // Red
.`GREENPWM(counter[23]), // Green (blinking)
.RGB0(rgb0),
.RGB1(rgb1),
.RGB2(rgb2)
);
// Parameters from iCE40 UltraPlus LED Driver Usage Guide, pages 19-20 // Parameters from iCE40 UltraPlus LED Driver Usage Guide, pages 19-20
// //
// https://www.latticesemi.com/-/media/LatticeSemi/Documents/ApplicationNotes/IK/ICE40LEDDriverUsageGuide.ashx?document_id=50668 // https://www.latticesemi.com/-/media/LatticeSemi/Documents/ApplicationNotes/IK/ICE40LEDDriverUsageGuide.ashx?document_id=50668
@ -141,24 +154,11 @@ module blink (
localparam RGBA_CURRENT_20MA_10MA = "0b011111"; localparam RGBA_CURRENT_20MA_10MA = "0b011111";
localparam RGBA_CURRENT_24MA_12MA = "0b111111"; localparam RGBA_CURRENT_24MA_12MA = "0b111111";
// Instantiate iCE40 LED driver hard logic, connecting up
// latched button state, counter state, and LEDs.
SB_RGBA_DRV RGBA_DRIVER (
.CURREN(1'b1),
.RGBLEDEN(1'b1),
.`BLUEPWM(enable_blue), // Blue
.`REDPWM(enable_red), // Red
.`GREENPWM(counter[23]), // Green (blinking)
.RGB0(rgb0),
.RGB1(rgb1),
.RGB2(rgb2)
);
// Set parameters of RGBA_DRIVER (output current) // Set parameters of RGBA_DRIVER (output current)
// //
// Mapping of RGBn to LED colours determined experimentally // Mapping of RGBn to LED colours determined experimentally
defparam RGBA_DRIVER.CURRENT_MODE = RGBA_CURRENT_MODE_HALF; defparam RGBA_DRIVER.CURRENT_MODE = RGBA_CURRENT_MODE_HALF;
defparam RGBA_DRIVER.RGB0_CURRENT = RGBA_CURRENT_16MA_06MA; // Blue - Needs more current. defparam RGBA_DRIVER.RGB0_CURRENT = RGBA_CURRENT_16MA_08MA; // Blue - Needs more current.
defparam RGBA_DRIVER.RGB1_CURRENT = RGBA_CURRENT_08MA_04MA; // Red defparam RGBA_DRIVER.RGB1_CURRENT = RGBA_CURRENT_08MA_04MA; // Red
defparam RGBA_DRIVER.RGB2_CURRENT = RGBA_CURRENT_08MA_04MA; // Green defparam RGBA_DRIVER.RGB2_CURRENT = RGBA_CURRENT_08MA_04MA; // Green