Merge pull request #54 from leonow32/vim828

Vim828
leonow32 · Nov 17, 2023 · 2108f10 · 2108f10
2 parents 5333afe + 6d3f333
commit 2108f10
Show file tree

Hide file tree

Showing 9 changed files with 368 additions and 422 deletions.
diff --git a/decoder_14seg/decoder_14seg.v b/decoder_14seg/decoder_14seg.v
@@ -15,7 +15,7 @@ module Decoder14seg(
 		end else if(Enable_i) begin
 			case(Data_i)
 			//                         NMLKJIHGFEDCBA
-			8'd0:	 Segments_o <= 14'b00000000000000;
+			8'h00:	 Segments_o <= 14'b00000000000000;
 			" ":	 Segments_o <= 14'b00000000000000;
 			"\"":	 Segments_o <= 14'b00000000100010;
 			"'":	 Segments_o <= 14'b00000100000000;

diff --git a/display_lcd_vim828/pinout.png b/display_lcd_vim828/pinout.png
diff --git a/display_lcd_vim828/vim828.bat b/display_lcd_vim828/vim828.bat
@@ -1,6 +1,6 @@
 @echo off
 iverilog -o vim828.o ^
-	vim828_defines.vh ^
+	vim828_defines.v ^
 	vim828.v ^
 	vim828_tb.v ^
 	vim828_pwm.v ^

diff --git a/display_lcd_vim828/vim828.v b/display_lcd_vim828/vim828.v
diff --git a/display_lcd_vim828/vim828_defines.v b/display_lcd_vim828/vim828_defines.v
@@ -62,4 +62,14 @@
 `define BIT_N		13
 `define BIT_P		14
 
+`define COM_H_ACTIVE	2'd3
+`define COM_H_PASSIVE	2'd1
+`define SEG_H_ACTIVE	2'd0
+`define SEG_H_PASSIVE	2'd2
+
+`define COM_L_ACTIVE	2'd0
+`define COM_L_PASSSIVE	2'd2
+`define SEG_L_ACTIVE	2'd3
+`define SEG_L_PASSIVE	2'd1
+
 `endif // VIM828_DEFINES_VH
diff --git a/display_lcd_vim828/vim828_defines.vh b/display_lcd_vim828/vim828_defines.vh
diff --git a/display_lcd_vim828/vim828_tb.v b/display_lcd_vim828/vim828_tb.v
@@ -2,7 +2,6 @@
 
 `timescale 1ns/1ns
 `default_nettype none
-`include "vim828_defines.vh"
 
 module VIM828_tb();
 

diff --git a/terminal_vim828/terminal_vim828.bat b/terminal_vim828/terminal_vim828.bat
@@ -3,7 +3,7 @@ iverilog -o terminal_vim828.o ^
 	terminal_vim828.v ^
 	terminal_vim828_tb.v ^
 	../decoder_14seg/decoder_14seg.v ^
-	../display_lcd_vim828/vim828_defines.vh ^
+	../display_lcd_vim828/vim828_defines.v ^
 	../display_lcd_vim828/vim828.v ^
 	../display_lcd_vim828/vim828_pwm.v ^
 	../edge_detector/edge_detector.v ^

diff --git a/terminal_vim828/termina_vim828.gtkw → terminal_vim828/terminal_vim828.gtkw b/terminal_vim828/termina_vim828.gtkw → terminal_vim828/terminal_vim828.gtkw
@@ -5,7 +5,7 @@
 [dumpfile] "terminal_vim828.vcd"
 [dumpfile_mtime] "Fri Nov 10 14:16:48 2023"
 [dumpfile_size] 3723523
-[savefile] "termina_vim828.gtkw"
+[savefile] "terminal_vim828.gtkw"
 [timestart] 0
 [size] 1920 1009
 [pos] -1 -1