Added count and pin validators

examples/simplified FRISC model/frisc_library.csl

@@ -51,22 +51,14 @@
             x: 0; y:0; w:100; h:100;
         }
     }
-    @pin glavniPin inOut {
+    @pin glavniPin in {
         @tooltip "pin za spajanje na glavnu sabirnicu"
         @connection required("COMDEL se ne može stvoriti. FRISC nije spojen na sabirnicu")
         @display {
-            /*
-            pin {
-                x: 100; y: 50;
-                fillColor: white;
-                lineColor: red;
-                fillColorConnected: white;
-                lineColorConnected: black;
-                side: left;
-                size: 20;
-            }*/
             pin {
                 x: 42; y: 100; w: 16; h:16;
+                type: "in";
+                orientation: "bottom";
             }
         }
     }
@@ -183,7 +175,9 @@
             }
             */
             pin {
-                x: 42; y: -16; w: 16; h: 16;
+                x: 42; y: -16; w: 16; h:16;
+                type: "out";
+                orientation: "top";
             }
         }
     }
@@ -192,7 +186,7 @@
 @component DMA {
     @instanceName "dma"
     @tooltip "DMA-kontroler"
-    @count (1,1000)
+    @count (0,1000)
     @source "dma.cdl"
 
     @attribute pocetnaAdresa int default 0 {
@@ -303,20 +297,13 @@
     }
 }
 @bus PIOSabirnica automatic {
+    @count (0, 20)
     @wires {
         PIO_DATA<8>,
         READY,
         STROBE
     }
 }
-@bus Test singleAutomatic {
-    @tooltip "sabirnica za spajanje FRISC a s memorijama i UI/jedinicama"
-    @count (1,1)
-
-    @wires {
-        CONNECTOR,
-    }
-}
 
 @connection (FRISC.glavniPin, glavnaSabirnica) {
     @wires{ADR, DATA, READ, WRITE, SIZE, WAIT, INT0, INT1, INT2, INT3, IACK, 1, null}
@@ -344,23 +331,4 @@
 @connection (DMA.glavniPin, PIOSabirnica, FRISC.glavniPin) {
     @wires{PIO_DATA, READY, STROBE}
     @wires{PIO_DATA, READY, STROBE}
-}
-
-@connection (FRISC.glavniPin, Test, Memorija.glavniPin) {
-    @wires{null, "READY", null}
-    @wires{"PIO_DATA", null, null}
-
-    @attribute dmaPoveznica string default "" {
-        @popup automatic {
-            @title "Spoji DMA kraj"
-            @text "Odaberite poveznicu za dma kraja"
-        }
-    }
-
-    @attribute mmaPoveznica string default "" {
-        @popup automatic {
-            @title "Spoji MMA kraj"
-            @text "Odaberite poveznicu za mma kraja"
-        }
-    }
 }

examples/simplified FRISC model/schema.csl

@@ -1,33 +1,27 @@
 @source "frisc_library.csl"
 
 @schema {
-    @instance proc FRISC {
-        @position (0, 0)
-        @attribute _memory null
-    }
+	@instance proc FRISC {
+		@position (0, 0)
+		@attribute _memory null
+	}
 
-    @instance mem Memorija {
-        @position (0, 250)
-        @attribute sinkroniziran false
-        @attribute brzina 1
-        @attribute kapacitet 1024
-        @attribute size 8
-        @attribute pocetnaAdresa 1023
-    }
+	@instance mem Memorija {
+		@position (0, 250)
+		@attribute sinkroniziran false
+		@attribute brzina 1
+		@attribute kapacitet 1024
+		@attribute size 8
+		@attribute pocetnaAdresa 1024
+	}
 
-    @instance bus glavnaSabirnica {
-        @position (0, 200)
-        @size 100
-    }
+	@instance bus glavnaSabirnica {
+		@position (0, 200)
+		@size 100
+	}
 
-    @instance testBus Test {}
-
-    @connection (proc.glavniPin, bus) {}
-
-    @connection (mem.glavniPin, bus) {}
-
-    @connection (proc.glavniPin, testBus, mem.glavniPin) {
-        @attribute dmaPoveznica "READY"
-        @attribute mmaPoveznica "PIO_DATA"
-    }
-}
+	@connection (proc.glavniPin, bus) {
+	}
+	@connection (mem.glavniPin, bus) {
+	}
+}

examples/simplified FRISC model/schema2.csl

@@ -3,7 +3,7 @@
 @schema {
 	@instance proc FRISC {
 		@position (0, 0)
-		@attribute _memory mem
+		@attribute _memory null
 	}
 
 	@instance mem Memorija {
@@ -12,7 +12,7 @@
 		@attribute brzina 1
 		@attribute kapacitet 1024
 		@attribute size 8
-		@attribute pocetnaAdresa 1023
+		@attribute pocetnaAdresa 1024
 	}
 
 	@instance bus glavnaSabirnica {
@@ -20,17 +20,6 @@
 		@size 100
 	}
 
-	@instance testBus Test {
-		@position (0, 200)
-		@size 0
-	}
-
-	@connection (proc.glavniPin, bus) {
-	}
 	@connection (mem.glavniPin, bus) {
 	}
-	@connection (proc.glavniPin, testBus, mem.glavniPin) {
-		@attribute dmaPoveznica "READY"
-		@attribute mmaPoveznica "PIO_DATA"
-	}
 }