HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/PELLION/VHD_Lib Commit - r11:b3a8b4c115e7

LCD Driver fixed but AMBA interface still not implemented.

Alexis -

r11:b3a8b4c115e7 default

parent child

Context file:

r11:b3a8b4c115e7

Collapse all files

README +1 -3

             | ABOUT
             | ~~~~~
-            LPP's VHD_Lib is a VHDL library, which is target independent and includes a set of scripts for integrating into
+            LPP's VHD_Lib is a VHDL library which is target independent and includes a set of scripts for integrating into
             gaisler's grlib and use its features. For setup read instalation section.
             license. They all are free software and most of them are covered by the
             GNU General Public License.
-            The VHD_Lib itself, meaning all the scripts which are used in the building
-            process, are covered by the GNU General Public License.

lib/lpp/amba_lcd_16x2_ctrlr/LCD_16x2_CFG.vhd +1 -1

             constant	FunctionSet		:	std_logic_vector(7 downto 0):= X"38";
             constant RetHome			:	std_logic_vector(7 downto 0):= X"02";
             constant SetEntryMode	:	std_logic_vector(7 downto 0):= X"06";
-            constant DSPL_CTRL		:	std_logic_vector(7 downto 0):= X"0C";
+            constant DSPL_CTRL		:	std_logic_vector(7 downto 0):= X"0E";
             constant CursorON			:	std_logic_vector(7 downto 0):= X"0E";
             constant CursorOFF		:	std_logic_vector(7 downto 0):= X"0C";

lib/lpp/amba_lcd_16x2_ctrlr/LCD_16x2_DRVR.vhd +123 -3

@@ -1,4 +1,4
1	------------------------------------------------------------------------------	1	------------------------------------------------------------------------------
2	-- This file is a part of the LPP VHDL IP LIBRARY	2	-- This file is a part of the LPP VHDL IP LIBRARY
3	-- Copyright (C) 2009 - 2010, Laboratory of Plasmas Physic - CNRS	3	-- Copyright (C) 2009 - 2010, Laboratory of Plasmas Physic - CNRS
4	--	4	--
@@ -35,16 +35,18
35	-- Additional Comments:	35	-- Additional Comments:
36	--	36	--
37	----------------------------------------------------------------------------------	37	----------------------------------------------------------------------------------
		38
		39	---TDODO => Clean Enable pulse FSM
38	library IEEE;	40	library IEEE;
39	use IEEE.STD_LOGIC_1164.ALL;	41	use IEEE.STD_LOGIC_1164.ALL;
40	use IEEE.NUMERIC_STD.all;	42	use IEEE.NUMERIC_STD.all;
41	library lpp;	43	library lpp;
42	use lpp.amba_lcd_16x2_ctrlr.all;	44	use lpp.amba_lcd_16x2_ctrlr.all;
43		45	use lpp.lcd_16x2_cfg.all;
44		46
45	entity LCD_16x2_DRIVER is	47	entity LCD_16x2_DRIVER is
46	generic(	48	generic(
47	OSC_Freq_MHz : integer:=60	49	OSC_Freq_KHz : integer:=50000
48	);	50	);
49	Port(	51	Port(
50	reset : in STD_LOGIC;	52	reset : in STD_LOGIC;
@@ -57,11 +59,129 end LCD_16x2_DRIVER;
57		59
58	architecture Behavioral of LCD_16x2_DRIVER is	60	architecture Behavioral of LCD_16x2_DRIVER is
59		61
		62	type stateT is (idle,Enable0,Enable1,Enable2,tempo);
		63	signal state : stateT;
		64
		65
		66	constant trigger_4us : integer := 5;
		67	constant trigger_100us : integer := 100;
		68	constant trigger_4ms : integer := 4200;
		69	constant trigger_20ms : integer := 20000;
		70
		71
		72	signal i : integer :=0;
		73	signal reset_i : std_logic := '0';
		74	signal tempoTRIG : integer :=0;
		75
		76	signal clk_1us : std_logic;
		77	signal clk_1us_reg : std_logic;
		78
60	begin	79	begin
61		80
		81
		82	CLK0: LCD_CLK_GENERATOR
		83	generic map(OSC_Freq_KHz)
		84	Port map( clk,reset,clk_1us);
		85
		86
		87
		88	process(clk_1us,reset_i)
		89	begin
		90	if reset_i = '0' then
		91	i <= 0;
		92	elsif clk_1us'event and clk_1us ='1' then
		93	i <= i+1;
		94	end if;
		95	end process;
		96
		97	LCD_CTRL.LCD_RW <= '0';
		98
		99	process(clk,reset)
		100	begin
		101	if reset = '0' then
		102	state <= idle;
		103	LCD_CTRL.LCD_E <= '0';
		104	SYNCH.DRVR_READY <= '0';
		105	SYNCH.LCD_INITIALISED <= '0';
		106	reset_i <= '0';
		107	elsif clk'event and clk = '1' then
		108	case state is
		109	when idle =>
		110	SYNCH.LCD_INITIALISED <= '1';
		111	LCD_CTRL.LCD_E <= '0';
		112	if DRIVER_CMD.Exec = '1' then
		113	state <= Enable0;
		114	reset_i <= '1';
		115	SYNCH.DRVR_READY <= '0';
		116	LCD_CTRL.LCD_DATA <= DRIVER_CMD.Word;
		117	LCD_CTRL.LCD_RS <= DRIVER_CMD.CMD_Data;
		118	case DRIVER_CMD.Duration is
		119	when Duration_4us =>
		120	tempoTRIG <= trigger_4us;
		121	when Duration_100us =>
		122	tempoTRIG <= trigger_100us;
		123	when Duration_4ms =>
		124	tempoTRIG <= trigger_4ms;
		125	when Duration_20ms =>
		126	tempoTRIG <= trigger_20ms;
		127	when others =>
		128	tempoTRIG <= trigger_20ms;
		129	end case;
		130	else
		131	SYNCH.DRVR_READY <= '1';
		132	reset_i <= '0';
		133	end if;
		134	when Enable0 =>
		135	if i = 1 then
		136	reset_i <= '0';
		137	LCD_CTRL.LCD_E <= '1';
		138	state <= Enable1;
		139	else
		140	reset_i <= '1';
		141	LCD_CTRL.LCD_E <= '0';
		142	end if;
		143	when Enable1 =>
		144	if i = 2 then
		145	reset_i <= '0';
		146	LCD_CTRL.LCD_E <= '0';
		147	state <= Enable2;
		148	else
		149	reset_i <= '1';
		150	LCD_CTRL.LCD_E <= '1';
		151	end if;
		152	when Enable2 =>
		153	if i = 1 then
		154	reset_i <= '0';
		155	LCD_CTRL.LCD_E <= '0';
		156	state <= tempo;
		157	else
		158	reset_i <= '1';
		159	LCD_CTRL.LCD_E <= '0';
		160	end if;
		161	when tempo =>
		162	if i = tempoTRIG then
		163	reset_i <= '0';
		164	state <= idle;
		165	else
		166	reset_i <= '1';
		167	end if;
		168	end case;
		169	end if;
		170	end process;
		171
62	end Behavioral;	172	end Behavioral;
63		173
64		174
65		175
66		176
67		177
		178
		179
		180
		181
		182
		183
		184
		185
		186
		187

lib/lpp/amba_lcd_16x2_ctrlr/LCD_16x2_ENGINE.vhd +2 -2

             					DRIVER_CMD.Duration	<=	Duration_100us;
             					DRIVER_CMD.CMD_Data	<=	'1';
             					DRIVER_CMD.Word			<=	DATA(i*8+7 downto i*8);
-            					i	<=	i + 1;
             					state	<=	Refresh0;
             				else
             					DRIVER_CMD.Exec		<=	'0';
             				end if;
             			when Refresh0=>
+            				i	<=	i + 1;
             				state	<=	Refresh1;
             				DRIVER_CMD.Exec		<=	'0';
             			when Refresh1=>
             					DRIVER_CMD.Exec		<=	'1';
             					DRIVER_CMD.Duration	<=	Duration_4ms;
             					DRIVER_CMD.CMD_Data	<=	'0';
-            					DRIVER_CMD.Word			<= X"02";
+            					DRIVER_CMD.Word			<= RetHome;
             					state	<=	Idle;
             				else
             					DRIVER_CMD.Exec		<=	'0';

lib/lpp/amba_lcd_16x2_ctrlr/Top_LCD.vhd +1 -2

             SF_CE0	<=	'1';
-            rst <= not reset;
             Driver0 : LCD_16x2_ENGINE
             	generic map(50000)
-                Port map(clk,rst,FramBUFF,CMD,Exec,Ready,LCD_CTRL);
+                Port map(clk,reset,FramBUFF,CMD,Exec,Ready,LCD_CTRL);
             FramBUFF(0*8+7 downto 0*8)	<=	X"41" when	Bp0 = '1' else
             								X"42" when	Bp1 = '1' else

lib/lpp/dirs.txt +2 -1

@@ -1,3 +1,4
1	./dsp/iir_filter
2	./general_purpose	1	./general_purpose
3	./lpp_amba	2	./lpp_amba
		3	./dsp/iir_filter
		4	./amba_lcd_16x2_ctrlr

lib/lpp/dsp/iir_filter/vhdlsyn.txt +4 -4

             APB_IIR_CEL.vhd
-            FILTER.vhd
-            FILTER_RAM_CTRLR.vhd
             FILTERcfg.vhd
             FilterCTRLR.vhd
+            FILTER_RAM_CTRLR.vhd
+            FILTER.vhd
             IIR_CEL_CTRLR.vhd
             IIR_CEL_FILTER.vhd
-            RAM.vhd
+            iir_filter.vhd
             RAM_CEL.vhd
             RAM_CTRLR2.vhd
+            RAM.vhd
             Top_Filtre_IIR.vhd
-            iir_filter.vhd

lib/lpp/general_purpose/vhdlsyn.txt +5 -5

+            Adder.vhd
             ADDRcntr.vhd
             ALU.vhd
-            Adder.vhd
+            general_purpose.vhd
-            MAC.vhd
             MAC_CONTROLER.vhd
+            MAC_MUX2.vhd
             MAC_MUX.vhd
-            MAC_MUX2.vhd
             MAC_REG.vhd
+            MAC.vhd
+            Multiplier.vhd
             MUX2.vhd
-            Multiplier.vhd
             REG.vhd
             Shifter.vhd
-            general_purpose.vhd

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages