move code from Xcos/ to blocks/

add a rule for dev environment

251 files changed, 55 insertions, 43 deletions

diff --git a/.gitignore b/.gitignore
index 3d9dfdf3..668b5ef3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,8 @@ blocks/env*/
 .env
 scilab-log-*.txt
 tags
-Xcos/U*.sci
-Xcos/*.xml
-Xcos/xcosblocks.py
+blocks/U*.sci
+blocks/*.xml
+blocks/xcosblocks.py
+blocks/Xcos/xcosblocks.py
 blocks/blocks/xcosblocks/xcosblocks.py
diff --git a/Xcos/Makefile b/Xcos/Makefile
deleted file mode 100644
index 799d5da2..00000000
--- a/Xcos/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-SHELL := /bin/bash
-
-BLOCKDIR := ../blocks/blocks/xcosblocks
-
-SRCFILES := $(sort $(wildcard common/*.py))
-SRCFILES += $(sort $(wildcard blocks/*.py))
-SRCFILES += $(sort $(wildcard ports/*.py))
-SRCFILES += $(sort $(wildcard links/*.py))
-
-TARGET := xcosblocks.py
-TARGET2 := $(BLOCKDIR)/$(TARGET)
-
-all : $(TARGET) $(TARGET2)
-
-$(TARGET) : $(SRCFILES)
-	@echo Making $@ ...
-	@for f in $^; do \
-	    echo "# BEGIN $$f"; \
-	    echo; \
-	    echo; \
-	    cat "$$f"; \
-	    echo; \
-	    echo "# END $$f"; \
-	done > $@
-
-flake8 : $(TARGET)
-	flake8 --statistics $(TARGET)
-
-.xcosblocks.txt : $(TARGET) parsexcosblocks.awk
-	@echo Making $@ ...
-	@./parsexcosblocks.awk $(TARGET) > $@
-
-.srcflake8 : $(TARGET) .xcosblocks.txt usexcosblocks.awk
-	@echo 'flake8 common/*.py blocks/*.py ports/*.py links/*.py'
-	@flake8 $(TARGET) | ./usexcosblocks.awk .xcosblocks.txt -; \
-	    exit $${PIPESTATUS[0]}
-	touch $@
-
-$(TARGET2) : .srcflake8
-	cp -f $(TARGET) $@
diff --git a/Xcos/.flake8 b/blocks/.flake8
index 0795f08d..0795f08d 100644
--- a/Xcos/.flake8
+++ b/blocks/.flake8
diff --git a/blocks/Makefile b/blocks/Makefile
new file mode 100644
index 00000000..adf454a7
--- /dev/null
+++ b/blocks/Makefile
@@ -0,0 +1,50 @@
+SHELL := /bin/bash
+
+BLOCKDIR := ../blocks/blocks/xcosblocks
+
+SRCFILES := $(sort $(wildcard Xcos/common/*.py))
+SRCFILES += $(sort $(wildcard Xcos/blocks/*.py))
+SRCFILES += $(sort $(wildcard Xcos/ports/*.py))
+SRCFILES += $(sort $(wildcard Xcos/links/*.py))
+
+IMPORT := Xcos/xcosblocks.py
+TARGET := xcosblocks.py
+TARGET2 := $(BLOCKDIR)/$(TARGET)
+
+all : $(IMPORT) $(TARGET) $(TARGET2)
+
+$(IMPORT) : $(SRCFILES)
+	@echo Making $@ ...
+	@for f in $^; do \
+	    g=$${f%.py}; \
+	    g=$${g#Xcos/}; \
+	    g=$${g//\//.}; \
+	    echo "from $$g import *"; \
+	done > $@
+
+$(TARGET) : $(SRCFILES)
+	@echo Making $@ ...
+	@for f in $^; do \
+	    echo "# BEGIN $$f"; \
+	    echo; \
+	    echo; \
+	    cat "$$f"; \
+	    echo; \
+	    echo "# END $$f"; \
+	done > $@
+
+flake8 : $(TARGET)
+	flake8 --statistics $(TARGET)
+
+.xcosblocks.txt : $(TARGET) Xcos/parsexcosblocks.awk
+	@echo Making $@ ...
+	@Xcos/parsexcosblocks.awk $(TARGET) > $@
+
+.srcflake8 : $(TARGET) .xcosblocks.txt Xcos/usexcosblocks.awk
+	@echo 'flake8 common/*.py blocks/*.py ports/*.py links/*.py'
+	@flake8 $(TARGET) | Xcos/usexcosblocks.awk .xcosblocks.txt -; \
+	    exit $${PIPESTATUS[0]}
+	touch $@
+
+$(TARGET2) : .srcflake8
+	cp -f $(TARGET) $@
diff --git a/Xcos/MxGraphParser.py b/blocks/Xcos/MxGraphParser.py
index e568d4bb..e568d4bb 100755
--- a/Xcos/MxGraphParser.py
+++ b/blocks/Xcos/MxGraphParser.py
diff --git a/Xcos/Xcos.sci b/blocks/Xcos/Xcos.sci
index 818b60e9..818b60e9 100644
--- a/Xcos/Xcos.sci
+++ b/blocks/Xcos/Xcos.sci
diff --git a/Xcos/XcosParser.py b/blocks/Xcos/XcosParser.py
index 0555d873..0555d873 100755
--- a/Xcos/XcosParser.py
+++ b/blocks/Xcos/XcosParser.py
diff --git a/Xcos/Xcos_AFFICH_m.sci b/blocks/Xcos/Xcos_AFFICH_m.sci
index 58a2613b..58a2613b 100644
--- a/Xcos/Xcos_AFFICH_m.sci
+++ b/blocks/Xcos/Xcos_AFFICH_m.sci
diff --git a/Xcos/Xcos_CLOCK_c.sci b/blocks/Xcos/Xcos_CLOCK_c.sci
index acf7f04e..acf7f04e 100644
--- a/Xcos/Xcos_CLOCK_c.sci
+++ b/blocks/Xcos/Xcos_CLOCK_c.sci
diff --git a/Xcos/Xcos_CONST.sci b/blocks/Xcos/Xcos_CONST.sci
index 62cd4164..62cd4164 100644
--- a/Xcos/Xcos_CONST.sci
+++ b/blocks/Xcos/Xcos_CONST.sci
diff --git a/Xcos/blocks/ABS_VALUE.py b/blocks/Xcos/blocks/ABS_VALUE.py
index ce13504a..ce13504a 100644
--- a/Xcos/blocks/ABS_VALUE.py
+++ b/blocks/Xcos/blocks/ABS_VALUE.py
diff --git a/Xcos/blocks/AFFICH_m.py b/blocks/Xcos/blocks/AFFICH_m.py
index 668bddf0..668bddf0 100644
--- a/Xcos/blocks/AFFICH_m.py
+++ b/blocks/Xcos/blocks/AFFICH_m.py
diff --git a/Xcos/blocks/ANDBLK.py b/blocks/Xcos/blocks/ANDBLK.py
index d0e7c37d..d0e7c37d 100644
--- a/Xcos/blocks/ANDBLK.py
+++ b/blocks/Xcos/blocks/ANDBLK.py
diff --git a/Xcos/blocks/ANDLOG_f.py b/blocks/Xcos/blocks/ANDLOG_f.py
index 5f7fab4e..5f7fab4e 100644
--- a/Xcos/blocks/ANDLOG_f.py
+++ b/blocks/Xcos/blocks/ANDLOG_f.py
diff --git a/Xcos/blocks/AUTOMAT.py b/blocks/Xcos/blocks/AUTOMAT.py
index 34660ff0..34660ff0 100644
--- a/Xcos/blocks/AUTOMAT.py
+++ b/blocks/Xcos/blocks/AUTOMAT.py
diff --git a/Xcos/blocks/BACKLASH.py b/blocks/Xcos/blocks/BACKLASH.py
index 70ce30f7..70ce30f7 100644
--- a/Xcos/blocks/BACKLASH.py
+++ b/blocks/Xcos/blocks/BACKLASH.py
diff --git a/Xcos/blocks/BARXY.py b/blocks/Xcos/blocks/BARXY.py
index 9b718975..9b718975 100644
--- a/Xcos/blocks/BARXY.py
+++ b/blocks/Xcos/blocks/BARXY.py
diff --git a/Xcos/blocks/BIGSOM_f.py b/blocks/Xcos/blocks/BIGSOM_f.py
index cdba23fd..cdba23fd 100644
--- a/Xcos/blocks/BIGSOM_f.py
+++ b/blocks/Xcos/blocks/BIGSOM_f.py
diff --git a/Xcos/blocks/BITCLEAR.py b/blocks/Xcos/blocks/BITCLEAR.py
index e4b45e12..e4b45e12 100644
--- a/Xcos/blocks/BITCLEAR.py
+++ b/blocks/Xcos/blocks/BITCLEAR.py
diff --git a/Xcos/blocks/BITSET.py b/blocks/Xcos/blocks/BITSET.py
index bf917cfc..bf917cfc 100644
--- a/Xcos/blocks/BITSET.py
+++ b/blocks/Xcos/blocks/BITSET.py
diff --git a/Xcos/blocks/BOUNCE.py b/blocks/Xcos/blocks/BOUNCE.py
index f3e0261b..f3e0261b 100644
--- a/Xcos/blocks/BOUNCE.py
+++ b/blocks/Xcos/blocks/BOUNCE.py
diff --git a/Xcos/blocks/BOUNCEXY.py b/blocks/Xcos/blocks/BOUNCEXY.py
index 421eb6d4..421eb6d4 100644
--- a/Xcos/blocks/BOUNCEXY.py
+++ b/blocks/Xcos/blocks/BOUNCEXY.py
diff --git a/Xcos/blocks/BPLATFORM.py b/blocks/Xcos/blocks/BPLATFORM.py
index 435ea9c8..435ea9c8 100644
--- a/Xcos/blocks/BPLATFORM.py
+++ b/blocks/Xcos/blocks/BPLATFORM.py
diff --git a/Xcos/blocks/Bache.py b/blocks/Xcos/blocks/Bache.py
index 9a7f8f8e..9a7f8f8e 100644
--- a/Xcos/blocks/Bache.py
+++ b/blocks/Xcos/blocks/Bache.py
diff --git a/Xcos/blocks/CANIMXY.py b/blocks/Xcos/blocks/CANIMXY.py
index 52dda3c6..52dda3c6 100644
--- a/Xcos/blocks/CANIMXY.py
+++ b/blocks/Xcos/blocks/CANIMXY.py
diff --git a/Xcos/blocks/CANIMXY3D.py b/blocks/Xcos/blocks/CANIMXY3D.py
index 3ac99e7c..3ac99e7c 100644
--- a/Xcos/blocks/CANIMXY3D.py
+++ b/blocks/Xcos/blocks/CANIMXY3D.py
diff --git a/Xcos/blocks/CBLOCK.py b/blocks/Xcos/blocks/CBLOCK.py
index 96e350a4..96e350a4 100644
--- a/Xcos/blocks/CBLOCK.py
+++ b/blocks/Xcos/blocks/CBLOCK.py
diff --git a/Xcos/blocks/CBLOCK4.py b/blocks/Xcos/blocks/CBLOCK4.py
index a333265e..a333265e 100644
--- a/Xcos/blocks/CBLOCK4.py
+++ b/blocks/Xcos/blocks/CBLOCK4.py
diff --git a/Xcos/blocks/CCS.py b/blocks/Xcos/blocks/CCS.py
index b16ef2db..b16ef2db 100644
--- a/Xcos/blocks/CCS.py
+++ b/blocks/Xcos/blocks/CCS.py
diff --git a/Xcos/blocks/CEVENTSCOPE.py b/blocks/Xcos/blocks/CEVENTSCOPE.py
index febf155c..febf155c 100644
--- a/Xcos/blocks/CEVENTSCOPE.py
+++ b/blocks/Xcos/blocks/CEVENTSCOPE.py
diff --git a/Xcos/blocks/CFSCOPE.py b/blocks/Xcos/blocks/CFSCOPE.py
index c57ff862..c57ff862 100644
--- a/Xcos/blocks/CFSCOPE.py
+++ b/blocks/Xcos/blocks/CFSCOPE.py
diff --git a/Xcos/blocks/CLINDUMMY_f.py b/blocks/Xcos/blocks/CLINDUMMY_f.py
index 24c4e898..24c4e898 100644
--- a/Xcos/blocks/CLINDUMMY_f.py
+++ b/blocks/Xcos/blocks/CLINDUMMY_f.py
diff --git a/Xcos/blocks/CLKFROM.py b/blocks/Xcos/blocks/CLKFROM.py
index db9ed4ab..db9ed4ab 100644
--- a/Xcos/blocks/CLKFROM.py
+++ b/blocks/Xcos/blocks/CLKFROM.py
diff --git a/Xcos/blocks/CLKGOTO.py b/blocks/Xcos/blocks/CLKGOTO.py
index 9933ffbe..9933ffbe 100644
--- a/Xcos/blocks/CLKGOTO.py
+++ b/blocks/Xcos/blocks/CLKGOTO.py
diff --git a/Xcos/blocks/CLKGotoTagVisibility.py b/blocks/Xcos/blocks/CLKGotoTagVisibility.py
index 125cda84..125cda84 100644
--- a/Xcos/blocks/CLKGotoTagVisibility.py
+++ b/blocks/Xcos/blocks/CLKGotoTagVisibility.py
diff --git a/Xcos/blocks/CLKINV_f.py b/blocks/Xcos/blocks/CLKINV_f.py
index 1e03cbd0..1e03cbd0 100644
--- a/Xcos/blocks/CLKINV_f.py
+++ b/blocks/Xcos/blocks/CLKINV_f.py
diff --git a/Xcos/blocks/CLKOUTV_f.py b/blocks/Xcos/blocks/CLKOUTV_f.py
index 8dc76159..8dc76159 100644
--- a/Xcos/blocks/CLKOUTV_f.py
+++ b/blocks/Xcos/blocks/CLKOUTV_f.py
diff --git a/Xcos/blocks/CLKSOMV_f.py b/blocks/Xcos/blocks/CLKSOMV_f.py
index 331b500c..331b500c 100644
--- a/Xcos/blocks/CLKSOMV_f.py
+++ b/blocks/Xcos/blocks/CLKSOMV_f.py
diff --git a/Xcos/blocks/CLOCK_c.py b/blocks/Xcos/blocks/CLOCK_c.py
index e6ea9456..e6ea9456 100644
--- a/Xcos/blocks/CLOCK_c.py
+++ b/blocks/Xcos/blocks/CLOCK_c.py
diff --git a/Xcos/blocks/CLR.py b/blocks/Xcos/blocks/CLR.py
index 82d2fced..82d2fced 100644
--- a/Xcos/blocks/CLR.py
+++ b/blocks/Xcos/blocks/CLR.py
diff --git a/Xcos/blocks/CLSS.py b/blocks/Xcos/blocks/CLSS.py
index 0b0ab833..0b0ab833 100644
--- a/Xcos/blocks/CLSS.py
+++ b/blocks/Xcos/blocks/CLSS.py
diff --git a/Xcos/blocks/CMAT3D.py b/blocks/Xcos/blocks/CMAT3D.py
index 2e126eea..2e126eea 100644
--- a/Xcos/blocks/CMAT3D.py
+++ b/blocks/Xcos/blocks/CMAT3D.py
diff --git a/Xcos/blocks/CMATVIEW.py b/blocks/Xcos/blocks/CMATVIEW.py
index 0205ef87..0205ef87 100644
--- a/Xcos/blocks/CMATVIEW.py
+++ b/blocks/Xcos/blocks/CMATVIEW.py
diff --git a/Xcos/blocks/CMSCOPE.py b/blocks/Xcos/blocks/CMSCOPE.py
index 834e5aa4..834e5aa4 100644
--- a/Xcos/blocks/CMSCOPE.py
+++ b/blocks/Xcos/blocks/CMSCOPE.py
diff --git a/Xcos/blocks/CONST.py b/blocks/Xcos/blocks/CONST.py
index ac9a709d..ac9a709d 100644
--- a/Xcos/blocks/CONST.py
+++ b/blocks/Xcos/blocks/CONST.py
diff --git a/Xcos/blocks/CONSTRAINT2_c.py b/blocks/Xcos/blocks/CONSTRAINT2_c.py
index b68afdfa..b68afdfa 100644
--- a/Xcos/blocks/CONSTRAINT2_c.py
+++ b/blocks/Xcos/blocks/CONSTRAINT2_c.py
diff --git a/Xcos/blocks/CONSTRAINT_c.py b/blocks/Xcos/blocks/CONSTRAINT_c.py
index f9dd9850..f9dd9850 100644
--- a/Xcos/blocks/CONSTRAINT_c.py
+++ b/blocks/Xcos/blocks/CONSTRAINT_c.py
diff --git a/Xcos/blocks/CONST_f.py b/blocks/Xcos/blocks/CONST_f.py
index 8ac8f52c..8ac8f52c 100644
--- a/Xcos/blocks/CONST_f.py
+++ b/blocks/Xcos/blocks/CONST_f.py
diff --git a/Xcos/blocks/CONST_m.py b/blocks/Xcos/blocks/CONST_m.py
index 0e89562d..0e89562d 100644
--- a/Xcos/blocks/CONST_m.py
+++ b/blocks/Xcos/blocks/CONST_m.py
diff --git a/Xcos/blocks/CONVERT.py b/blocks/Xcos/blocks/CONVERT.py
index 927e364d..927e364d 100644
--- a/Xcos/blocks/CONVERT.py
+++ b/blocks/Xcos/blocks/CONVERT.py
diff --git a/Xcos/blocks/COSBLK_f.py b/blocks/Xcos/blocks/COSBLK_f.py
index b362f620..b362f620 100644
--- a/Xcos/blocks/COSBLK_f.py
+++ b/blocks/Xcos/blocks/COSBLK_f.py
diff --git a/Xcos/blocks/CSCOPE.py b/blocks/Xcos/blocks/CSCOPE.py
index da1ed7ac..da1ed7ac 100644
--- a/Xcos/blocks/CSCOPE.py
+++ b/blocks/Xcos/blocks/CSCOPE.py
diff --git a/Xcos/blocks/CSCOPXY.py b/blocks/Xcos/blocks/CSCOPXY.py
index 9a88c551..9a88c551 100644
--- a/Xcos/blocks/CSCOPXY.py
+++ b/blocks/Xcos/blocks/CSCOPXY.py
diff --git a/Xcos/blocks/CSCOPXY3D.py b/blocks/Xcos/blocks/CSCOPXY3D.py
index ec9ac013..ec9ac013 100644
--- a/Xcos/blocks/CSCOPXY3D.py
+++ b/blocks/Xcos/blocks/CSCOPXY3D.py
diff --git a/Xcos/blocks/CUMSUM.py b/blocks/Xcos/blocks/CUMSUM.py
index 31fd9921..31fd9921 100644
--- a/Xcos/blocks/CUMSUM.py
+++ b/blocks/Xcos/blocks/CUMSUM.py
diff --git a/Xcos/blocks/CURV_f.py b/blocks/Xcos/blocks/CURV_f.py
index 5e16c8ee..5e16c8ee 100644
--- a/Xcos/blocks/CURV_f.py
+++ b/blocks/Xcos/blocks/CURV_f.py
diff --git a/Xcos/blocks/CVS.py b/blocks/Xcos/blocks/CVS.py
index 97096671..97096671 100644
--- a/Xcos/blocks/CVS.py
+++ b/blocks/Xcos/blocks/CVS.py
diff --git a/Xcos/blocks/Capacitor.py b/blocks/Xcos/blocks/Capacitor.py
index 7d7e006a..7d7e006a 100644
--- a/Xcos/blocks/Capacitor.py
+++ b/blocks/Xcos/blocks/Capacitor.py
diff --git a/Xcos/blocks/ConstantVoltage.py b/blocks/Xcos/blocks/ConstantVoltage.py
index 3947dd08..3947dd08 100644
--- a/Xcos/blocks/ConstantVoltage.py
+++ b/blocks/Xcos/blocks/ConstantVoltage.py
diff --git a/Xcos/blocks/Counter.py b/blocks/Xcos/blocks/Counter.py
index 74fcaff0..74fcaff0 100644
--- a/Xcos/blocks/Counter.py
+++ b/blocks/Xcos/blocks/Counter.py
diff --git a/Xcos/blocks/CurrentSensor.py b/blocks/Xcos/blocks/CurrentSensor.py
index 1ecc3c5b..1ecc3c5b 100644
--- a/Xcos/blocks/CurrentSensor.py
+++ b/blocks/Xcos/blocks/CurrentSensor.py
diff --git a/Xcos/blocks/DEADBAND.py b/blocks/Xcos/blocks/DEADBAND.py
index ecf98975..ecf98975 100644
--- a/Xcos/blocks/DEADBAND.py
+++ b/blocks/Xcos/blocks/DEADBAND.py
diff --git a/Xcos/blocks/DEBUG.py b/blocks/Xcos/blocks/DEBUG.py
index c6367ae5..c6367ae5 100644
--- a/Xcos/blocks/DEBUG.py
+++ b/blocks/Xcos/blocks/DEBUG.py
diff --git a/Xcos/blocks/DELAYV_f.py b/blocks/Xcos/blocks/DELAYV_f.py
index 3eace21d..3eace21d 100644
--- a/Xcos/blocks/DELAYV_f.py
+++ b/blocks/Xcos/blocks/DELAYV_f.py
diff --git a/Xcos/blocks/DELAY_f.py b/blocks/Xcos/blocks/DELAY_f.py
index ae0d67fc..ae0d67fc 100644
--- a/Xcos/blocks/DELAY_f.py
+++ b/blocks/Xcos/blocks/DELAY_f.py
diff --git a/Xcos/blocks/DEMUX.py b/blocks/Xcos/blocks/DEMUX.py
index 8a951b7d..8a951b7d 100644
--- a/Xcos/blocks/DEMUX.py
+++ b/blocks/Xcos/blocks/DEMUX.py
diff --git a/Xcos/blocks/DEMUX_f.py b/blocks/Xcos/blocks/DEMUX_f.py
index 1af2fa13..1af2fa13 100644
--- a/Xcos/blocks/DEMUX_f.py
+++ b/blocks/Xcos/blocks/DEMUX_f.py
diff --git a/Xcos/blocks/DERIV.py b/blocks/Xcos/blocks/DERIV.py
index f1253b40..f1253b40 100644
--- a/Xcos/blocks/DERIV.py
+++ b/blocks/Xcos/blocks/DERIV.py
diff --git a/Xcos/blocks/DFLIPFLOP.py b/blocks/Xcos/blocks/DFLIPFLOP.py
index c1a03333..c1a03333 100644
--- a/Xcos/blocks/DFLIPFLOP.py
+++ b/blocks/Xcos/blocks/DFLIPFLOP.py
diff --git a/Xcos/blocks/DIFF_f.py b/blocks/Xcos/blocks/DIFF_f.py
index b76c444f..b76c444f 100644
--- a/Xcos/blocks/DIFF_f.py
+++ b/blocks/Xcos/blocks/DIFF_f.py
diff --git a/Xcos/blocks/DLATCH.py b/blocks/Xcos/blocks/DLATCH.py
index 1202cb0c..1202cb0c 100644
--- a/Xcos/blocks/DLATCH.py
+++ b/blocks/Xcos/blocks/DLATCH.py
diff --git a/Xcos/blocks/DLR.py b/blocks/Xcos/blocks/DLR.py
index ce5a8a2e..ce5a8a2e 100644
--- a/Xcos/blocks/DLR.py
+++ b/blocks/Xcos/blocks/DLR.py
diff --git a/Xcos/blocks/DLRADAPT_f.py b/blocks/Xcos/blocks/DLRADAPT_f.py
index 8704474f..8704474f 100644
--- a/Xcos/blocks/DLRADAPT_f.py
+++ b/blocks/Xcos/blocks/DLRADAPT_f.py
diff --git a/Xcos/blocks/DLSS.py b/blocks/Xcos/blocks/DLSS.py
index e198e9b6..e198e9b6 100644
--- a/Xcos/blocks/DLSS.py
+++ b/blocks/Xcos/blocks/DLSS.py
diff --git a/Xcos/blocks/DOLLAR.py b/blocks/Xcos/blocks/DOLLAR.py
index 6599d288..6599d288 100644
--- a/Xcos/blocks/DOLLAR.py
+++ b/blocks/Xcos/blocks/DOLLAR.py
diff --git a/Xcos/blocks/DOLLAR_f.py b/blocks/Xcos/blocks/DOLLAR_f.py
index c78c75ee..c78c75ee 100644
--- a/Xcos/blocks/DOLLAR_f.py
+++ b/blocks/Xcos/blocks/DOLLAR_f.py
diff --git a/Xcos/blocks/DOLLAR_m.py b/blocks/Xcos/blocks/DOLLAR_m.py
index 2be901bc..2be901bc 100644
--- a/Xcos/blocks/DOLLAR_m.py
+++ b/blocks/Xcos/blocks/DOLLAR_m.py
diff --git a/Xcos/blocks/Diode.py b/blocks/Xcos/blocks/Diode.py
index 6bd76a2e..6bd76a2e 100644
--- a/Xcos/blocks/Diode.py
+++ b/blocks/Xcos/blocks/Diode.py
diff --git a/Xcos/blocks/EDGE_TRIGGER.py b/blocks/Xcos/blocks/EDGE_TRIGGER.py
index 2347eb83..2347eb83 100644
--- a/Xcos/blocks/EDGE_TRIGGER.py
+++ b/blocks/Xcos/blocks/EDGE_TRIGGER.py
diff --git a/Xcos/blocks/ENDBLK.py b/blocks/Xcos/blocks/ENDBLK.py
index d385c3ba..d385c3ba 100644
--- a/Xcos/blocks/ENDBLK.py
+++ b/blocks/Xcos/blocks/ENDBLK.py
diff --git a/Xcos/blocks/END_c.py b/blocks/Xcos/blocks/END_c.py
index fe65263e..fe65263e 100644
--- a/Xcos/blocks/END_c.py
+++ b/blocks/Xcos/blocks/END_c.py
diff --git a/Xcos/blocks/ESELECT_f.py b/blocks/Xcos/blocks/ESELECT_f.py
index 98a75648..98a75648 100644
--- a/Xcos/blocks/ESELECT_f.py
+++ b/blocks/Xcos/blocks/ESELECT_f.py
diff --git a/Xcos/blocks/EVTDLY_c.py b/blocks/Xcos/blocks/EVTDLY_c.py
index 0eef3d90..0eef3d90 100644
--- a/Xcos/blocks/EVTDLY_c.py
+++ b/blocks/Xcos/blocks/EVTDLY_c.py
diff --git a/Xcos/blocks/EVTGEN_f.py b/blocks/Xcos/blocks/EVTGEN_f.py
index 0ba6065d..0ba6065d 100644
--- a/Xcos/blocks/EVTGEN_f.py
+++ b/blocks/Xcos/blocks/EVTGEN_f.py
diff --git a/Xcos/blocks/EVTVARDLY.py b/blocks/Xcos/blocks/EVTVARDLY.py
index 55bc6dd8..55bc6dd8 100644
--- a/Xcos/blocks/EVTVARDLY.py
+++ b/blocks/Xcos/blocks/EVTVARDLY.py
diff --git a/Xcos/blocks/EXPBLK_m.py b/blocks/Xcos/blocks/EXPBLK_m.py
index 350a62e4..350a62e4 100644
--- a/Xcos/blocks/EXPBLK_m.py
+++ b/blocks/Xcos/blocks/EXPBLK_m.py
diff --git a/Xcos/blocks/EXPRESSION.py b/blocks/Xcos/blocks/EXPRESSION.py
index 532a4557..532a4557 100644
--- a/Xcos/blocks/EXPRESSION.py
+++ b/blocks/Xcos/blocks/EXPRESSION.py
diff --git a/Xcos/blocks/EXTRACT.py b/blocks/Xcos/blocks/EXTRACT.py
index d0ea7558..d0ea7558 100644
--- a/Xcos/blocks/EXTRACT.py
+++ b/blocks/Xcos/blocks/EXTRACT.py
diff --git a/Xcos/blocks/EXTRACTBITS.py b/blocks/Xcos/blocks/EXTRACTBITS.py
index 4a68b253..4a68b253 100644
--- a/Xcos/blocks/EXTRACTBITS.py
+++ b/blocks/Xcos/blocks/EXTRACTBITS.py
diff --git a/Xcos/blocks/EXTRACTOR.py b/blocks/Xcos/blocks/EXTRACTOR.py
index 67df60b5..67df60b5 100644
--- a/Xcos/blocks/EXTRACTOR.py
+++ b/blocks/Xcos/blocks/EXTRACTOR.py
diff --git a/Xcos/blocks/EXTTRI.py b/blocks/Xcos/blocks/EXTTRI.py
index ea132701..ea132701 100644
--- a/Xcos/blocks/EXTTRI.py
+++ b/blocks/Xcos/blocks/EXTTRI.py
diff --git a/Xcos/blocks/Extract_Activation.py b/blocks/Xcos/blocks/Extract_Activation.py
index 7d4069c6..7d4069c6 100644
--- a/Xcos/blocks/Extract_Activation.py
+++ b/blocks/Xcos/blocks/Extract_Activation.py
diff --git a/Xcos/blocks/FROM.py b/blocks/Xcos/blocks/FROM.py
index 62b8b6b9..62b8b6b9 100644
--- a/Xcos/blocks/FROM.py
+++ b/blocks/Xcos/blocks/FROM.py
diff --git a/Xcos/blocks/FROMMO.py b/blocks/Xcos/blocks/FROMMO.py
index bd630c79..bd630c79 100644
--- a/Xcos/blocks/FROMMO.py
+++ b/blocks/Xcos/blocks/FROMMO.py
diff --git a/Xcos/blocks/FROMWSB.py b/blocks/Xcos/blocks/FROMWSB.py
index 5fae91ea..5fae91ea 100644
--- a/Xcos/blocks/FROMWSB.py
+++ b/blocks/Xcos/blocks/FROMWSB.py
diff --git a/Xcos/blocks/Flowmeter.py b/blocks/Xcos/blocks/Flowmeter.py
index 0dfb2262..0dfb2262 100644
--- a/Xcos/blocks/Flowmeter.py
+++ b/blocks/Xcos/blocks/Flowmeter.py
diff --git a/Xcos/blocks/GAINBLK.py b/blocks/Xcos/blocks/GAINBLK.py
index 8dc886fa..8dc886fa 100644
--- a/Xcos/blocks/GAINBLK.py
+++ b/blocks/Xcos/blocks/GAINBLK.py
diff --git a/Xcos/blocks/GAINBLK_f.py b/blocks/Xcos/blocks/GAINBLK_f.py
index e59b677a..e59b677a 100644
--- a/Xcos/blocks/GAINBLK_f.py
+++ b/blocks/Xcos/blocks/GAINBLK_f.py
diff --git a/Xcos/blocks/GAIN_f.py b/blocks/Xcos/blocks/GAIN_f.py
index 6322eb72..6322eb72 100644
--- a/Xcos/blocks/GAIN_f.py
+++ b/blocks/Xcos/blocks/GAIN_f.py
diff --git a/Xcos/blocks/GENERAL_f.py b/blocks/Xcos/blocks/GENERAL_f.py
index ae208d92..ae208d92 100644
--- a/Xcos/blocks/GENERAL_f.py
+++ b/blocks/Xcos/blocks/GENERAL_f.py
diff --git a/Xcos/blocks/GENSIN_f.py b/blocks/Xcos/blocks/GENSIN_f.py
index bbebedb1..bbebedb1 100644
--- a/Xcos/blocks/GENSIN_f.py
+++ b/blocks/Xcos/blocks/GENSIN_f.py
diff --git a/Xcos/blocks/GENSQR_f.py b/blocks/Xcos/blocks/GENSQR_f.py
index 0531d7e8..0531d7e8 100644
--- a/Xcos/blocks/GENSQR_f.py
+++ b/blocks/Xcos/blocks/GENSQR_f.py
diff --git a/Xcos/blocks/GOTO.py b/blocks/Xcos/blocks/GOTO.py
index 139c29a3..139c29a3 100644
--- a/Xcos/blocks/GOTO.py
+++ b/blocks/Xcos/blocks/GOTO.py
diff --git a/Xcos/blocks/GOTOMO.py b/blocks/Xcos/blocks/GOTOMO.py
index 1fb82392..1fb82392 100644
--- a/Xcos/blocks/GOTOMO.py
+++ b/blocks/Xcos/blocks/GOTOMO.py
diff --git a/Xcos/blocks/GotoTagVisibility.py b/blocks/Xcos/blocks/GotoTagVisibility.py
index b6a1efc6..b6a1efc6 100644
--- a/Xcos/blocks/GotoTagVisibility.py
+++ b/blocks/Xcos/blocks/GotoTagVisibility.py
diff --git a/Xcos/blocks/GotoTagVisibilityMO.py b/blocks/Xcos/blocks/GotoTagVisibilityMO.py
index 6f2fd163..6f2fd163 100644
--- a/Xcos/blocks/GotoTagVisibilityMO.py
+++ b/blocks/Xcos/blocks/GotoTagVisibilityMO.py
diff --git a/Xcos/blocks/Ground.py b/blocks/Xcos/blocks/Ground.py
index e8ca693c..e8ca693c 100644
--- a/Xcos/blocks/Ground.py
+++ b/blocks/Xcos/blocks/Ground.py
diff --git a/Xcos/blocks/Gyrator.py b/blocks/Xcos/blocks/Gyrator.py
index bb955543..bb955543 100644
--- a/Xcos/blocks/Gyrator.py
+++ b/blocks/Xcos/blocks/Gyrator.py
diff --git a/Xcos/blocks/HALT_f.py b/blocks/Xcos/blocks/HALT_f.py
index 1b73f7ea..1b73f7ea 100644
--- a/Xcos/blocks/HALT_f.py
+++ b/blocks/Xcos/blocks/HALT_f.py
diff --git a/Xcos/blocks/HYSTHERESIS.py b/blocks/Xcos/blocks/HYSTHERESIS.py
index 05e8d4da..05e8d4da 100644
--- a/Xcos/blocks/HYSTHERESIS.py
+++ b/blocks/Xcos/blocks/HYSTHERESIS.py
diff --git a/Xcos/blocks/IFTHEL_f.py b/blocks/Xcos/blocks/IFTHEL_f.py
index 2bd63dff..2bd63dff 100644
--- a/Xcos/blocks/IFTHEL_f.py
+++ b/blocks/Xcos/blocks/IFTHEL_f.py
diff --git a/Xcos/blocks/INIMPL_f.py b/blocks/Xcos/blocks/INIMPL_f.py
index bfc5448f..bfc5448f 100644
--- a/Xcos/blocks/INIMPL_f.py
+++ b/blocks/Xcos/blocks/INIMPL_f.py
diff --git a/Xcos/blocks/INTEGRAL_f.py b/blocks/Xcos/blocks/INTEGRAL_f.py
index ad7c6f41..ad7c6f41 100644
--- a/Xcos/blocks/INTEGRAL_f.py
+++ b/blocks/Xcos/blocks/INTEGRAL_f.py
diff --git a/Xcos/blocks/INTEGRAL_m.py b/blocks/Xcos/blocks/INTEGRAL_m.py
index 468f2b70..468f2b70 100644
--- a/Xcos/blocks/INTEGRAL_m.py
+++ b/blocks/Xcos/blocks/INTEGRAL_m.py
diff --git a/Xcos/blocks/INTMUL.py b/blocks/Xcos/blocks/INTMUL.py
index 33857a33..33857a33 100644
--- a/Xcos/blocks/INTMUL.py
+++ b/blocks/Xcos/blocks/INTMUL.py
diff --git a/Xcos/blocks/INTRP2BLK_f.py b/blocks/Xcos/blocks/INTRP2BLK_f.py
index 75bd180c..75bd180c 100644
--- a/Xcos/blocks/INTRP2BLK_f.py
+++ b/blocks/Xcos/blocks/INTRP2BLK_f.py
diff --git a/Xcos/blocks/INTRPLBLK_f.py b/blocks/Xcos/blocks/INTRPLBLK_f.py
index 8d488244..8d488244 100644
--- a/Xcos/blocks/INTRPLBLK_f.py
+++ b/blocks/Xcos/blocks/INTRPLBLK_f.py
diff --git a/Xcos/blocks/INVBLK.py b/blocks/Xcos/blocks/INVBLK.py
index 802a5f0c..802a5f0c 100644
--- a/Xcos/blocks/INVBLK.py
+++ b/blocks/Xcos/blocks/INVBLK.py
diff --git a/Xcos/blocks/IN_f.py b/blocks/Xcos/blocks/IN_f.py
index 08ba7407..08ba7407 100644
--- a/Xcos/blocks/IN_f.py
+++ b/blocks/Xcos/blocks/IN_f.py
diff --git a/Xcos/blocks/ISELECT_m.py b/blocks/Xcos/blocks/ISELECT_m.py
index 2d91edc0..2d91edc0 100644
--- a/Xcos/blocks/ISELECT_m.py
+++ b/blocks/Xcos/blocks/ISELECT_m.py
diff --git a/Xcos/blocks/IdealTransformer.py b/blocks/Xcos/blocks/IdealTransformer.py
index 6d85262d..6d85262d 100644
--- a/Xcos/blocks/IdealTransformer.py
+++ b/blocks/Xcos/blocks/IdealTransformer.py
diff --git a/Xcos/blocks/Inductor.py b/blocks/Xcos/blocks/Inductor.py
index 5e252147..5e252147 100644
--- a/Xcos/blocks/Inductor.py
+++ b/blocks/Xcos/blocks/Inductor.py
diff --git a/Xcos/blocks/JKFLIPFLOP.py b/blocks/Xcos/blocks/JKFLIPFLOP.py
index 54d98606..54d98606 100644
--- a/Xcos/blocks/JKFLIPFLOP.py
+++ b/blocks/Xcos/blocks/JKFLIPFLOP.py
diff --git a/Xcos/blocks/LOGBLK_f.py b/blocks/Xcos/blocks/LOGBLK_f.py
index b5ef09e5..b5ef09e5 100644
--- a/Xcos/blocks/LOGBLK_f.py
+++ b/blocks/Xcos/blocks/LOGBLK_f.py
diff --git a/Xcos/blocks/LOGIC.py b/blocks/Xcos/blocks/LOGIC.py
index 536d7644..536d7644 100644
--- a/Xcos/blocks/LOGIC.py
+++ b/blocks/Xcos/blocks/LOGIC.py
diff --git a/Xcos/blocks/LOGICAL_OP.py b/blocks/Xcos/blocks/LOGICAL_OP.py
index 83bc6cbe..83bc6cbe 100644
--- a/Xcos/blocks/LOGICAL_OP.py
+++ b/blocks/Xcos/blocks/LOGICAL_OP.py
diff --git a/Xcos/blocks/LOOKUP_f.py b/blocks/Xcos/blocks/LOOKUP_f.py
index 638a5fcd..638a5fcd 100644
--- a/Xcos/blocks/LOOKUP_f.py
+++ b/blocks/Xcos/blocks/LOOKUP_f.py
diff --git a/Xcos/blocks/MATBKSL.py b/blocks/Xcos/blocks/MATBKSL.py
index 4b096e63..4b096e63 100644
--- a/Xcos/blocks/MATBKSL.py
+++ b/blocks/Xcos/blocks/MATBKSL.py
diff --git a/Xcos/blocks/MATCATH.py b/blocks/Xcos/blocks/MATCATH.py
index ec57ec61..ec57ec61 100644
--- a/Xcos/blocks/MATCATH.py
+++ b/blocks/Xcos/blocks/MATCATH.py
diff --git a/Xcos/blocks/MATCATV.py b/blocks/Xcos/blocks/MATCATV.py
index e18e8e5f..e18e8e5f 100644
--- a/Xcos/blocks/MATCATV.py
+++ b/blocks/Xcos/blocks/MATCATV.py
diff --git a/Xcos/blocks/MATDET.py b/blocks/Xcos/blocks/MATDET.py
index 89e5d809..89e5d809 100644
--- a/Xcos/blocks/MATDET.py
+++ b/blocks/Xcos/blocks/MATDET.py
diff --git a/Xcos/blocks/MATDIAG.py b/blocks/Xcos/blocks/MATDIAG.py
index c7663283..c7663283 100644
--- a/Xcos/blocks/MATDIAG.py
+++ b/blocks/Xcos/blocks/MATDIAG.py
diff --git a/Xcos/blocks/MATDIV.py b/blocks/Xcos/blocks/MATDIV.py
index dbf45d7e..dbf45d7e 100644
--- a/Xcos/blocks/MATDIV.py
+++ b/blocks/Xcos/blocks/MATDIV.py
diff --git a/Xcos/blocks/MATEIG.py b/blocks/Xcos/blocks/MATEIG.py
index 49baaddb..49baaddb 100644
--- a/Xcos/blocks/MATEIG.py
+++ b/blocks/Xcos/blocks/MATEIG.py
diff --git a/Xcos/blocks/MATEXPM.py b/blocks/Xcos/blocks/MATEXPM.py
index dd154706..dd154706 100644
--- a/Xcos/blocks/MATEXPM.py
+++ b/blocks/Xcos/blocks/MATEXPM.py
diff --git a/Xcos/blocks/MATINV.py b/blocks/Xcos/blocks/MATINV.py
index 74034d0d..74034d0d 100644
--- a/Xcos/blocks/MATINV.py
+++ b/blocks/Xcos/blocks/MATINV.py
diff --git a/Xcos/blocks/MATLU.py b/blocks/Xcos/blocks/MATLU.py
index 3e6efbf6..3e6efbf6 100644
--- a/Xcos/blocks/MATLU.py
+++ b/blocks/Xcos/blocks/MATLU.py
diff --git a/Xcos/blocks/MATMAGPHI.py b/blocks/Xcos/blocks/MATMAGPHI.py
index d90b52e3..d90b52e3 100644
--- a/Xcos/blocks/MATMAGPHI.py
+++ b/blocks/Xcos/blocks/MATMAGPHI.py
diff --git a/Xcos/blocks/MATMUL.py b/blocks/Xcos/blocks/MATMUL.py
index 3d6ea2b9..3d6ea2b9 100644
--- a/Xcos/blocks/MATMUL.py
+++ b/blocks/Xcos/blocks/MATMUL.py
diff --git a/Xcos/blocks/MATPINV.py b/blocks/Xcos/blocks/MATPINV.py
index 15d1e0a6..15d1e0a6 100644
--- a/Xcos/blocks/MATPINV.py
+++ b/blocks/Xcos/blocks/MATPINV.py
diff --git a/Xcos/blocks/MATRESH.py b/blocks/Xcos/blocks/MATRESH.py
index 19a9c0f1..19a9c0f1 100644
--- a/Xcos/blocks/MATRESH.py
+++ b/blocks/Xcos/blocks/MATRESH.py
diff --git a/Xcos/blocks/MATSING.py b/blocks/Xcos/blocks/MATSING.py
index 027a4e61..027a4e61 100644
--- a/Xcos/blocks/MATSING.py
+++ b/blocks/Xcos/blocks/MATSING.py
diff --git a/Xcos/blocks/MATSUM.py b/blocks/Xcos/blocks/MATSUM.py
index 6bc5da3b..6bc5da3b 100644
--- a/Xcos/blocks/MATSUM.py
+++ b/blocks/Xcos/blocks/MATSUM.py
diff --git a/Xcos/blocks/MATTRAN.py b/blocks/Xcos/blocks/MATTRAN.py
index fc04549b..fc04549b 100644
--- a/Xcos/blocks/MATTRAN.py
+++ b/blocks/Xcos/blocks/MATTRAN.py
diff --git a/Xcos/blocks/MATZCONJ.py b/blocks/Xcos/blocks/MATZCONJ.py
index 028294fb..028294fb 100644
--- a/Xcos/blocks/MATZCONJ.py
+++ b/blocks/Xcos/blocks/MATZCONJ.py
diff --git a/Xcos/blocks/MATZREIM.py b/blocks/Xcos/blocks/MATZREIM.py
index f2b7e9d0..f2b7e9d0 100644
--- a/Xcos/blocks/MATZREIM.py
+++ b/blocks/Xcos/blocks/MATZREIM.py
diff --git a/Xcos/blocks/MAXMIN.py b/blocks/Xcos/blocks/MAXMIN.py
index f65e04ed..f65e04ed 100644
--- a/Xcos/blocks/MAXMIN.py
+++ b/blocks/Xcos/blocks/MAXMIN.py
diff --git a/Xcos/blocks/MAX_f.py b/blocks/Xcos/blocks/MAX_f.py
index 7eb8cbf9..7eb8cbf9 100644
--- a/Xcos/blocks/MAX_f.py
+++ b/blocks/Xcos/blocks/MAX_f.py
diff --git a/Xcos/blocks/MBLOCK.py b/blocks/Xcos/blocks/MBLOCK.py
index 2271d08b..2271d08b 100644
--- a/Xcos/blocks/MBLOCK.py
+++ b/blocks/Xcos/blocks/MBLOCK.py
diff --git a/Xcos/blocks/MCLOCK_f.py b/blocks/Xcos/blocks/MCLOCK_f.py
index c2ab255d..c2ab255d 100644
--- a/Xcos/blocks/MCLOCK_f.py
+++ b/blocks/Xcos/blocks/MCLOCK_f.py
diff --git a/Xcos/blocks/MFCLCK_f.py b/blocks/Xcos/blocks/MFCLCK_f.py
index dc33cfe9..dc33cfe9 100644
--- a/Xcos/blocks/MFCLCK_f.py
+++ b/blocks/Xcos/blocks/MFCLCK_f.py
diff --git a/Xcos/blocks/MIN_f.py b/blocks/Xcos/blocks/MIN_f.py
index c7b56915..c7b56915 100644
--- a/Xcos/blocks/MIN_f.py
+++ b/blocks/Xcos/blocks/MIN_f.py
diff --git a/Xcos/blocks/MUX.py b/blocks/Xcos/blocks/MUX.py
index 8fd486f6..8fd486f6 100644
--- a/Xcos/blocks/MUX.py
+++ b/blocks/Xcos/blocks/MUX.py
diff --git a/Xcos/blocks/MUX_f.py b/blocks/Xcos/blocks/MUX_f.py
index 0cdd4f6a..0cdd4f6a 100644
--- a/Xcos/blocks/MUX_f.py
+++ b/blocks/Xcos/blocks/MUX_f.py
diff --git a/Xcos/blocks/M_SWITCH.py b/blocks/Xcos/blocks/M_SWITCH.py
index b6df4fff..b6df4fff 100644
--- a/Xcos/blocks/M_SWITCH.py
+++ b/blocks/Xcos/blocks/M_SWITCH.py
diff --git a/Xcos/blocks/M_freq.py b/blocks/Xcos/blocks/M_freq.py
index 0bbd40de..0bbd40de 100644
--- a/Xcos/blocks/M_freq.py
+++ b/blocks/Xcos/blocks/M_freq.py
diff --git a/Xcos/blocks/Modulo_Count.py b/blocks/Xcos/blocks/Modulo_Count.py
index 317725c5..317725c5 100644
--- a/Xcos/blocks/Modulo_Count.py
+++ b/blocks/Xcos/blocks/Modulo_Count.py
diff --git a/Xcos/blocks/NEGTOPOS_f.py b/blocks/Xcos/blocks/NEGTOPOS_f.py
index 8d4ba160..8d4ba160 100644
--- a/Xcos/blocks/NEGTOPOS_f.py
+++ b/blocks/Xcos/blocks/NEGTOPOS_f.py
diff --git a/Xcos/blocks/NMOS.py b/blocks/Xcos/blocks/NMOS.py
index 98807f95..98807f95 100644
--- a/Xcos/blocks/NMOS.py
+++ b/blocks/Xcos/blocks/NMOS.py
diff --git a/Xcos/blocks/NPN.py b/blocks/Xcos/blocks/NPN.py
index a3ceb714..a3ceb714 100644
--- a/Xcos/blocks/NPN.py
+++ b/blocks/Xcos/blocks/NPN.py
diff --git a/Xcos/blocks/NRMSOM_f.py b/blocks/Xcos/blocks/NRMSOM_f.py
index 87ab3a58..87ab3a58 100644
--- a/Xcos/blocks/NRMSOM_f.py
+++ b/blocks/Xcos/blocks/NRMSOM_f.py
diff --git a/Xcos/blocks/OUTIMPL_f.py b/blocks/Xcos/blocks/OUTIMPL_f.py
index 405ce82f..405ce82f 100644
--- a/Xcos/blocks/OUTIMPL_f.py
+++ b/blocks/Xcos/blocks/OUTIMPL_f.py
diff --git a/Xcos/blocks/OUT_f.py b/blocks/Xcos/blocks/OUT_f.py
index a9f8c6f2..a9f8c6f2 100644
--- a/Xcos/blocks/OUT_f.py
+++ b/blocks/Xcos/blocks/OUT_f.py
diff --git a/Xcos/blocks/OpAmp.py b/blocks/Xcos/blocks/OpAmp.py
index 57978a6b..57978a6b 100644
--- a/Xcos/blocks/OpAmp.py
+++ b/blocks/Xcos/blocks/OpAmp.py
diff --git a/Xcos/blocks/PDE.py b/blocks/Xcos/blocks/PDE.py
index 7965b780..7965b780 100644
--- a/Xcos/blocks/PDE.py
+++ b/blocks/Xcos/blocks/PDE.py
diff --git a/Xcos/blocks/PID.py b/blocks/Xcos/blocks/PID.py
index 0c8d0a19..0c8d0a19 100644
--- a/Xcos/blocks/PID.py
+++ b/blocks/Xcos/blocks/PID.py
diff --git a/Xcos/blocks/PMOS.py b/blocks/Xcos/blocks/PMOS.py
index 92d87077..92d87077 100644
--- a/Xcos/blocks/PMOS.py
+++ b/blocks/Xcos/blocks/PMOS.py
diff --git a/Xcos/blocks/PNP.py b/blocks/Xcos/blocks/PNP.py
index 14f10149..14f10149 100644
--- a/Xcos/blocks/PNP.py
+++ b/blocks/Xcos/blocks/PNP.py
diff --git a/Xcos/blocks/POSTONEG_f.py b/blocks/Xcos/blocks/POSTONEG_f.py
index 9a3e24f0..9a3e24f0 100644
--- a/Xcos/blocks/POSTONEG_f.py
+++ b/blocks/Xcos/blocks/POSTONEG_f.py
diff --git a/Xcos/blocks/POWBLK_f.py b/blocks/Xcos/blocks/POWBLK_f.py
index 783a6e71..783a6e71 100644
--- a/Xcos/blocks/POWBLK_f.py
+++ b/blocks/Xcos/blocks/POWBLK_f.py
diff --git a/Xcos/blocks/PRODUCT.py b/blocks/Xcos/blocks/PRODUCT.py
index 054fcd93..054fcd93 100644
--- a/Xcos/blocks/PRODUCT.py
+++ b/blocks/Xcos/blocks/PRODUCT.py
diff --git a/Xcos/blocks/PROD_f.py b/blocks/Xcos/blocks/PROD_f.py
index 28e90f5e..28e90f5e 100644
--- a/Xcos/blocks/PROD_f.py
+++ b/blocks/Xcos/blocks/PROD_f.py
diff --git a/Xcos/blocks/PULSE_SC.py b/blocks/Xcos/blocks/PULSE_SC.py
index a53c117e..a53c117e 100644
--- a/Xcos/blocks/PULSE_SC.py
+++ b/blocks/Xcos/blocks/PULSE_SC.py
diff --git a/Xcos/blocks/PerteDP.py b/blocks/Xcos/blocks/PerteDP.py
index 449b15fa..449b15fa 100644
--- a/Xcos/blocks/PerteDP.py
+++ b/blocks/Xcos/blocks/PerteDP.py
diff --git a/Xcos/blocks/PotentialSensor.py b/blocks/Xcos/blocks/PotentialSensor.py
index dc3be2e8..dc3be2e8 100644
--- a/Xcos/blocks/PotentialSensor.py
+++ b/blocks/Xcos/blocks/PotentialSensor.py
diff --git a/Xcos/blocks/PuitsP.py b/blocks/Xcos/blocks/PuitsP.py
index 068ea2aa..068ea2aa 100644
--- a/Xcos/blocks/PuitsP.py
+++ b/blocks/Xcos/blocks/PuitsP.py
diff --git a/Xcos/blocks/QUANT_f.py b/blocks/Xcos/blocks/QUANT_f.py
index deeb7c54..deeb7c54 100644
--- a/Xcos/blocks/QUANT_f.py
+++ b/blocks/Xcos/blocks/QUANT_f.py
diff --git a/Xcos/blocks/RAMP.py b/blocks/Xcos/blocks/RAMP.py
index af802bc1..af802bc1 100644
--- a/Xcos/blocks/RAMP.py
+++ b/blocks/Xcos/blocks/RAMP.py
diff --git a/Xcos/blocks/RAND_m.py b/blocks/Xcos/blocks/RAND_m.py
index 61d018b9..61d018b9 100644
--- a/Xcos/blocks/RAND_m.py
+++ b/blocks/Xcos/blocks/RAND_m.py
diff --git a/Xcos/blocks/RATELIMITER.py b/blocks/Xcos/blocks/RATELIMITER.py
index 3f318cb9..3f318cb9 100644
--- a/Xcos/blocks/RATELIMITER.py
+++ b/blocks/Xcos/blocks/RATELIMITER.py
diff --git a/Xcos/blocks/READAU_f.py b/blocks/Xcos/blocks/READAU_f.py
index eb43b57d..eb43b57d 100644
--- a/Xcos/blocks/READAU_f.py
+++ b/blocks/Xcos/blocks/READAU_f.py
diff --git a/Xcos/blocks/READC_f.py b/blocks/Xcos/blocks/READC_f.py
index 753f85b6..753f85b6 100644
--- a/Xcos/blocks/READC_f.py
+++ b/blocks/Xcos/blocks/READC_f.py
diff --git a/Xcos/blocks/REGISTER.py b/blocks/Xcos/blocks/REGISTER.py
index e4244264..e4244264 100644
--- a/Xcos/blocks/REGISTER.py
+++ b/blocks/Xcos/blocks/REGISTER.py
diff --git a/Xcos/blocks/RELATIONALOP.py b/blocks/Xcos/blocks/RELATIONALOP.py
index 4a74b5e5..4a74b5e5 100644
--- a/Xcos/blocks/RELATIONALOP.py
+++ b/blocks/Xcos/blocks/RELATIONALOP.py
diff --git a/Xcos/blocks/RELAY_f.py b/blocks/Xcos/blocks/RELAY_f.py
index 3cccb526..3cccb526 100644
--- a/Xcos/blocks/RELAY_f.py
+++ b/blocks/Xcos/blocks/RELAY_f.py
diff --git a/Xcos/blocks/RFILE_f.py b/blocks/Xcos/blocks/RFILE_f.py
index 1e67e643..1e67e643 100644
--- a/Xcos/blocks/RFILE_f.py
+++ b/blocks/Xcos/blocks/RFILE_f.py
diff --git a/Xcos/blocks/RICC.py b/blocks/Xcos/blocks/RICC.py
index afe2d926..afe2d926 100644
--- a/Xcos/blocks/RICC.py
+++ b/blocks/Xcos/blocks/RICC.py
diff --git a/Xcos/blocks/ROOTCOEF.py b/blocks/Xcos/blocks/ROOTCOEF.py
index a3be4a27..a3be4a27 100644
--- a/Xcos/blocks/ROOTCOEF.py
+++ b/blocks/Xcos/blocks/ROOTCOEF.py
diff --git a/Xcos/blocks/Resistor.py b/blocks/Xcos/blocks/Resistor.py
index 98743b7f..98743b7f 100644
--- a/Xcos/blocks/Resistor.py
+++ b/blocks/Xcos/blocks/Resistor.py
diff --git a/Xcos/blocks/SAMPHOLD_m.py b/blocks/Xcos/blocks/SAMPHOLD_m.py
index 08dc6e64..08dc6e64 100644
--- a/Xcos/blocks/SAMPHOLD_m.py
+++ b/blocks/Xcos/blocks/SAMPHOLD_m.py
diff --git a/Xcos/blocks/SATURATION.py b/blocks/Xcos/blocks/SATURATION.py
index 2765c828..2765c828 100644
--- a/Xcos/blocks/SATURATION.py
+++ b/blocks/Xcos/blocks/SATURATION.py
diff --git a/Xcos/blocks/SAWTOOTH_f.py b/blocks/Xcos/blocks/SAWTOOTH_f.py
index 8d8be4bf..8d8be4bf 100644
--- a/Xcos/blocks/SAWTOOTH_f.py
+++ b/blocks/Xcos/blocks/SAWTOOTH_f.py
diff --git a/Xcos/blocks/SCALAR2VECTOR.py b/blocks/Xcos/blocks/SCALAR2VECTOR.py
index d92f3229..d92f3229 100644
--- a/Xcos/blocks/SCALAR2VECTOR.py
+++ b/blocks/Xcos/blocks/SCALAR2VECTOR.py
diff --git a/Xcos/blocks/SELECT_m.py b/blocks/Xcos/blocks/SELECT_m.py
index 169b607a..169b607a 100644
--- a/Xcos/blocks/SELECT_m.py
+++ b/blocks/Xcos/blocks/SELECT_m.py
diff --git a/Xcos/blocks/SELF_SWITCH.py b/blocks/Xcos/blocks/SELF_SWITCH.py
index da0f411a..da0f411a 100644
--- a/Xcos/blocks/SELF_SWITCH.py
+++ b/blocks/Xcos/blocks/SELF_SWITCH.py
diff --git a/Xcos/blocks/SHIFT.py b/blocks/Xcos/blocks/SHIFT.py
index f2474766..f2474766 100644
--- a/Xcos/blocks/SHIFT.py
+++ b/blocks/Xcos/blocks/SHIFT.py
diff --git a/Xcos/blocks/SIGNUM.py b/blocks/Xcos/blocks/SIGNUM.py
index cc4aa916..cc4aa916 100644
--- a/Xcos/blocks/SIGNUM.py
+++ b/blocks/Xcos/blocks/SIGNUM.py
diff --git a/Xcos/blocks/SINBLK_f.py b/blocks/Xcos/blocks/SINBLK_f.py
index 956bf1e8..956bf1e8 100644
--- a/Xcos/blocks/SINBLK_f.py
+++ b/blocks/Xcos/blocks/SINBLK_f.py
diff --git a/Xcos/blocks/SOM_f.py b/blocks/Xcos/blocks/SOM_f.py
index dedf94cd..dedf94cd 100644
--- a/Xcos/blocks/SOM_f.py
+++ b/blocks/Xcos/blocks/SOM_f.py
diff --git a/Xcos/blocks/SQRT.py b/blocks/Xcos/blocks/SQRT.py
index 5dffd4d5..5dffd4d5 100644
--- a/Xcos/blocks/SQRT.py
+++ b/blocks/Xcos/blocks/SQRT.py
diff --git a/Xcos/blocks/SRFLIPFLOP.py b/blocks/Xcos/blocks/SRFLIPFLOP.py
index 9bf028e5..9bf028e5 100644
--- a/Xcos/blocks/SRFLIPFLOP.py
+++ b/blocks/Xcos/blocks/SRFLIPFLOP.py
diff --git a/Xcos/blocks/STEP_FUNCTION.py b/blocks/Xcos/blocks/STEP_FUNCTION.py
index 94b615a0..94b615a0 100644
--- a/Xcos/blocks/STEP_FUNCTION.py
+++ b/blocks/Xcos/blocks/STEP_FUNCTION.py
diff --git a/Xcos/blocks/SUBMAT.py b/blocks/Xcos/blocks/SUBMAT.py
index 24b95361..24b95361 100644
--- a/Xcos/blocks/SUBMAT.py
+++ b/blocks/Xcos/blocks/SUBMAT.py
diff --git a/Xcos/blocks/SUMMATION.py b/blocks/Xcos/blocks/SUMMATION.py
index ca2d4d5e..ca2d4d5e 100644
--- a/Xcos/blocks/SUMMATION.py
+++ b/blocks/Xcos/blocks/SUMMATION.py
diff --git a/Xcos/blocks/SUM_f.py b/blocks/Xcos/blocks/SUM_f.py
index 79b2749e..79b2749e 100644
--- a/Xcos/blocks/SUM_f.py
+++ b/blocks/Xcos/blocks/SUM_f.py
diff --git a/Xcos/blocks/SUPER_f.py b/blocks/Xcos/blocks/SUPER_f.py
index d45be6bb..d45be6bb 100644
--- a/Xcos/blocks/SUPER_f.py
+++ b/blocks/Xcos/blocks/SUPER_f.py
diff --git a/Xcos/blocks/SWITCH2_m.py b/blocks/Xcos/blocks/SWITCH2_m.py
index fa4b6129..fa4b6129 100644
--- a/Xcos/blocks/SWITCH2_m.py
+++ b/blocks/Xcos/blocks/SWITCH2_m.py
diff --git a/Xcos/blocks/SWITCH_f.py b/blocks/Xcos/blocks/SWITCH_f.py
index c11fc501..c11fc501 100644
--- a/Xcos/blocks/SWITCH_f.py
+++ b/blocks/Xcos/blocks/SWITCH_f.py
diff --git a/Xcos/blocks/SampleCLK.py b/blocks/Xcos/blocks/SampleCLK.py
index 3aa78b44..3aa78b44 100644
--- a/Xcos/blocks/SampleCLK.py
+++ b/blocks/Xcos/blocks/SampleCLK.py
diff --git a/Xcos/blocks/Sigbuilder.py b/blocks/Xcos/blocks/Sigbuilder.py
index 28169b76..28169b76 100644
--- a/Xcos/blocks/Sigbuilder.py
+++ b/blocks/Xcos/blocks/Sigbuilder.py
diff --git a/Xcos/blocks/SineVoltage.py b/blocks/Xcos/blocks/SineVoltage.py
index 3aefffb4..3aefffb4 100644
--- a/Xcos/blocks/SineVoltage.py
+++ b/blocks/Xcos/blocks/SineVoltage.py
diff --git a/Xcos/blocks/SourceP.py b/blocks/Xcos/blocks/SourceP.py
index 628905f4..628905f4 100644
--- a/Xcos/blocks/SourceP.py
+++ b/blocks/Xcos/blocks/SourceP.py
diff --git a/Xcos/blocks/SplitBlock.py b/blocks/Xcos/blocks/SplitBlock.py
index 7e1e5077..7e1e5077 100644
--- a/Xcos/blocks/SplitBlock.py
+++ b/blocks/Xcos/blocks/SplitBlock.py
diff --git a/Xcos/blocks/Switch.py b/blocks/Xcos/blocks/Switch.py
index 05bd9491..05bd9491 100644
--- a/Xcos/blocks/Switch.py
+++ b/blocks/Xcos/blocks/Switch.py
diff --git a/Xcos/blocks/TANBLK_f.py b/blocks/Xcos/blocks/TANBLK_f.py
index 64d2a95a..64d2a95a 100644
--- a/Xcos/blocks/TANBLK_f.py
+++ b/blocks/Xcos/blocks/TANBLK_f.py
diff --git a/Xcos/blocks/TCLSS.py b/blocks/Xcos/blocks/TCLSS.py
index a13e053a..a13e053a 100644
--- a/Xcos/blocks/TCLSS.py
+++ b/blocks/Xcos/blocks/TCLSS.py
diff --git a/Xcos/blocks/TEXT_f.py b/blocks/Xcos/blocks/TEXT_f.py
index b5ebe269..b5ebe269 100644
--- a/Xcos/blocks/TEXT_f.py
+++ b/blocks/Xcos/blocks/TEXT_f.py
diff --git a/Xcos/blocks/TIME_DELAY.py b/blocks/Xcos/blocks/TIME_DELAY.py
index 534ee824..534ee824 100644
--- a/Xcos/blocks/TIME_DELAY.py
+++ b/blocks/Xcos/blocks/TIME_DELAY.py
diff --git a/Xcos/blocks/TIME_f.py b/blocks/Xcos/blocks/TIME_f.py
index 6d7d3c4e..6d7d3c4e 100644
--- a/Xcos/blocks/TIME_f.py
+++ b/blocks/Xcos/blocks/TIME_f.py
diff --git a/Xcos/blocks/TKSCALE.py b/blocks/Xcos/blocks/TKSCALE.py
index a503cabb..a503cabb 100644
--- a/Xcos/blocks/TKSCALE.py
+++ b/blocks/Xcos/blocks/TKSCALE.py
diff --git a/Xcos/blocks/TOWS_c.py b/blocks/Xcos/blocks/TOWS_c.py
index f8dcf456..f8dcf456 100644
--- a/Xcos/blocks/TOWS_c.py
+++ b/blocks/Xcos/blocks/TOWS_c.py
diff --git a/Xcos/blocks/TRASH_f.py b/blocks/Xcos/blocks/TRASH_f.py
index 8afc9396..8afc9396 100644
--- a/Xcos/blocks/TRASH_f.py
+++ b/blocks/Xcos/blocks/TRASH_f.py
diff --git a/Xcos/blocks/TrigFun.py b/blocks/Xcos/blocks/TrigFun.py
index 652fb17b..652fb17b 100644
--- a/Xcos/blocks/TrigFun.py
+++ b/blocks/Xcos/blocks/TrigFun.py
diff --git a/Xcos/blocks/VARIABLE_DELAY.py b/blocks/Xcos/blocks/VARIABLE_DELAY.py
index e4cab885..e4cab885 100644
--- a/Xcos/blocks/VARIABLE_DELAY.py
+++ b/blocks/Xcos/blocks/VARIABLE_DELAY.py
diff --git a/Xcos/blocks/VVsourceAC.py b/blocks/Xcos/blocks/VVsourceAC.py
index 1b7ca050..1b7ca050 100644
--- a/Xcos/blocks/VVsourceAC.py
+++ b/blocks/Xcos/blocks/VVsourceAC.py
diff --git a/Xcos/blocks/VanneReglante.py b/blocks/Xcos/blocks/VanneReglante.py
index 0b38912e..0b38912e 100644
--- a/Xcos/blocks/VanneReglante.py
+++ b/blocks/Xcos/blocks/VanneReglante.py
diff --git a/Xcos/blocks/VariableResistor.py b/blocks/Xcos/blocks/VariableResistor.py
index 6d22ed4f..6d22ed4f 100644
--- a/Xcos/blocks/VariableResistor.py
+++ b/blocks/Xcos/blocks/VariableResistor.py
diff --git a/Xcos/blocks/VirtualCLK0.py b/blocks/Xcos/blocks/VirtualCLK0.py
index adef7c6c..adef7c6c 100644
--- a/Xcos/blocks/VirtualCLK0.py
+++ b/blocks/Xcos/blocks/VirtualCLK0.py
diff --git a/Xcos/blocks/VoltageSensor.py b/blocks/Xcos/blocks/VoltageSensor.py
index 542cba1c..542cba1c 100644
--- a/Xcos/blocks/VoltageSensor.py
+++ b/blocks/Xcos/blocks/VoltageSensor.py
diff --git a/Xcos/blocks/VsourceAC.py b/blocks/Xcos/blocks/VsourceAC.py
index 82b79d56..82b79d56 100644
--- a/Xcos/blocks/VsourceAC.py
+++ b/blocks/Xcos/blocks/VsourceAC.py
diff --git a/Xcos/blocks/WRITEAU_f.py b/blocks/Xcos/blocks/WRITEAU_f.py
index 134f05d5..134f05d5 100644
--- a/Xcos/blocks/WRITEAU_f.py
+++ b/blocks/Xcos/blocks/WRITEAU_f.py
diff --git a/Xcos/blocks/WRITEC_f.py b/blocks/Xcos/blocks/WRITEC_f.py
index fd3b15be..fd3b15be 100644
--- a/Xcos/blocks/WRITEC_f.py
+++ b/blocks/Xcos/blocks/WRITEC_f.py
diff --git a/Xcos/blocks/ZCROSS_f.py b/blocks/Xcos/blocks/ZCROSS_f.py
index 7f4111b9..7f4111b9 100644
--- a/Xcos/blocks/ZCROSS_f.py
+++ b/blocks/Xcos/blocks/ZCROSS_f.py
diff --git a/Xcos/blocks/c_block.py b/blocks/Xcos/blocks/c_block.py
index 77e39a1c..77e39a1c 100644
--- a/Xcos/blocks/c_block.py
+++ b/blocks/Xcos/blocks/c_block.py
diff --git a/Xcos/blocks/fortran_block.py b/blocks/Xcos/blocks/fortran_block.py
index de1ecb83..de1ecb83 100644
--- a/Xcos/blocks/fortran_block.py
+++ b/blocks/Xcos/blocks/fortran_block.py
diff --git a/Xcos/blocks/freq_div.py b/blocks/Xcos/blocks/freq_div.py
index f894379f..f894379f 100644
--- a/Xcos/blocks/freq_div.py
+++ b/blocks/Xcos/blocks/freq_div.py
diff --git a/Xcos/blocks/generic_block3.py b/blocks/Xcos/blocks/generic_block3.py
index 93c1cda5..93c1cda5 100644
--- a/Xcos/blocks/generic_block3.py
+++ b/blocks/Xcos/blocks/generic_block3.py
diff --git a/Xcos/blocks/scifunc_block_m.py b/blocks/Xcos/blocks/scifunc_block_m.py
index 7ae44d86..7ae44d86 100644
--- a/Xcos/blocks/scifunc_block_m.py
+++ b/blocks/Xcos/blocks/scifunc_block_m.py
diff --git a/Xcos/common/AAAAAA.py b/blocks/Xcos/common/AAAAAA.py
index 4c73a12b..4c73a12b 100644
--- a/Xcos/common/AAAAAA.py
+++ b/blocks/Xcos/common/AAAAAA.py
diff --git a/Xcos/links/CommandControlLink.py b/blocks/Xcos/links/CommandControlLink.py
index d106c553..d106c553 100644
--- a/Xcos/links/CommandControlLink.py
+++ b/blocks/Xcos/links/CommandControlLink.py
diff --git a/Xcos/links/ExplicitLink.py b/blocks/Xcos/links/ExplicitLink.py
index 6181274d..6181274d 100644
--- a/Xcos/links/ExplicitLink.py
+++ b/blocks/Xcos/links/ExplicitLink.py
diff --git a/Xcos/links/ImplicitLink.py b/blocks/Xcos/links/ImplicitLink.py
index 4d9175ae..4d9175ae 100644
--- a/Xcos/links/ImplicitLink.py
+++ b/blocks/Xcos/links/ImplicitLink.py
diff --git a/Xcos/parsexcosblocks.awk b/blocks/Xcos/parsexcosblocks.awk
index 41d71f97..41d71f97 100755
--- a/Xcos/parsexcosblocks.awk
+++ b/blocks/Xcos/parsexcosblocks.awk
diff --git a/Xcos/ports/CommandPort.py b/blocks/Xcos/ports/CommandPort.py
index a4f23377..a4f23377 100644
--- a/Xcos/ports/CommandPort.py
+++ b/blocks/Xcos/ports/CommandPort.py
diff --git a/Xcos/ports/ControlPort.py b/blocks/Xcos/ports/ControlPort.py
index 567c5b9f..567c5b9f 100644
--- a/Xcos/ports/ControlPort.py
+++ b/blocks/Xcos/ports/ControlPort.py
diff --git a/Xcos/ports/ExplicitInputPort.py b/blocks/Xcos/ports/ExplicitInputPort.py
index 45d1b32b..45d1b32b 100644
--- a/Xcos/ports/ExplicitInputPort.py
+++ b/blocks/Xcos/ports/ExplicitInputPort.py
diff --git a/Xcos/ports/ExplicitOutputPort.py b/blocks/Xcos/ports/ExplicitOutputPort.py
index e5278c12..e5278c12 100644
--- a/Xcos/ports/ExplicitOutputPort.py
+++ b/blocks/Xcos/ports/ExplicitOutputPort.py
diff --git a/Xcos/ports/ImplicitInputPort.py b/blocks/Xcos/ports/ImplicitInputPort.py
index e1c5a03b..e1c5a03b 100644
--- a/Xcos/ports/ImplicitInputPort.py
+++ b/blocks/Xcos/ports/ImplicitInputPort.py
diff --git a/Xcos/ports/ImplicitOutputPort.py b/blocks/Xcos/ports/ImplicitOutputPort.py
index 8b51c14c..8b51c14c 100644
--- a/Xcos/ports/ImplicitOutputPort.py
+++ b/blocks/Xcos/ports/ImplicitOutputPort.py
diff --git a/Xcos/usexcosblocks.awk b/blocks/Xcos/usexcosblocks.awk
index c8be7020..c8be7020 100755
--- a/Xcos/usexcosblocks.awk
+++ b/blocks/Xcos/usexcosblocks.awk
diff --git a/blocks/requirements.txt b/blocks/requirements.txt
index 618adbe5..ca9cea89 100644
--- a/blocks/requirements.txt
+++ b/blocks/requirements.txt
@@ -7,6 +7,7 @@ click==8.1.3
 click-didyoumean==0.3.0
 click-plugins==1.1.1
 click-repl==0.2.0
+defusedxml==0.7.1
 Django==3.2.18
 django-cors-headers==3.13.0
 django-filter==22.1