Merge branch 'develop' of https://github.com/benitoss/icestudio into …

…develop
FPGAwars · Sep 30, 2023 · 2a16846 · 2a16846
2 parents a83b20a + 18c6afa
commit 2a16846
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/app/resources/boards/blackice-mx/pinout.json b/app/resources/boards/blackice-mx/pinout.json
@@ -1,3 +1 @@
-[{"type": "output", "name": "SS", "value": "71"},{"type": "output", "name": "SCK", "value": "70"},	{"type": "inout", "name": "TD2P", "value": "48"},	{"type": "inout", "name": "TD2M", "value": "47"},	{"type": "inout", "name": "TD1P", "value": "45"},	{"type": "inout", "name": "TD1M", "value": "44"},	{"type": "inout", "name": "TD0P", "value": "43"},	{"type": "inout", "name": "TD0M", "value": "42"},	{"type": "inout", "name": "CKP", "value": "41"},	{"type": "inout", "name": "CKM", "value": "29"}, {"type": "inout", "name": "PMOD[0]", "value": "38"},	{"type": "inout", "name": "PMOD[1]", "value": "37"},	{"type": "inout", "name": "PMOD[2]", "value": "32"},	{"type": "inout", "name": "PMOD[3]", "value": "31"},	{"type": "inout", "name": "PMOD[4]", "value": "34"},	{"type": "inout", "name": "PMOD[5]", "value": "33"},	{"type": "inout", "name": "PMOD[6]", "value": "29"},	{"type": "inout", "name": "PMOD[7]", "value": "28"},	{"type": "inout", "name": "PMOD[8]", "value": "18"},	{"type": "inout", "name": "PMOD[9]", "value": "17"},	{"type": "inout", "name": "PMOD[10]", "value": "12"},	{"type": "inout", "name": "PMOD[11]", "value": "11"},	{"type": "inout", "name": "PMOD[12]", "value": "16"},	{"type": "inout", "name": "PMOD[13]", "value": "15"},	{"type": "inout", "name": "PMOD[14]", "value": "10"},	{"type": "inout", "name": "PMOD[15]", "value": "9"},	{"type": "inout", "name": "PMOD[16]", "value": "136"},	{"type": "inout", "name": "PMOD[17]", "value": "137"},	{"type": "inout", "name": "PMOD[18]", "value": "134"},	{"type": "inout", "name": "PMOD[19]", "value": "135"},	{"type": "inout", "name": "PMOD[20]", "value": "141"},	{"type": "inout", "name": "PMOD[21]", "value": "142"},	{"type": "inout", "name": "PMOD[22]", "value": "138"},	{"type": "inout", "name": "PMOD[23]", "value": "139"},	{"type": "inout", "name": "PMOD[24]", "value": "1"}, {"type": "inout", "name": "PMOD[25]", "value": "2"},	{"type": "inout", "name": "PMOD[26]", "value": "7"},	{"type": "inout", "name": "PMOD[27]", "value": "8"},	{"type": "inout", "name": "PMOD[28]", "value": "143"}, {"type": "inout", "name": "PMOD[29]", "value": "144"},	{"type": "inout", "name": "PMOD[30]", "value": "3"},	{"type": "inout", "name": "PMOD[31]", "value": "4"},	{"type": "inout", "name": "PMOD[32]", "value": "106"},	{"type": "inout", "name": "PMOD[33]", "value": "105"},	{"type": "inout", "name": "PMOD[34]", "value": "101"},	{"type": "inout", "name": "PMOD[35]", "value": "99"},	{"type": "inout", "name": "PMOD[36]", "value": "104"},	{"type": "inout", "name": "PMOD[37]", "value": "102"},	{"type": "inout", "name": "PMOD[38]", "value": "49"},	{"type": "inout", "name": "PMOD[39]", "value": "52"},	{"type": "inout", "name": "PMOD[40]", "value": "19"},	{"type": "inout", "name": "PMOD[41]", "value": "20"},	{"type": "inout", "name": "PMOD[42]", "value": "23"},	{"type": "inout", "name": "PMOD[43]", "value": "24"},	{"type": "inout", "name": "PMOD[44]", "value": "21"},	{"type": "inout", "name": "PMOD[45]", "value": "22"},	{"type": "inout", "name": "PMOD[46]", "value": "25"},	{"type": "inout", "name": "PMOD[47]", "value": "26"},	{"type": "inout", "name": "ADR11", "value": "114"},	{"type": "inout", "name": "ADR10", "value": "115"},	{"type": "inout", "name": "ADR9", "value": "116"},	{"type": "inout", "name": "ADR8", "value": "118"},	{"type": "inout", "name": "ADR7", "value": "120"},	{"type": "inout", "name": "ADR6", "value": "122"},{"type": "inout", "name": "ADR5", "value": "125"},	{"type": "inout", "name": "ADR4", "value": "130"},	{"type": "inout", "name": "ADR3", "value": "124"},	{"type": "inout", "name": "ADR2", "value": "121"},	{"type": "inout", "name": "ADR1", "value": "119"},	{"type": "inout", "name": "ADR0", "value": "117"},	{"type": "inout", "name": "UDQM", "value": "94"},	{"type": "inout", "name": "LDQM", "value": "93"},	{"type": "inout", "name": "WE", "value": "107"},	{"type": "inout", "name": "CAS", "value": "110"},	{"type": "inout", "name": "RAS", "value": "112"},	{"type": "inout", "name": "MCS", "value": "113"},	{"type": "inout", "name": "CKE", "value": "128"},	{"type": "inout", "name": "RCLK", "value": "129"},	{"type": "inout", "name": "DAT15", "value": "98"},	{"type": "inout", "name": "DAT14", "value": "97"},	{"type": "inout", "name": "DAT13", "value": "96"},	{"type": "inout", "name": "DAT12", "value": "95"},	{"type": "inout", "name": "DAT11", "value": "91"},	{"type": "inout", "name": "DAT10", "value": "90"},	{"type": "inout", "name": "DAT9", "value": "88"},	{"type": "inout", "name": "DAT8", "value": "87"},	{"type": "inout", "name": "DAT7", "value": "85"},	{"type": "inout", "name": "DAT6", "value": "84"},	{"type": "inout", "name": "DAT5", "value": "83"},	{"type": "inout", "name": "DAT4", "value": "82"},	{"type": "inout", "name": "DAT3", "value": "81"},	{"type": "inout", "name": "DAT2", "value": "80"},	{"type": "inout", "name": "DAT1", "value": "79"},	{"type": "inout", "name": "DAT0", "value": "78"},	{"type": "inout", "name": "IO0", "value": "73"},	{"type": "inout", "name": "IO1", "value": "74"},	{"type": "inout", "name": "DCS", "value": "75"},	{"type": "inout", "name": "DSCK", "value": "76"},	{"type": "inout", "name": "HOLD", "value": "63"},	{"type": "inout", "name": "WP", "value": "64"},	{"type": "inout", "name": "MOSI", "value": "67"},	{"type": "inout", "name": "MISO", "value": "68"},	{"type": "inout", "name": "TX", "value": "61"},	{"type": "inout", "name": "RX", "value": "62"},	{"type": "output", "name": "LED_BLUE", "value": "49"},	{"type": "output", "name": "LED_GREEN", "value": "52"},	{"type": "output", "name": "LED_YELLOW", "value": "55"},	{"type": "output", "name": "LED_RED", "value": "56"},	{"type": "input", "name": "CLK", "value": "60"},	{"type": "input", "name": "B2", "value": "64"},	{"type": "input", "name": "B1", "value": "63"},
-  {"type": "output", "name": "NULL", "value": "NULL"},
-  {"type": "input", "name": "NULL", "value": "NULL"}]
+[{"name": "yellow_led", "value": "55", "type": "inout"}, {"name": "wp", "value": "64", "type": "inout"}, {"name": "we", "value": "107", "type": "inout"}, {"name": "udqm", "value": "94", "type": "inout"}, {"name": "tx", "value": "61", "type": "inout"}, {"name": "ss", "value": "71", "type": "inout"}, {"name": "sck", "value": "70", "type": "inout"}, {"name": "rx", "value": "62", "type": "inout"}, {"name": "red_led", "value": "56", "type": "inout"}, {"name": "rclk", "value": "129", "type": "inout"}, {"name": "ras", "value": "112", "type": "inout"}, {"name": "mosi", "value": "67", "type": "inout"}, {"name": "miso", "value": "68", "type": "inout"}, {"name": "mcs", "value": "113", "type": "inout"}, {"name": "ldqm", "value": "93", "type": "inout"}, {"name": "io1", "value": "74", "type": "inout"}, {"name": "io0", "value": "73", "type": "inout"}, {"name": "hold", "value": "63", "type": "inout"}, {"name": "dsck", "value": "76", "type": "inout"}, {"name": "dcs", "value": "75", "type": "inout"}, {"name": "clk", "value": "60", "type": "inout"}, {"name": "cke", "value": "128", "type": "inout"}, {"name": "cas", "value": "110", "type": "inout"}, {"name": "button2", "value": "49", "type": "inout"}, {"name": "button1", "value": "52", "type": "inout"}, {"name": "TD2P", "value": "48", "type": "inout"}, {"name": "TD2M", "value": "47", "type": "inout"}, {"name": "TD1P", "value": "45", "type": "inout"}, {"name": "TD1M", "value": "44", "type": "inout"}, {"name": "TD0P", "value": "43", "type": "inout"}, {"name": "TD0M", "value": "42", "type": "inout"}, {"name": "PMOD[9]", "value": "17", "type": "inout"}, {"name": "PMOD[8]", "value": "18", "type": "inout"}, {"name": "PMOD[7]", "value": "28", "type": "inout"}, {"name": "PMOD[6]", "value": "29", "type": "inout"}, {"name": "PMOD[5]", "value": "33", "type": "inout"}, {"name": "PMOD[4]", "value": "34", "type": "inout"}, {"name": "PMOD[47]", "value": "26", "type": "inout"}, {"name": "PMOD[46]", "value": "25", "type": "inout"}, {"name": "PMOD[45]", "value": "22", "type": "inout"}, {"name": "PMOD[44]", "value": "21", "type": "inout"}, {"name": "PMOD[43]", "value": "24", "type": "inout"}, {"name": "PMOD[42]", "value": "23", "type": "inout"}, {"name": "PMOD[41]", "value": "20", "type": "inout"}, {"name": "PMOD[40]", "value": "19", "type": "inout"}, {"name": "PMOD[3]", "value": "31", "type": "inout"}, {"name": "PMOD[39]", "value": "52", "type": "inout"}, {"name": "PMOD[38]", "value": "49", "type": "inout"}, {"name": "PMOD[37]", "value": "102", "type": "inout"}, {"name": "PMOD[36]", "value": "104", "type": "inout"}, {"name": "PMOD[35]", "value": "99", "type": "inout"}, {"name": "PMOD[34]", "value": "101", "type": "inout"}, {"name": "PMOD[33]", "value": "105", "type": "inout"}, {"name": "PMOD[32]", "value": "106", "type": "inout"}, {"name": "PMOD[31]", "value": "4", "type": "inout"}, {"name": "PMOD[30]", "value": "3", "type": "inout"}, {"name": "PMOD[2]", "value": "32", "type": "inout"}, {"name": "PMOD[29]", "value": "144", "type": "inout"}, {"name": "PMOD[28]", "value": "143", "type": "inout"}, {"name": "PMOD[27]", "value": "8", "type": "inout"}, {"name": "PMOD[26]", "value": "7", "type": "inout"}, {"name": "PMOD[25]", "value": "2", "type": "inout"}, {"name": "PMOD[24]", "value": "1", "type": "inout"}, {"name": "PMOD[23]", "value": "139", "type": "inout"}, {"name": "PMOD[22]", "value": "138", "type": "inout"}, {"name": "PMOD[21]", "value": "142", "type": "inout"}, {"name": "PMOD[20]", "value": "141", "type": "inout"}, {"name": "PMOD[1]", "value": "37", "type": "inout"}, {"name": "PMOD[19]", "value": "135", "type": "inout"}, {"name": "PMOD[18]", "value": "134", "type": "inout"}, {"name": "PMOD[17]", "value": "137", "type": "inout"}, {"name": "PMOD[16]", "value": "136", "type": "inout"}, {"name": "PMOD[15]", "value": "9", "type": "inout"}, {"name": "PMOD[14]", "value": "10", "type": "inout"}, {"name": "PMOD[13]", "value": "15", "type": "inout"}, {"name": "PMOD[12]", "value": "16", "type": "inout"}, {"name": "PMOD[11]", "value": "11", "type": "inout"}, {"name": "PMOD[10]", "value": "12", "type": "inout"}, {"name": "PMOD[0]", "value": "38", "type": "inout"}, {"name": "DQ[9]", "value": "88", "type": "inout"}, {"name": "DQ[8]", "value": "87", "type": "inout"}, {"name": "DQ[7]", "value": "85", "type": "inout"}, {"name": "DQ[6]", "value": "84", "type": "inout"}, {"name": "DQ[5]", "value": "83", "type": "inout"}, {"name": "DQ[4]", "value": "82", "type": "inout"}, {"name": "DQ[3]", "value": "81", "type": "inout"}, {"name": "DQ[2]", "value": "80", "type": "inout"}, {"name": "DQ[1]", "value": "79", "type": "inout"}, {"name": "DQ[15]", "value": "98", "type": "inout"}, {"name": "DQ[14]", "value": "97", "type": "inout"}, {"name": "DQ[13]", "value": "96", "type": "inout"}, {"name": "DQ[12]", "value": "95", "type": "inout"}, {"name": "DQ[11]", "value": "91", "type": "inout"}, {"name": "DQ[10]", "value": "90", "type": "inout"}, {"name": "DQ[0]", "value": "78", "type": "inout"}, {"name": "CKP", "value": "41", "type": "inout"}, {"name": "CKM", "value": "39", "type": "inout"}, {"name": "A[9]", "value": "116", "type": "inout"}, {"name": "A[8]", "value": "118", "type": "inout"}, {"name": "A[7]", "value": "120", "type": "inout"}, {"name": "A[6]", "value": "122", "type": "inout"}, {"name": "A[5]", "value": "125", "type": "inout"}, {"name": "A[4]", "value": "130", "type": "inout"}, {"name": "A[3]", "value": "124", "type": "inout"}, {"name": "A[2]", "value": "121", "type": "inout"}, {"name": "A[1]", "value": "119", "type": "inout"}, {"name": "A[11]", "value": "114", "type": "inout"}, {"name": "A[10]", "value": "115", "type": "inout"}, {"name": "A[0]", "value": "117", "type": "inout"}]
diff --git a/app/resources/boards/blackice-mx/pinout.pcf b/app/resources/boards/blackice-mx/pinout.pcf
@@ -146,4 +146,4 @@ set_io yellow_led 55
 set_io red_led 56
 
 # -Onboard 25Mhz oscillator
-set_io clk 60
+set_io clk 60
diff --git a/app/scripts/services/compiler.js b/app/scripts/services/compiler.js
@@ -867,7 +867,9 @@ angular.module('icestudio')
               let pullmode = common.selectedBoard.pinout.find(x => x.value === value).pullmode;
               pullmode = (typeof pullmode === 'undefined') ? 'NONE' : pullmode;
 
-              code += 'PULLMODE=' + pullmode;
+              if (pullmode === 'UP'|| pullmode === 'DOWN'){
+                code += 'PULLMODE=' + pullmode;
+              }
               code += ' IO_TYPE=LVCMOS33 DRIVE=4;\n\n';
             }
           } else if (block.data.pins.length > 0) {
@@ -886,8 +888,10 @@ angular.module('icestudio')
             //-- Get the pullmode property of the physical pin (its id is pin.value)
             let pullmode = common.selectedBoard.pinout.find(x => x.value === value).pullmode;
             pullmode = (typeof pullmode === 'undefined') ? 'NONE' : pullmode;
-
-            code += 'PULLMODE=' + pullmode;
+
+            if (pullmode === 'UP'|| pullmode === 'DOWN'){
+                code += 'PULLMODE=' + pullmode;
+            }
             code += ' IO_TYPE=LVCMOS33 DRIVE=4;\n\n';
           }
         }
@@ -1127,4 +1131,4 @@ angular.module('icestudio')
       return params;
     }
 
-  });
+  });