CPLD: Switch sense of LCD_RD/WR pins.

Should keep CPLD settled when in HackRF mode.

firmware/application/portapack.cpp

@@ -49,8 +49,8 @@ namespace portapack {
 
 portapack::IO io {
 	portapack::gpio_dir,
-	portapack::gpio_lcd_rd,
+	portapack::gpio_lcd_rdx,
-	portapack::gpio_lcd_wr,
+	portapack::gpio_lcd_wrx,
 	portapack::gpio_io_stbx,
 	portapack::gpio_addr,
 	portapack::gpio_lcd_te,

firmware/common/pins.hpp

@@ -64,20 +64,20 @@ constexpr Pin pins[] = {
 	[P1_18] = {  1, 18, PinConfig::gpio_out_with_pulldown(0) }, /* SGPIO12/BANK2F3M12: CPLD.70/HOST_INVERT(I) */
 	[P1_19] = {  1, 19, { .mode=1, .pd=1, .pu=0, .fast=0, .input=0, .ifilt=1 } }, /* SSP1_SCK/P39: MAX2837.SCLK(I), MAX5864.SCLK(I) */
 	[P1_20] = {  1, 20, { .mode=0, .pd=0, .pu=1, .fast=0, .input=0, .ifilt=1 } }, /* CS_XCVR/P53: MAX2837.CS(I) */
-	[P2_0]  = {  2,  0, { .mode=4, .pd=0, .pu=1, .fast=0, .input=1, .ifilt=1 } }, /* U0_TXD: PortaPack P2_0/IO_STBX */
+	[P2_0]  = {  2,  0, { .mode=4, .pd=0, .pu=0, .fast=0, .input=1, .ifilt=1 } }, /* U0_TXD: PortaPack P2_0/IO_STBX */
-	[P2_1]  = {  2,  1, { .mode=4, .pd=1, .pu=0, .fast=0, .input=1, .ifilt=1 } }, /* U0_RXD: PortaPack P2_1/ADDR */
+	[P2_1]  = {  2,  1, { .mode=4, .pd=0, .pu=0, .fast=0, .input=1, .ifilt=1 } }, /* U0_RXD: PortaPack P2_1/ADDR */
 	[P2_2]  = {  2,  2, PinConfig::sgpio_inout_fast(0) }, /* SGPIO6/BANK2F3M16: CPLD.61/HOST_DATA6(IO) */
 	[P2_3]  = {  2,  3, { .mode=4, .pd=0, .pu=0, .fast=0, .input=1, .ifilt=1 } }, /* I2C1_SDA: PortaPack P2_3/LCD_TE */
-	[P2_4]  = {  2,  4, { .mode=4, .pd=0, .pu=0, .fast=0, .input=1, .ifilt=1 } }, /* I2C1_SCL: PortaPack P2_4/LCD_RD */
+	[P2_4]  = {  2,  4, { .mode=4, .pd=0, .pu=0, .fast=0, .input=1, .ifilt=1 } }, /* I2C1_SCL: PortaPack P2_4/LCD_RDX */
 	[P2_5]  = {  2,  5, { .mode=4, .pd=0, .pu=1, .fast=0, .input=0, .ifilt=1 } }, /* RX/P43: U7.VCTL1(I), U10.VCTL1(I), U2.VCTL1(I) */
 	[P2_6]  = {  2,  6, { .mode=4, .pd=0, .pu=0, .fast=0, .input=0, .ifilt=1 } }, /* MIXER_SCLK/P31: 33pF, RFFC5072.SCLK(I) */
 	[P2_7]  = {  2,  7, { .mode=0, .pd=0, .pu=0, .fast=0, .input=1, .ifilt=1 } }, /* ISP: 10K PU, Unused */
 	[P2_8]  = {  2,  8, { .mode=4, .pd=0, .pu=0, .fast=0, .input=0, .ifilt=1 } }, /* P2_8: 10K PD, BOOT2, DFU switch, PortaPack P2_8/<unused> */
-	[P2_9]  = {  2,  9, { .mode=0, .pd=0, .pu=0, .fast=0, .input=0, .ifilt=1 } }, /* P2_9: 10K PD, BOOT3, PortaPack P2_9/LCD_WR */
+	[P2_9]  = {  2,  9, { .mode=0, .pd=0, .pu=0, .fast=0, .input=0, .ifilt=1 } }, /* P2_9: 10K PD, BOOT3, PortaPack P2_9/LCD_WRX */
 	[P2_10] = {  2, 10, { .mode=0, .pd=0, .pu=1, .fast=0, .input=0, .ifilt=1 } }, /* AMP_BYPASS/P50: U14.V2(I), U12.V2(I) */
 	[P2_11] = {  2, 11, { .mode=0, .pd=1, .pu=0, .fast=0, .input=0, .ifilt=1 } }, /* RX_AMP/P49: U12.V1(I), U14.V3(I) */
 	[P2_12] = {  2, 12, { .mode=0, .pd=0, .pu=0, .fast=0, .input=0, .ifilt=1 } }, /* !RX_AMP_PWR/P52: 10K PU, Q1.G(I), power to U13 (RX amp) */
-	[P2_13] = {  2, 13, { .mode=0, .pd=0, .pu=1, .fast=0, .input=1, .ifilt=1 } }, /* P2_13: PortaPack P2_13/DIR */
+	[P2_13] = {  2, 13, { .mode=0, .pd=0, .pu=0, .fast=0, .input=1, .ifilt=1 } }, /* P2_13: PortaPack P2_13/DIR */
 	[P3_0]  = {  3,  0, { .mode=2, .pd=0, .pu=1, .fast=0, .input=0, .ifilt=1 } }, /* I2S0_TX_SCK: PortaPack I2S0_TX_SCK(I) */
 	[P3_1]  = {  3,  1, { .mode=0, .pd=0, .pu=1, .fast=0, .input=1, .ifilt=1 } }, /* I2S0_RX_WS: PortaPack I2S0_TX_WS(I). Input enabled to fold back into RX. */
 	[P3_2]  = {  3,  2, { .mode=0, .pd=0, .pu=1, .fast=0, .input=0, .ifilt=1 } }, /* I2S0_RX_SDA: PortaPack I2S0_TX_SDA(I) */

firmware/common/portapack_hal.hpp

@@ -37,8 +37,8 @@ constexpr GPIO gpio_io_stbx		= gpio[GPIO5_0];	/* P2_0 */
 constexpr GPIO gpio_addr		= gpio[GPIO5_1];	/* P2_1 */
 constexpr GPIO gpio_lcd_te		= gpio[GPIO5_3];	/* P2_3 */
 constexpr GPIO gpio_unused		= gpio[GPIO5_7];	/* P2_8 */
-constexpr GPIO gpio_lcd_rd		= gpio[GPIO5_4];	/* P2_4 */
+constexpr GPIO gpio_lcd_rdx		= gpio[GPIO5_4];	/* P2_4 */
-constexpr GPIO gpio_lcd_wr		= gpio[GPIO1_10];	/* P2_9 */
+constexpr GPIO gpio_lcd_wrx		= gpio[GPIO1_10];	/* P2_9 */
 constexpr GPIO gpio_dir			= gpio[GPIO1_13];	/* P2_13 */
 constexpr std::array<GPIO, 8> gpios_data {
 	gpio[GPIO3_8],

firmware/common/portapack_io.cpp

@@ -43,8 +43,8 @@ void IO::init() {
 	addr(0);
 
 	gpio_dir.output();
-	gpio_lcd_rd.output();
+	gpio_lcd_rdx.output();
-	gpio_lcd_wr.output();
+	gpio_lcd_wrx.output();
 	gpio_io_stbx.output();
 	gpio_addr.output();
 	gpio_rot_a.input();

firmware/common/portapack_io.hpp

@@ -80,15 +80,15 @@ public:
 
 	constexpr IO(
 		GPIO gpio_dir,
-		GPIO gpio_lcd_rd,
+		GPIO gpio_lcd_rdx,
-		GPIO gpio_lcd_wr,
+		GPIO gpio_lcd_wrx,
 		GPIO gpio_io_stbx,
 		GPIO gpio_addr,
 		GPIO gpio_rot_a,
 		GPIO gpio_rot_b
 	) : gpio_dir { gpio_dir },
-		gpio_lcd_rd { gpio_lcd_rd },
+		gpio_lcd_rdx { gpio_lcd_rdx },
-		gpio_lcd_wr { gpio_lcd_wr },
+		gpio_lcd_wrx { gpio_lcd_wrx },
 		gpio_io_stbx { gpio_io_stbx },
 		gpio_addr { gpio_addr },
 		gpio_rot_a { gpio_rot_a },
@@ -199,8 +199,8 @@ public:
 
 private:
 	const GPIO gpio_dir;
-	const GPIO gpio_lcd_rd;
+	const GPIO gpio_lcd_rdx;
-	const GPIO gpio_lcd_wr;
+	const GPIO gpio_lcd_wrx;
 	const GPIO gpio_io_stbx;
 	const GPIO gpio_addr;
 	const GPIO gpio_rot_a;
@@ -213,19 +213,19 @@ private:
 	uint8_t io_reg { 0x03 };
 
 	void lcd_rd_assert() {
-		gpio_lcd_rd.set();
+		gpio_lcd_rdx.clear();
 	}
 
 	void lcd_rd_deassert() {
-		gpio_lcd_rd.clear();
+		gpio_lcd_rdx.set();
 	}
 
 	void lcd_wr_assert() {
-		gpio_lcd_wr.set();
+		gpio_lcd_wrx.clear();
 	}
 
 	void lcd_wr_deassert() {
-		gpio_lcd_wr.clear();
+		gpio_lcd_wrx.set();
 	}
 
 	void io_stb_assert() {

hardware/portapack_h1/cpld/20150901/portapack_h1_cpld.qsf

@@ -287,3 +287,34 @@ set_instance_assignment -name CURRENT_STRENGTH_NEW "MINIMUM CURRENT" -to MCU_P2_
 set_instance_assignment -name SLOW_SLEW_RATE ON -to MCU_P2_8
 set_instance_assignment -name PCI_IO OFF -to MCU_P2_8
 set_global_assignment -name NUM_PARALLEL_PROCESSORS ALL
+
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[15]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[14]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[13]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[12]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[11]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[10]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[9]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[8]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[7]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[6]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[5]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[4]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[3]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[2]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[1]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[0]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_D[7]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_D[6]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_D[5]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_D[4]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_D[3]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_D[2]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_D[1]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_D[0]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_ADDR
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_DIR
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_IO_STBX
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_LCD_RD
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_LCD_WR
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_P2_8

hardware/portapack_h1/cpld/20150901/portapack_h1_cpld.sdc

@@ -45,7 +45,7 @@ set lcd_data_wr_hold 10.0
 # Create Clock
 #**************************************************************
 
-create_clock -name {MCU_LCD_WR} -period 66.000 -waveform { 0.000 33.000 } [get_ports {MCU_LCD_WR}]
+create_clock -name {MCU_LCD_WRX} -period 66.000 -waveform { 0.000 33.000 } [get_ports {MCU_LCD_WRX}]
 #create_clock -name strobe_virt -period 66.000
 
 #**************************************************************

hardware/portapack_h1/cpld/20150901/top.vhd

@@ -26,11 +26,11 @@ entity top is
 		MCU_D				:	inout	std_logic_vector(7 downto 0);
 		MCU_DIR			:	in		std_logic;
 		MCU_IO_STBX		:	in		std_logic;
-		MCU_LCD_WR		:	in		std_logic;
+		MCU_LCD_WRX		:	in		std_logic;
 		MCU_ADDR			:	in		std_logic;
 		MCU_LCD_TE		:	out	std_logic;
 		MCU_P2_8			:	in		std_logic;
-		MCU_LCD_RD		:	in		std_logic;
+		MCU_LCD_RDX		:	in		std_logic;
 		
 		TP_U				:	out	std_logic;
 		TP_D				:	out	std_logic;
@@ -112,13 +112,13 @@ begin
 	io_strobe <= (MCU_IO_STBX = '0');
 	io_read_strobe <= io_strobe and dir_read;
 
-	lcd_read_strobe <= (MCU_LCD_RD = '1');
+	lcd_read_strobe <= (MCU_LCD_RDX = '0');
 	lcd_write <= not lcd_read_strobe;
 
 	-- LCD interface
 	LCD_RS <= MCU_ADDR;
-	LCD_RDX <= not MCU_LCD_RD;
+	LCD_RDX <= MCU_LCD_RDX;
-	LCD_WRX <= not MCU_LCD_WR;
+	LCD_WRX <= MCU_LCD_WRX;
 
 	lcd_data_out <= lcd_data_out_q & mcu_data_in;
 	lcd_data_in <= LCD_DB;
@@ -136,17 +136,17 @@ begin
 	
 	-- Synchronous behaviors:
 	-- LCD write: Capture LCD high byte on LCD_WRX falling edge.
-	process(MCU_LCD_WR, mcu_data_in)
+	process(MCU_LCD_WRX, mcu_data_in)
 	begin
-		if rising_edge(MCU_LCD_WR) then
+		if falling_edge(MCU_LCD_WRX) then
 			lcd_data_out_q <= mcu_data_in;
 		end if;
 	end process;
 	
 	-- LCD read: Capture LCD low byte on LCD_RD falling edge.
-	process(MCU_LCD_RD, lcd_data_in)
+	process(MCU_LCD_RDX, lcd_data_in)
 	begin
-		if falling_edge(MCU_LCD_RD) then
+		if rising_edge(MCU_LCD_RDX) then
 			lcd_data_in_q <= lcd_data_in(7 downto 0);
 		end if;
 	end process;

hardware/portapack_h1/cpld/20170522/portapack_h1_cpld.qsf

@@ -290,3 +290,34 @@ set_instance_assignment -name CURRENT_STRENGTH_NEW "MINIMUM CURRENT" -to MCU_P2_
 set_instance_assignment -name SLOW_SLEW_RATE ON -to MCU_P2_8
 set_instance_assignment -name PCI_IO OFF -to MCU_P2_8
 set_global_assignment -name NUM_PARALLEL_PROCESSORS ALL
+
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[15]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[14]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[13]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[12]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[11]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[10]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[9]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[8]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[7]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[6]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[5]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[4]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[3]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[2]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[1]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to LCD_DB[0]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_D[7]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_D[6]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_D[5]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_D[4]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_D[3]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_D[2]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_D[1]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_D[0]
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_ADDR
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_DIR
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_IO_STBX
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_LCD_RD
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_LCD_WR
+set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to MCU_P2_8

hardware/portapack_h1/cpld/20170522/portapack_h1_cpld.sdc

@@ -45,7 +45,7 @@ set lcd_data_wr_hold 10.0
 # Create Clock
 #**************************************************************
 
-create_clock -name {MCU_LCD_WR} -period 66.000 -waveform { 0.000 33.000 } [get_ports {MCU_LCD_WR}]
+create_clock -name {MCU_LCD_WRX} -period 66.000 -waveform { 0.000 33.000 } [get_ports {MCU_LCD_WRX}]
 #create_clock -name strobe_virt -period 66.000
 
 #**************************************************************

hardware/portapack_h1/cpld/20170522/top.vhd

@@ -26,11 +26,11 @@ entity top is
 		MCU_D				:	inout	std_logic_vector(7 downto 0);
 		MCU_DIR			:	in		std_logic;
 		MCU_IO_STBX		:	in		std_logic;
-		MCU_LCD_WR		:	in		std_logic;
+		MCU_LCD_WRX		:	in		std_logic;
 		MCU_ADDR			:	in		std_logic;
 		MCU_LCD_TE		:	out	std_logic;
 		MCU_P2_8			:	in		std_logic;
-		MCU_LCD_RD		:	in		std_logic;
+		MCU_LCD_RDX		:	in		std_logic;
 		
 		TP_U				:	out	std_logic;
 		TP_D				:	out	std_logic;
@@ -116,13 +116,13 @@ begin
 	io_strobe <= (MCU_IO_STBX = '0');
 	io_read_strobe <= io_strobe and dir_read;
 
-	lcd_read_strobe <= (MCU_LCD_RD = '1');
+	lcd_read_strobe <= (MCU_LCD_RDX = '0');
 	lcd_write <= not lcd_read_strobe;
 
 	-- LCD interface
 	LCD_RS <= MCU_ADDR;
-	LCD_RDX <= not MCU_LCD_RD;
+	LCD_RDX <= MCU_LCD_RDX;
-	LCD_WRX <= not MCU_LCD_WR;
+	LCD_WRX <= MCU_LCD_WRX;
 
 	lcd_data_out <= lcd_data_out_q & mcu_data_in;
 	lcd_data_in <= LCD_DB;
@@ -141,17 +141,17 @@ begin
 	
 	-- Synchronous behaviors:
 	-- LCD write: Capture LCD high byte on LCD_WRX falling edge.
-	process(MCU_LCD_WR, mcu_data_in)
+	process(MCU_LCD_WRX, mcu_data_in)
 	begin
-		if rising_edge(MCU_LCD_WR) then
+		if falling_edge(MCU_LCD_WRX) then
 			lcd_data_out_q <= mcu_data_in;
 		end if;
 	end process;
 	
 	-- LCD read: Capture LCD low byte on LCD_RD falling edge.
-	process(MCU_LCD_RD, lcd_data_in)
+	process(MCU_LCD_RDX, lcd_data_in)
 	begin
-		if falling_edge(MCU_LCD_RD) then
+		if rising_edge(MCU_LCD_RDX) then
 			lcd_data_in_q <= lcd_data_in(7 downto 0);
 		end if;
 	end process;