stretcher implemented + dos2unix, AR + AP

diff --git a/pinout/padiwa_amps2.lpf b/pinout/padiwa_amps2.lpf
index 9a3f6d82d82dc8ddf8ff57ae6acbfefe067191cd..b3bfbc1d07a87b7771c6f86251f350590007a83d 100644 (file)
--- a/pinout/padiwa_amps2.lpf
+++ b/pinout/padiwa_amps2.lpf
@@ -1,148 +1,159 @@
-BLOCK RESETPATHS ;\r
-BLOCK ASYNCPATHS ;\r
-BLOCK RD_DURING_WR_PATHS ;\r
-\r
-#################################################################\r
-# Basic Settings\r
-#################################################################\r
-\r
-SYSCONFIG MCCLK_FREQ = 133.00 JTAG_PORT = ENABLE;\r
-FREQUENCY NET clk_i  133 MHz;\r
-#FREQUENCY NET clk_i_inferred_clock  133 MHz;\r
-# \r
-#   FREQUENCY PORT CLK_PCLK_RIGHT 200 MHz;\r
-#   FREQUENCY PORT CLK_PCLK_LEFT  200 MHz;\r
-#   FREQUENCY PORT CLK_GPLL_RIGHT 200 MHz;\r
-#   FREQUENCY PORT CLK_GPLL_LEFT  125 MHz;\r
-\r
-MULTICYCLE FROM PORT "SPI_*" 20.000000 ns ;\r
-MULTICYCLE TO PORT "SPI_*" 20.000000 ns ;\r
-\r
-\r
-BANK 0 VCCIO 3.3 V;\r
-\r
-\r
-#################################################################\r
-# I/O\r
-#################################################################\r
-LOCATE COMP  "CON_1"     SITE "A3";\r
-LOCATE COMP  "CON_2"     SITE "A4";\r
-LOCATE COMP  "CON_3"     SITE "A5";\r
-LOCATE COMP  "CON_4"     SITE "C4";\r
-LOCATE COMP  "CON_5"     SITE "D6";\r
-LOCATE COMP  "CON_6"     SITE "B7";\r
-LOCATE COMP  "CON_7"     SITE "E6";\r
-LOCATE COMP  "CON_8"     SITE "F7";\r
-LOCATE COMP  "CON_9"     SITE "F8";\r
-LOCATE COMP  "CON_10"    SITE "B9";\r
-LOCATE COMP  "CON_11"    SITE "D10";\r
-LOCATE COMP  "CON_12"    SITE "F9";\r
-LOCATE COMP  "CON_13"    SITE "A11";\r
-LOCATE COMP  "CON_14"    SITE "B11";\r
-LOCATE COMP  "CON_15"    SITE "C12";\r
-LOCATE COMP  "CON_16"    SITE "B13";\r
-DEFINE PORT GROUP "CON_group" "CON*" ;\r
-IOBUF GROUP  "CON_group" IO_TYPE=LVDS25;\r
-\r
-\r
-LOCATE COMP  "DISCHARGE_1"       SITE "T4";\r
-LOCATE COMP  "DISCHARGE_2"       SITE "N6";\r
-LOCATE COMP  "DISCHARGE_3"       SITE "N7";\r
-LOCATE COMP  "DISCHARGE_4"       SITE "M6";\r
-LOCATE COMP  "DISCHARGE_5"       SITE "M8";\r
-LOCATE COMP  "DISCHARGE_6"       SITE "L10";\r
-LOCATE COMP  "DISCHARGE_7"       SITE "P12";\r
-LOCATE COMP  "DISCHARGE_8"       SITE "T13";\r
-DEFINE PORT GROUP "DISCHARGE_group" "DISCHARGE*" ;\r
-IOBUF GROUP  "DISCHARGE_group" IO_TYPE=LVCMOS33 DRIVE=12 SLEWRATE=SLOW;\r
-\r
-LOCATE COMP  "I2C_SCL"   SITE "A9";\r
-LOCATE COMP  "I2C_SDA"   SITE "C9";\r
-IOBUF PORT  "I2C_SCL" IO_TYPE=LVTTL33 PULLMODE=UP;\r
-IOBUF PORT  "I2C_SDA" IO_TYPE=LVTTL33 PULLMODE=UP;\r
-\r
-LOCATE COMP  "LED_1"     SITE "P16";\r
-LOCATE COMP  "LED_2"     SITE "N15";\r
-LOCATE COMP  "LED_3"     SITE "M16";\r
-LOCATE COMP  "LED_4"     SITE "M15";\r
-LOCATE COMP  "LED_5"     SITE "L16";\r
-LOCATE COMP  "LED_6"     SITE "K15";\r
-LOCATE COMP  "LED_7"     SITE "J15";\r
-LOCATE COMP  "LED_8"     SITE "G15";\r
-DEFINE PORT GROUP "LED_group" "LED*" ;\r
-IOBUF GROUP  "LED_group" IO_TYPE=LVCMOS33 DRIVE=8;\r
-\r
-LOCATE COMP  "OSC_CORE"          SITE "H14";\r
-IOBUF PORT   "OSC_CORE" IO_TYPE=LVDS25; #DIFFRESISTOR=100;\r
-\r
-LOCATE COMP  "INP_FAST_1"        SITE "T2";\r
-LOCATE COMP  "INP_FAST_2"        SITE "R5";\r
-LOCATE COMP  "INP_FAST_3"        SITE "P6";\r
-LOCATE COMP  "INP_FAST_4"        SITE "T7";\r
-LOCATE COMP  "INP_FAST_5"        SITE "R9";\r
-LOCATE COMP  "INP_FAST_6"        SITE "P10";\r
-LOCATE COMP  "INP_FAST_7"        SITE "R11";\r
-LOCATE COMP  "INP_FAST_8"        SITE "R13";\r
-LOCATE COMP  "INP_SLOW_1"        SITE "T3";\r
-LOCATE COMP  "INP_SLOW_2"        SITE "T5";\r
-LOCATE COMP  "INP_SLOW_3"        SITE "R7";\r
-LOCATE COMP  "INP_SLOW_4"        SITE "P8";\r
-LOCATE COMP  "INP_SLOW_5"        SITE "T9";\r
-LOCATE COMP  "INP_SLOW_6"        SITE "T11";\r
-LOCATE COMP  "INP_SLOW_7"        SITE "R12";\r
-LOCATE COMP  "INP_SLOW_8"        SITE "T15";\r
-DEFINE PORT GROUP "INP_group" "INP*" ;\r
-IOBUF GROUP  "INP_group" IO_TYPE=LVDS25;\r
-\r
-LOCATE COMP  "PWM_1"     SITE "K1";\r
-LOCATE COMP  "PWM_2"     SITE "F1";\r
-LOCATE COMP  "PWM_3"     SITE "F3";\r
-LOCATE COMP  "PWM_4"     SITE "F2";\r
-LOCATE COMP  "PWM_5"     SITE "K2";\r
-LOCATE COMP  "PWM_6"     SITE "L4";\r
-LOCATE COMP  "PWM_7"     SITE "H6";\r
-LOCATE COMP  "PWM_8"     SITE "J4";\r
-LOCATE COMP  "PWM_9"     SITE "G11";\r
-LOCATE COMP  "PWM_10"    SITE "G6";\r
-LOCATE COMP  "PWM_11"    SITE "H11";\r
-LOCATE COMP  "PWM_12"    SITE "F12";\r
-LOCATE COMP  "PWM_13"    SITE "K14";\r
-LOCATE COMP  "PWM_14"    SITE "F14";\r
-LOCATE COMP  "PWM_15"    SITE "K16";\r
-LOCATE COMP  "PWM_16"    SITE "F16";\r
-DEFINE PORT GROUP "PWM_group" "PWM*" ;\r
-IOBUF GROUP  "PWM_group" IO_TYPE=LVCMOS33 DRIVE=4 SLEWRATE=SLOW;\r
-\r
-LOCATE COMP  "SPARE_LINE"        SITE "D8";\r
-IOBUF PORT  "SPARE_LINE" IO_TYPE=LVDS25;\r
-\r
-LOCATE COMP  "SPI_CLK"   SITE "D16";\r
-LOCATE COMP  "SPI_CS"    SITE "C15";\r
-LOCATE COMP  "SPI_IN"    SITE "D14";\r
-LOCATE COMP  "SPI_OUT"   SITE "B14";\r
-IOBUF PORT  "SPI_CLK" IO_TYPE=LVDS25; #DIFFRESISTOR=100\r
-IOBUF PORT  "SPI_CS"  IO_TYPE=LVDS25; #DIFFRESISTOR=100\r
-IOBUF PORT  "SPI_IN"  IO_TYPE=LVDS25; #DIFFRESISTOR=100\r
-IOBUF PORT  "SPI_OUT" IO_TYPE=LVDS25;\r
-\r
-\r
-\r
-LOCATE COMP  "TEST_LINE_0"       SITE "D2";\r
-LOCATE COMP  "TEST_LINE_1"       SITE "D1";\r
-LOCATE COMP  "TEST_LINE_2"       SITE "E2";\r
-LOCATE COMP  "TEST_LINE_3"       SITE "E1";\r
-LOCATE COMP  "TEST_LINE_4"       SITE "G1";\r
-LOCATE COMP  "TEST_LINE_5"       SITE "H2";\r
-LOCATE COMP  "TEST_LINE_6"       SITE "H1";\r
-LOCATE COMP  "TEST_LINE_7"       SITE "J2";\r
-LOCATE COMP  "TEST_LINE_8"       SITE "J1";\r
-LOCATE COMP  "TEST_LINE_9"       SITE "L2";\r
-LOCATE COMP  "TEST_LINE_10"      SITE "M2";\r
-LOCATE COMP  "TEST_LINE_11"      SITE "M1";\r
-LOCATE COMP  "TEST_LINE_12"      SITE "N2";\r
-LOCATE COMP  "TEST_LINE_13"      SITE "P2";\r
-DEFINE PORT GROUP "TEST_group" "TEST*" ;\r
-IOBUF GROUP  "TEST_group" IO_TYPE=LVCMOS33 DRIVE=8  PULLMODE=UP ;\r
-\r
-LOCATE COMP  "TMP_ALERT"         SITE "A8";\r
-IOBUF PORT  "TMP_ALERT" IO_TYPE=LVTTL33 PULLMODE=UP;\r
+BLOCK RESETPATHS ;
+BLOCK ASYNCPATHS ;
+BLOCK RD_DURING_WR_PATHS ;
+
+#################################################################
+# Basic Settings
+#################################################################
+
+SYSCONFIG MCCLK_FREQ = 133.00 JTAG_PORT = ENABLE;
+FREQUENCY NET clk_i  133 MHz;
+#FREQUENCY NET clk_i_inferred_clock  133 MHz;
+# 
+#   FREQUENCY PORT CLK_PCLK_RIGHT 200 MHz;
+#   FREQUENCY PORT CLK_PCLK_LEFT  200 MHz;
+#   FREQUENCY PORT CLK_GPLL_RIGHT 200 MHz;
+#   FREQUENCY PORT CLK_GPLL_LEFT  125 MHz;
+
+MULTICYCLE FROM PORT "SPI_*" 20.000000 ns ;
+MULTICYCLE TO PORT "SPI_*" 20.000000 ns ;
+
+
+BANK 0 VCCIO 3.3 V;
+
+
+#################################################################
+# I/O
+#################################################################
+LOCATE COMP  "CON_1"     SITE "A3";
+LOCATE COMP  "CON_2"     SITE "A4";
+LOCATE COMP  "CON_3"     SITE "A5";
+LOCATE COMP  "CON_4"     SITE "C4";
+LOCATE COMP  "CON_5"     SITE "D6";
+LOCATE COMP  "CON_6"     SITE "B7";
+LOCATE COMP  "CON_7"     SITE "E6";
+LOCATE COMP  "CON_8"     SITE "F7";
+LOCATE COMP  "CON_9"     SITE "F8";
+LOCATE COMP  "CON_10"    SITE "B9";
+LOCATE COMP  "CON_11"    SITE "D10";
+LOCATE COMP  "CON_12"    SITE "F9";
+LOCATE COMP  "CON_13"    SITE "A11";
+LOCATE COMP  "CON_14"    SITE "B11";
+LOCATE COMP  "CON_15"    SITE "C12";
+LOCATE COMP  "CON_16"    SITE "B13";
+DEFINE PORT GROUP "CON_group" "CON*" ;
+IOBUF GROUP  "CON_group" IO_TYPE=LVDS25;
+
+
+LOCATE COMP  "DISCHARGE_1"       SITE "T4";
+LOCATE COMP  "DISCHARGE_2"       SITE "N6";
+LOCATE COMP  "DISCHARGE_3"       SITE "N7";
+LOCATE COMP  "DISCHARGE_4"       SITE "M6";
+LOCATE COMP  "DISCHARGE_5"       SITE "M8";
+LOCATE COMP  "DISCHARGE_6"       SITE "L10";
+LOCATE COMP  "DISCHARGE_7"       SITE "P12";
+LOCATE COMP  "DISCHARGE_8"       SITE "T13";
+DEFINE PORT GROUP "DISCHARGE_group" "DISCHARGE*" ;
+IOBUF GROUP  "DISCHARGE_group" IO_TYPE=LVCMOS33 DRIVE=12 SLEWRATE=SLOW;
+
+LOCATE COMP  "I2C_SCL"   SITE "A9";
+LOCATE COMP  "I2C_SDA"   SITE "C9";
+IOBUF PORT  "I2C_SCL" IO_TYPE=LVTTL33 PULLMODE=UP;
+IOBUF PORT  "I2C_SDA" IO_TYPE=LVTTL33 PULLMODE=UP;
+
+LOCATE COMP  "LED_1"     SITE "P16";
+LOCATE COMP  "LED_2"     SITE "N15";
+LOCATE COMP  "LED_3"     SITE "M16";
+LOCATE COMP  "LED_4"     SITE "M15";
+LOCATE COMP  "LED_5"     SITE "L16";
+LOCATE COMP  "LED_6"     SITE "K15";
+LOCATE COMP  "LED_7"     SITE "J15";
+LOCATE COMP  "LED_8"     SITE "G15";
+DEFINE PORT GROUP "LED_group" "LED*" ;
+IOBUF GROUP  "LED_group" IO_TYPE=LVCMOS33 DRIVE=8;
+
+LOCATE COMP  "OSC_CORE"          SITE "H14";
+IOBUF PORT   "OSC_CORE" IO_TYPE=LVDS25; #DIFFRESISTOR=100;
+
+LOCATE COMP  "INP_FAST_1"        SITE "T2";
+LOCATE COMP  "INP_FAST_2"        SITE "R5";
+LOCATE COMP  "INP_FAST_3"        SITE "P6";
+LOCATE COMP  "INP_FAST_4"        SITE "T7";
+LOCATE COMP  "INP_FAST_5"        SITE "R9";
+LOCATE COMP  "INP_FAST_6"        SITE "P10";
+LOCATE COMP  "INP_FAST_7"        SITE "R11";
+LOCATE COMP  "INP_FAST_8"        SITE "R13";
+LOCATE COMP  "INP_SLOW_1"        SITE "T3";
+LOCATE COMP  "INP_SLOW_2"        SITE "T5";
+LOCATE COMP  "INP_SLOW_3"        SITE "R7";
+LOCATE COMP  "INP_SLOW_4"        SITE "P8";
+LOCATE COMP  "INP_SLOW_5"        SITE "T9";
+LOCATE COMP  "INP_SLOW_6"        SITE "T11";
+LOCATE COMP  "INP_SLOW_7"        SITE "R12";
+LOCATE COMP  "INP_SLOW_8"        SITE "T15";
+DEFINE PORT GROUP "INP_group" "INP*" ;
+IOBUF GROUP  "INP_group" IO_TYPE=LVDS25;
+
+LOCATE COMP  "PWM_1"     SITE "K1";
+LOCATE COMP  "PWM_2"     SITE "F1";
+LOCATE COMP  "PWM_3"     SITE "F3";
+LOCATE COMP  "PWM_4"     SITE "F2";
+LOCATE COMP  "PWM_5"     SITE "K2";
+LOCATE COMP  "PWM_6"     SITE "L4";
+LOCATE COMP  "PWM_7"     SITE "H6";
+LOCATE COMP  "PWM_8"     SITE "J4";
+LOCATE COMP  "PWM_9"     SITE "G11";
+LOCATE COMP  "PWM_10"    SITE "G6";
+LOCATE COMP  "PWM_11"    SITE "H11";
+LOCATE COMP  "PWM_12"    SITE "F12";
+LOCATE COMP  "PWM_13"    SITE "K14";
+LOCATE COMP  "PWM_14"    SITE "F14";
+LOCATE COMP  "PWM_15"    SITE "K16";
+LOCATE COMP  "PWM_16"    SITE "F16";
+DEFINE PORT GROUP "PWM_group" "PWM*" ;
+IOBUF GROUP  "PWM_group" IO_TYPE=LVCMOS33 DRIVE=4 SLEWRATE=SLOW;
+
+LOCATE COMP  "SPARE_LINE"        SITE "D8";
+IOBUF PORT  "SPARE_LINE" IO_TYPE=LVDS25;
+
+LOCATE COMP  "SPI_CLK"   SITE "D16";
+LOCATE COMP  "SPI_CS"    SITE "C15";
+LOCATE COMP  "SPI_IN"    SITE "D14";
+LOCATE COMP  "SPI_OUT"   SITE "B14";
+IOBUF PORT  "SPI_CLK" IO_TYPE=LVDS25; #DIFFRESISTOR=100
+IOBUF PORT  "SPI_CS"  IO_TYPE=LVDS25; #DIFFRESISTOR=100
+IOBUF PORT  "SPI_IN"  IO_TYPE=LVDS25; #DIFFRESISTOR=100
+IOBUF PORT  "SPI_OUT" IO_TYPE=LVDS25;
+
+
+
+LOCATE COMP  "TEST_LINE_0"       SITE "D2";
+LOCATE COMP  "TEST_LINE_1"       SITE "D1";
+LOCATE COMP  "TEST_LINE_2"       SITE "E2";
+LOCATE COMP  "TEST_LINE_3"       SITE "E1";
+LOCATE COMP  "TEST_LINE_4"       SITE "G1";
+LOCATE COMP  "TEST_LINE_5"       SITE "H2";
+LOCATE COMP  "TEST_LINE_6"       SITE "H1";
+LOCATE COMP  "TEST_LINE_7"       SITE "J2";
+LOCATE COMP  "TEST_LINE_8"       SITE "J1";
+LOCATE COMP  "TEST_LINE_9"       SITE "L2";
+LOCATE COMP  "TEST_LINE_10"      SITE "M2";
+LOCATE COMP  "TEST_LINE_11"      SITE "M1";
+LOCATE COMP  "TEST_LINE_12"      SITE "N2";
+LOCATE COMP  "TEST_LINE_13"      SITE "P2";
+DEFINE PORT GROUP "TEST_group" "TEST*" ;
+IOBUF GROUP  "TEST_group" IO_TYPE=LVCMOS33 DRIVE=8  PULLMODE=UP ;
+
+LOCATE COMP  "TMP_ALERT"         SITE "A8";
+IOBUF PORT  "TMP_ALERT" IO_TYPE=LVTTL33 PULLMODE=UP;
+
+
+UGROUP "StretchA" BBOX 1 16
+  BLKNAME THE_STRETCHER/Stretcher_A_1
+  ;
+LOCATE UGROUP "StretchA" SITE "R25C6";  
+  
+UGROUP "StretchB" BBOX 1 16
+  BLKNAME THE_STRETCHER/Stretcher_B_1
+  ;
+LOCATE UGROUP "StretchB" SITE "R2C6";