From 72e80dda8e3e692e3afd6e1f07fbb69fca2e80bf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Jan 2014 16:07:58 -0600 Subject: [PATCH] Add ability to hard reset user device Fix initial size of serial and terminal windows --- clients/tde/src/part/prototerminal/part.cpp | 3 +++ clients/tde/src/part/serialconsole/part.cpp | 3 +++ fpga/gpmc/xilinx/common/main.v | 10 +++++++++- fpga/gpmc/xilinx/numato/spartan6/xc6slx9/main.ucf | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/clients/tde/src/part/prototerminal/part.cpp b/clients/tde/src/part/prototerminal/part.cpp index cf7e283..1ac3d04 100644 --- a/clients/tde/src/part/prototerminal/part.cpp +++ b/clients/tde/src/part/prototerminal/part.cpp @@ -64,6 +64,9 @@ ProtoTerminalPart::ProtoTerminalPart( TQWidget *parentWidget, const char *widget // Create widgets m_base = new ProtoTerminalBase(widget()); + // Initialize widgets + m_base->setMinimumSize(500,350); + connect(m_base->sendText, SIGNAL(clicked()), this, SLOT(sendTextClicked())); connect(m_base->textInput, SIGNAL(returnPressed()), m_base->sendText, SIGNAL(clicked())); diff --git a/clients/tde/src/part/serialconsole/part.cpp b/clients/tde/src/part/serialconsole/part.cpp index 9343f38..f22901e 100644 --- a/clients/tde/src/part/serialconsole/part.cpp +++ b/clients/tde/src/part/serialconsole/part.cpp @@ -64,6 +64,9 @@ SerialConsolePart::SerialConsolePart( TQWidget *parentWidget, const char *widget // Create widgets m_base = new SerialConsoleBase(widget()); + // Initialize widgets + m_base->setMinimumSize(500,350); + connect(m_base->sendText, SIGNAL(clicked()), this, SLOT(sendTextClicked())); connect(m_base->textInput, SIGNAL(returnPressed()), m_base->sendText, SIGNAL(clicked())); diff --git a/fpga/gpmc/xilinx/common/main.v b/fpga/gpmc/xilinx/common/main.v index cd811fa..bf6e023 100644 --- a/fpga/gpmc/xilinx/common/main.v +++ b/fpga/gpmc/xilinx/common/main.v @@ -58,10 +58,15 @@ module main( output reg sixteen_bit_io_mode, input [3:0] sseg_mux, - input [7:0] sseg_data); + input [7:0] sseg_data, + + output userdevice_reset); parameter RAM_ADDR_BITS = 15; + reg userdevice_reset_reg; + assign userdevice_reset = ~userdevice_reset_reg; + assign host_serial_txd = userlogic_serial_rxd; assign userlogic_serial_txd = host_serial_rxd; @@ -394,6 +399,7 @@ module main( // 0x0b: Number of address bits of DSP RAM (read only) // 0x0c: User device control // Bit 0: User logic reset + // Bit 1: User device reset // 0x20 - 0x3f: LCD data area // 0x4000 - 0x7fff: Logic analyzer data area (read only) if (gpmc_wen_reg == 1'b0) begin @@ -420,6 +426,7 @@ module main( end 12: begin userlogic_reset = gpmc_data_reg[0]; + userdevice_reset_reg = gpmc_data_reg[1]; end default: begin // Do nothing @@ -503,6 +510,7 @@ module main( end 12: begin gpmc_data_out[0] = userlogic_reset; + gpmc_data_out[1] = userdevice_reset_reg; gpmc_data_out[7:1] = 0; end default: begin diff --git a/fpga/gpmc/xilinx/numato/spartan6/xc6slx9/main.ucf b/fpga/gpmc/xilinx/numato/spartan6/xc6slx9/main.ucf index 1cece62..8d5384f 100644 --- a/fpga/gpmc/xilinx/numato/spartan6/xc6slx9/main.ucf +++ b/fpga/gpmc/xilinx/numato/spartan6/xc6slx9/main.ucf @@ -42,6 +42,7 @@ NET "userproc_start" LOC = "K16" | SLEW = FAST | IOSTANDARD = "LVCMOS33"; NET "userproc_done" LOC = "L13" | IOSTANDARD = "LVCMOS33"; NET "userlogic_reset" LOC = "E13" | SLEW = FAST | IOSTANDARD = "LVCMOS33"; NET "userlogic_clock" LOC = "F13" | IOSTANDARD = "LVCMOS33"; +NET "userdevice_reset" LOC = "D17" | SLEW = FAST | DRIVE = 24 | IOSTANDARD = "LVCMOS33"; NET "userlogic_serial_txd" LOC = "C14" | SLEW = FAST | IOSTANDARD = "LVCMOS33"; NET "userlogic_serial_rxd" LOC = "D14" | IOSTANDARD = "LVCMOS33";