| author | Edouard Tisserant |
| Tue, 28 Feb 2023 09:39:51 +0100 | |
| changeset 3737 | 0c06de0a39b5 |
| parent 3736 | 57bcc9545ca1 (diff) |
| parent 3734 | ed1ec3136c2b (current diff) |
| child 3738 | 9ce94d0d3764 |
| child 3740 | ac0e6de439b5 |
--- a/Beremiz_service.py Mon Feb 27 13:47:36 2023 +0100 +++ b/Beremiz_service.py Tue Feb 28 09:39:51 2023 +0100 @@ -185,6 +185,12 @@ return os.path.join(beremiz_dir, *args) +import locale +# Matiec's standard library relies on libC's locale-dependent +# string to/from number convertions, but IEC-61131 counts +# on '.' for decimal point. Therefore locale is reset to "C" */ +locale.setlocale(locale.LC_NUMERIC, "C") + def SetupI18n(): # Get folder containing translation files localedir = os.path.join(beremiz_dir, "locale") @@ -205,7 +211,6 @@ # Define locale domain loc.AddCatalog(domain) - import locale global default_locale default_locale = locale.getdefaultlocale()[1]
--- a/PLCControler.py Mon Feb 27 13:47:36 2023 +0100 +++ b/PLCControler.py Tue Feb 28 09:39:51 2023 +0100 @@ -448,12 +448,12 @@ return len(self.GetInstanceList(pou_infos, name, debug)) > 0 return False - def GenerateProgram(self, filepath=None): + def GenerateProgram(self, filepath=None, **kwargs): errors = [] warnings = [] if self.Project is not None: try: - self.ProgramChunks = GenerateCurrentProgram(self, self.Project, errors, warnings) + self.ProgramChunks = GenerateCurrentProgram(self, self.Project, errors, warnings,**kwargs) self.NextCompiledProject = self.Copy(self.Project) program_text = "".join([item[0] for item in self.ProgramChunks]) if filepath is not None: @@ -1147,28 +1147,35 @@ def GetConfigurationExtraVariables(self): global_vars = [] - for var_name, var_type, var_initial in self.GetConfNodeGlobalInstances(): - tempvar = PLCOpenParser.CreateElement("variable", "globalVars") - tempvar.setname(var_name) - - tempvartype = PLCOpenParser.CreateElement("type", "variable") - if var_type in self.GetBaseTypes(): - tempvartype.setcontent(PLCOpenParser.CreateElement( - var_type.lower() - if var_type in ["STRING", "WSTRING"] - else var_type, "dataType")) + for global_instance in self.GetConfNodeGlobalInstances(): + if type(global_instance)==tuple: + # usual global without modifier from a CTN or a library + var_name, var_type, var_initial = global_instance + tempvar = PLCOpenParser.CreateElement("variable", "globalVars") + tempvar.setname(var_name) + + tempvartype = PLCOpenParser.CreateElement("type", "variable") + if var_type in self.GetBaseTypes(): + tempvartype.setcontent(PLCOpenParser.CreateElement( + var_type.lower() + if var_type in ["STRING", "WSTRING"] + else var_type, "dataType")) + else: + tempderivedtype = PLCOpenParser.CreateElement("derived", "dataType") + tempderivedtype.setname(var_type) + tempvartype.setcontent(tempderivedtype) + tempvar.settype(tempvartype) + + if var_initial != "": + value = PLCOpenParser.CreateElement("initialValue", "variable") + value.setvalue(var_initial) + tempvar.setinitialValue(value) + + global_vars.append(tempvar) else: - tempderivedtype = PLCOpenParser.CreateElement("derived", "dataType") - tempderivedtype.setname(var_type) - tempvartype.setcontent(tempderivedtype) - tempvar.settype(tempvartype) - - if var_initial != "": - value = PLCOpenParser.CreateElement("initialValue", "variable") - value.setvalue(var_initial) - tempvar.setinitialValue(value) - - global_vars.append(tempvar) + # case of varlists from a TC6 library + global_vars.append(global_instance) + return global_vars # Function that returns the block definition associated to the block type given
--- a/PLCGenerator.py Mon Feb 27 13:47:36 2023 +0100 +++ b/PLCGenerator.py Tue Feb 28 09:39:51 2023 +0100 @@ -277,21 +277,27 @@ ("\n", ())] var_number = 0 - varlists = [(varlist, varlist.getvariable()[:]) for varlist in configuration.getglobalVars()] + varlists = configuration.getglobalVars()[:] extra_variables = self.Controler.GetConfigurationExtraVariables() - extra_global_vars = None - if len(extra_variables) > 0 and len(varlists) == 0: - extra_global_vars = PLCOpenParser.CreateElement("globalVars", "interface") - configuration.setglobalVars([extra_global_vars]) - varlists = [(extra_global_vars, [])] - - for variable in extra_variables: - varlists[-1][0].appendvariable(variable) - varlists[-1][1].append(variable) + extra_CTN_globals = [] + + for item in extra_variables: + if item.getLocalTag() == "globalVars": + varlists.append(item) + else: + extra_CTN_globals.append(item) + + if len(extra_CTN_globals) > 0: + extra_varlist = PLCOpenParser.CreateElement("globalVars", "interface") + + for variable in extra_CTN_globals: + extra_varlist.appendvariable(variable) + + varlists.append(extra_varlist) # Generate any global variable in configuration - for varlist, varlist_variables in varlists: + for varlist in varlists: variable_type = errorVarTypes.get("VAR_GLOBAL", "var_local") # Generate variable block with modifier config += [(" VAR_GLOBAL", ())] @@ -303,7 +309,7 @@ config += [(" NON_RETAIN", (tagname, variable_type, (var_number, var_number + len(varlist.getvariable())), "non_retain"))] config += [("\n", ())] # Generate any variable of this block - for var in varlist_variables: + for var in varlist.getvariable(): vartype_content = var.gettype().getcontent() if vartype_content.getLocalTag() == "derived": var_type = vartype_content.getname() @@ -331,12 +337,6 @@ var_number += 1 config += [(" END_VAR\n", ())] - if extra_global_vars is not None: - configuration.remove(extra_global_vars) - else: - for variable in extra_variables: - varlists[-1][0].remove(variable) - # Generate any resource in the configuration for resource in configuration.getresource(): config += self.GenerateResource(resource, configuration.getname()) @@ -458,7 +458,7 @@ return resrce # Generate the entire program for current project - def GenerateProgram(self, log): + def GenerateProgram(self, log, noconfig=False): log("Collecting data types") # Find all data types defined for datatype in self.Project.getdataTypes(): @@ -480,6 +480,8 @@ for pou_name in self.PouComputed.keys(): log("Generate POU %s"%pou_name) self.GeneratePouProgram(pou_name) + if noconfig: + return # Generate every configurations defined log("Generate Config(s)") for config in self.Project.getconfigurations(): @@ -1765,7 +1767,7 @@ return program -def GenerateCurrentProgram(controler, project, errors, warnings): +def GenerateCurrentProgram(controler, project, errors, warnings, **kwargs): generator = ProgramGenerator(controler, project, errors, warnings) if hasattr(controler, "logger"): def log(txt): @@ -1774,5 +1776,5 @@ def log(txt): pass - generator.GenerateProgram(log) + generator.GenerateProgram(log,**kwargs) return generator.GetGeneratedProgram()
--- a/POULibrary.py Mon Feb 27 13:47:36 2023 +0100 +++ b/POULibrary.py Tue Feb 28 09:39:51 2023 +0100 @@ -44,7 +44,7 @@ def GetSTCode(self): if not self.program: - self.program = self.LibraryControler.GenerateProgram()[0]+"\n" + self.program = self.LibraryControler.GenerateProgram(noconfig=True)[0]+"\n" return self.program def GetName(self): @@ -65,9 +65,14 @@ def GlobalInstances(self): """ - @return: [(instance_name, instance_type),...] + @return: [varlist_object, ...] """ - return [] + varlists = [] + for configuration in self.LibraryControler.Project.getconfigurations(): + varlist = configuration.getglobalVars() + if len(varlist)>0 : + varlists += varlist + return varlists def FatalError(self, message): """ Raise an exception that will trigger error message intended to
--- a/editors/TextViewer.py Mon Feb 27 13:47:36 2023 +0100 +++ b/editors/TextViewer.py Tue Feb 28 09:39:51 2023 +0100 @@ -130,8 +130,7 @@ self.Editor.SetUseTabs(0) self.Editor.SetModEventMask(wx.stc.STC_MOD_BEFOREINSERT | - wx.stc.STC_MOD_BEFOREDELETE | - wx.stc.STC_PERFORMED_USER) + wx.stc.STC_MOD_BEFOREDELETE) self.Bind(wx.stc.EVT_STC_STYLENEEDED, self.OnStyleNeeded, self.Editor) self.Editor.Bind(wx.stc.EVT_STC_MARGINCLICK, self.OnMarginClick) @@ -213,25 +212,24 @@ self.SearchResults = None self.CurrentFindHighlight = None + Buffering = "Off" def OnModification(self, event): if not self.DisableEvents: mod_type = event.GetModificationType() if mod_type & wx.stc.STC_MOD_BEFOREINSERT: if self.CurrentAction is None: - self.StartBuffering() + self.Buffering = "ShouldStart" elif self.CurrentAction[0] != "Add" or self.CurrentAction[1] != event.GetPosition() - 1: - self.Controler.EndBuffering() - self.StartBuffering() + self.Buffering = "ShouldRestart" self.CurrentAction = ("Add", event.GetPosition()) - wx.CallAfter(self.RefreshModel) + self.RefreshModelAfter() elif mod_type & wx.stc.STC_MOD_BEFOREDELETE: if self.CurrentAction is None: - self.StartBuffering() + self.Buffering = "ShouldStart" elif self.CurrentAction[0] != "Delete" or self.CurrentAction[1] != event.GetPosition() + 1: - self.Controler.EndBuffering() - self.StartBuffering() + self.Buffering = "ShouldRestart" self.CurrentAction = ("Delete", event.GetPosition()) - wx.CallAfter(self.RefreshModel) + self.RefreshModelAfter() event.Skip() def OnDoDrop(self, event): @@ -379,7 +377,7 @@ elif values[3] == self.TagName: self.ResetBuffer() event.SetDragText(values[0]) - wx.CallAfter(self.RefreshModel) + self.RefreshModelAfter() else: message = _("Variable don't belong to this POU!") if message is not None: @@ -429,10 +427,14 @@ self.ParentWindow.RefreshFileMenu() self.ParentWindow.RefreshEditMenu() + def EndBuffering(self): + self.Controler.EndBuffering() + def ResetBuffer(self): if self.CurrentAction is not None: - self.Controler.EndBuffering() + self.EndBuffering() self.CurrentAction = None + self.Buffering == "Off" def GetBufferState(self): if not self.Debug and self.TextSyntax != "ALL": @@ -834,12 +836,29 @@ self.RemoveHighlight(*self.CurrentFindHighlight) self.CurrentFindHighlight = None + pending_model_refresh=False def RefreshModel(self): + self.pending_model_refresh=False self.RefreshJumpList() self.Colourise(0, -1) + + if self.Buffering == "ShouldStart": + self.StartBuffering() + self.Buffering == "On" + elif self.Buffering == "ShouldRestart": + self.EndBuffering() + self.StartBuffering() + self.Buffering == "On" + self.Controler.SetEditedElementText(self.TagName, self.GetText()) self.ResetSearchResults() + def RefreshModelAfter(self): + if self.pending_model_refresh: + return + self.pending_model_refresh=True + wx.CallAfter(self.RefreshModel) + def OnKeyDown(self, event): key = event.GetKeyCode() if self.Controler is not None:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/exemples/csv_read/beremiz.xml Tue Feb 28 09:39:51 2023 +0100 @@ -0,0 +1,5 @@ +<?xml version='1.0' encoding='utf-8'?> +<BeremizRoot xmlns:xsd="http://www.w3.org/2001/XMLSchema" URI_location="LOCAL://"> + <TargetType/> + <Libraries Enable_SVGHMI_Library="true"/> +</BeremizRoot>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/exemples/csv_read/plc.xml Tue Feb 28 09:39:51 2023 +0100 @@ -0,0 +1,341 @@ +<?xml version='1.0' encoding='utf-8'?> +<project xmlns:ns1="http://www.plcopen.org/xml/tc6_0201" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.plcopen.org/xml/tc6_0201"> + <fileHeader companyName="Unknown" productName="Unnamed" productVersion="1" creationDateTime="2022-12-09T12:13:26"/> + <contentHeader name="Unnamed" modificationDateTime="2022-12-16T11:30:15"> + <coordinateInfo> + <fbd> + <scaling x="5" y="5"/> + </fbd> + <ld> + <scaling x="0" y="0"/> + </ld> + <sfc> + <scaling x="0" y="0"/> + </sfc> + </coordinateInfo> + </contentHeader> + <types> + <dataTypes/> + <pous> + <pou name="program0" pouType="program"> + <interface> + <localVars> + <variable name="CSV_NAME_0"> + <type> + <derived name="HMI_STRING"/> + </type> + <initialValue> + <simpleValue value="'my_int_csv.csv'"/> + </initialValue> + </variable> + <variable name="CSV_NAME_1"> + <type> + <derived name="HMI_STRING"/> + </type> + <initialValue> + <simpleValue value="'my_str_csv.csv'"/> + </initialValue> + </variable> + <variable name="CSV_ROWSTR"> + <type> + <derived name="HMI_STRING"/> + </type> + <initialValue> + <simpleValue value="'Recipe 5'"/> + </initialValue> + </variable> + <variable name="CSV_COLSTR"> + <type> + <derived name="HMI_STRING"/> + </type> + <initialValue> + <simpleValue value="'Ingredient D'"/> + </initialValue> + </variable> + <variable name="CSV_ROWIDX"> + <type> + <derived name="HMI_INT"/> + </type> + <initialValue> + <simpleValue value="5"/> + </initialValue> + </variable> + <variable name="CSV_COLIDX"> + <type> + <derived name="HMI_INT"/> + </type> + <initialValue> + <simpleValue value="4"/> + </initialValue> + </variable> + <variable name="csv_read_by_string0"> + <type> + <derived name="csv_read_by_string"/> + </type> + </variable> + <variable name="csv_read_by_int0"> + <type> + <derived name="csv_read_by_int"/> + </type> + </variable> + <variable name="csv_reload0"> + <type> + <derived name="csv_reload"/> + </type> + </variable> + <variable name="CSV_RES_0"> + <type> + <derived name="HMI_STRING"/> + </type> + </variable> + <variable name="CSV_RES_1"> + <type> + <derived name="HMI_STRING"/> + </type> + </variable> + <variable name="CSV_ACK_0"> + <type> + <derived name="HMI_BOOL"/> + </type> + </variable> + <variable name="CSV_ACK_1"> + <type> + <derived name="HMI_BOOL"/> + </type> + </variable> + <variable name="CSV_RELOAD_BTN"> + <type> + <derived name="HMI_BOOL"/> + </type> + </variable> + </localVars> + </interface> + <body> + <FBD> + <block localId="1" typeName="csv_read_by_string" instanceName="csv_read_by_string0" executionOrderId="0" height="100" width="154"> + <position x="450" y="170"/> + <inputVariables> + <variable formalParameter="FILE_NAME"> + <connectionPointIn> + <relPosition x="0" y="35"/> + <connection refLocalId="7"> + <position x="450" y="205"/> + <position x="390" y="205"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="ROW"> + <connectionPointIn> + <relPosition x="0" y="60"/> + <connection refLocalId="8"> + <position x="450" y="230"/> + <position x="390" y="230"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="COLUMN"> + <connectionPointIn> + <relPosition x="0" y="85"/> + <connection refLocalId="9"> + <position x="450" y="255"/> + <position x="390" y="255"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="ACK"> + <connectionPointOut> + <relPosition x="154" y="35"/> + </connectionPointOut> + </variable> + <variable formalParameter="RESULT"> + <connectionPointOut> + <relPosition x="154" y="60"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="2" typeName="csv_read_by_int" instanceName="csv_read_by_int0" executionOrderId="0" height="100" width="155"> + <position x="450" y="40"/> + <inputVariables> + <variable formalParameter="FILE_NAME"> + <connectionPointIn> + <relPosition x="0" y="35"/> + <connection refLocalId="4"> + <position x="450" y="75"/> + <position x="390" y="75"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="ROW"> + <connectionPointIn> + <relPosition x="0" y="60"/> + <connection refLocalId="5"> + <position x="450" y="100"/> + <position x="390" y="100"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="COLUMN"> + <connectionPointIn> + <relPosition x="0" y="85"/> + <connection refLocalId="6"> + <position x="450" y="125"/> + <position x="390" y="125"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="ACK"> + <connectionPointOut> + <relPosition x="155" y="35"/> + </connectionPointOut> + </variable> + <variable formalParameter="RESULT"> + <connectionPointOut> + <relPosition x="155" y="60"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="3" typeName="csv_reload" instanceName="csv_reload0" executionOrderId="0" height="60" width="135"> + <position x="470" y="334"/> + <inputVariables> + <variable formalParameter="TRIG"> + <connectionPointIn> + <relPosition x="0" y="31"/> + <connection refLocalId="14"> + <position x="470" y="365"/> + <position x="425" y="365"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="ACK"> + <connectionPointOut> + <relPosition x="135" y="31"/> + </connectionPointOut> + </variable> + <variable formalParameter="RESULT"> + <connectionPointOut> + <relPosition x="135" y="51"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <inVariable localId="4" executionOrderId="0" height="30" width="110" negated="false"> + <position x="280" y="60"/> + <connectionPointOut> + <relPosition x="110" y="15"/> + </connectionPointOut> + <expression>CSV_NAME_0</expression> + </inVariable> + <inVariable localId="5" executionOrderId="0" height="25" width="110" negated="false"> + <position x="280" y="90"/> + <connectionPointOut> + <relPosition x="110" y="10"/> + </connectionPointOut> + <expression>CSV_ROWIDX</expression> + </inVariable> + <inVariable localId="6" executionOrderId="0" height="25" width="110" negated="false"> + <position x="280" y="115"/> + <connectionPointOut> + <relPosition x="110" y="10"/> + </connectionPointOut> + <expression>CSV_COLIDX</expression> + </inVariable> + <inVariable localId="7" executionOrderId="0" height="30" width="110" negated="false"> + <position x="280" y="190"/> + <connectionPointOut> + <relPosition x="110" y="15"/> + </connectionPointOut> + <expression>CSV_NAME_1</expression> + </inVariable> + <inVariable localId="8" executionOrderId="0" height="25" width="110" negated="false"> + <position x="280" y="220"/> + <connectionPointOut> + <relPosition x="110" y="10"/> + </connectionPointOut> + <expression>CSV_ROWSTR</expression> + </inVariable> + <inVariable localId="9" executionOrderId="0" height="25" width="110" negated="false"> + <position x="280" y="245"/> + <connectionPointOut> + <relPosition x="110" y="10"/> + </connectionPointOut> + <expression>CSV_COLSTR</expression> + </inVariable> + <outVariable localId="10" executionOrderId="0" height="25" width="82" negated="false"> + <position x="645" y="90"/> + <connectionPointIn> + <relPosition x="0" y="10"/> + <connection refLocalId="2" formalParameter="RESULT"> + <position x="645" y="100"/> + <position x="605" y="100"/> + </connection> + </connectionPointIn> + <expression>CSV_RES_0</expression> + </outVariable> + <outVariable localId="11" executionOrderId="0" height="25" width="82" negated="false"> + <position x="645" y="65"/> + <connectionPointIn> + <relPosition x="0" y="10"/> + <connection refLocalId="2" formalParameter="ACK"> + <position x="645" y="75"/> + <position x="605" y="75"/> + </connection> + </connectionPointIn> + <expression>CSV_ACK_0</expression> + </outVariable> + <outVariable localId="12" executionOrderId="0" height="25" width="82" negated="false"> + <position x="645" y="195"/> + <connectionPointIn> + <relPosition x="0" y="10"/> + <connection refLocalId="1" formalParameter="ACK"> + <position x="645" y="205"/> + <position x="604" y="205"/> + </connection> + </connectionPointIn> + <expression>CSV_ACK_1</expression> + </outVariable> + <outVariable localId="13" executionOrderId="0" height="25" width="82" negated="false"> + <position x="645" y="220"/> + <connectionPointIn> + <relPosition x="0" y="10"/> + <connection refLocalId="1" formalParameter="RESULT"> + <position x="645" y="230"/> + <position x="604" y="230"/> + </connection> + </connectionPointIn> + <expression>CSV_RES_1</expression> + </outVariable> + <inVariable localId="14" executionOrderId="0" height="25" width="125" negated="false"> + <position x="300" y="355"/> + <connectionPointOut> + <relPosition x="125" y="10"/> + </connectionPointOut> + <expression>CSV_RELOAD_BTN</expression> + </inVariable> + </FBD> + </body> + </pou> + </pous> + </types> + <instances> + <configurations> + <configuration name="config"> + <resource name="resource1"> + <task name="task0" priority="0" interval="T#20ms"> + <pouInstance name="instance0" typeName="program0"/> + </task> + </resource> + </configuration> + </configurations> + </instances> +</project>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/exemples/csv_read/project_files/my_int_csv.csv Tue Feb 28 09:39:51 2023 +0100 @@ -0,0 +1,15 @@ +1,1.01,1.02,1.03,1.04,1.05,1.06 +1.1,1.11,1.12,1.13,1.14,1.15,1.16 +1.2,1.21,1.22,1.23,1.24,1.25,1.26 +1.3,1.31,1.32,1.33,1.34,1.35,1.36 +1.4,1.41,1.42,1.43,1.44,1.45,1.46 +1.5,1.51,1.52,1.53,1.54,1.55,1.56 +1.6,1.61,1.62,1.63,1.64,1.65,1.66 +1.7,1.71,1.72,1.73,1.74,1.75,1.76 +1.8,1.81,1.82,1.83,1.84,1.85,1.86 +1.9,1.91,1.92,1.93,1.94,1.95,1.96 +2,2.01,2.02,2.03,2.04,2.05,2.06 +2.1,2.11,2.12,2.13,2.14,2.15,2.16 +2.2,2.21,2.22,2.23,2.24,2.25,2.26 +2.3,2.31,2.32,2.33,2.34,2.35,2.36 +2.4,2.41,2.42,2.43,2.44,2.45,2.46
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/exemples/csv_read/project_files/my_str_csv.csv Tue Feb 28 09:39:51 2023 +0100 @@ -0,0 +1,8 @@ +Title,Ingredient A,Ingredient B,Ingredient C,Ingredient D,Ingredient E,Ingredient F,Ingredient G +Recipe 1,1,2,3,4,5,6,7 +Recipe 2,2,3,4,5,6,7,8 +Recipe 3,3,4,5,6,7,8,9 +Recipe 4,4,5,6,7,8,9,10 +Recipe 5,5,6,7,8,9,10,11 +Recipe 6,6,7,8,9,10,11,12 +Recipe 7,7,8,9,10,11,12,13
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/exemples/csv_read/svghmi_0@svghmi/baseconfnode.xml Tue Feb 28 09:39:51 2023 +0100 @@ -0,0 +1,2 @@ +<?xml version='1.0' encoding='utf-8'?> +<BaseParams xmlns:xsd="http://www.w3.org/2001/XMLSchema" IEC_Channel="0" Name="svghmi_0"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/exemples/csv_read/svghmi_0@svghmi/confnode.xml Tue Feb 28 09:39:51 2023 +0100 @@ -0,0 +1,2 @@ +<?xml version='1.0' encoding='utf-8'?> +<SVGHMI xmlns:xsd="http://www.w3.org/2001/XMLSchema"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/exemples/csv_read/svghmi_0@svghmi/svghmi.svg Tue Feb 28 09:39:51 2023 +0100 @@ -0,0 +1,1787 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" + sodipodi:docname="svghmi.svg" + id="hmi0" + version="1.1" + viewBox="0 0 1280 720" + height="720" + width="1280"> + <metadata + id="metadata8"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs6"> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3492" + id="radialGradient3514" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4681866,-0.02473347,0.01595521,0.5306128,2639.5399,373.67134)" + cx="958.08276" + cy="613.50269" + fx="958.08276" + fy="613.50269" + r="163.49561" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3492"> + <stop + style="stop-color:#ffe7c7;stop-opacity:1" + offset="0" + id="stop3488" /> + <stop + style="stop-color:#ffa32a;stop-opacity:1" + offset="1" + id="stop3490" /> + </linearGradient> + </defs> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1850" + inkscape:window-height="1036" + id="namedview4" + showgrid="false" + inkscape:zoom="0.46354778" + inkscape:cx="148.44921" + inkscape:cy="307.83382" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:current-layer="hmi0" /> + <rect + inkscape:label="HMI:Page:Home" + y="0" + x="0" + height="720" + width="1280" + id="rect1016" + style="color:#000000;opacity:1;fill:#d6d6d6;fill-opacity:1" /> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.2822581;fill-rule:nonzero;stroke:#212121;stroke-width:3.77999997;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect1280" + width="918.30505" + height="88.474594" + x="184.57626" + y="220.61017" /> + <g + id="g446" + transform="matrix(0.75813069,0,0,0.75813069,698.48618,17.66828)" + inkscape:label="HMI:Input@/CSV_ROWIDX" + style="stroke-width:0.37711531"> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:160px;line-height:125%;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#ff8c00;fill-opacity:1;stroke:none;stroke-width:0.37711531px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="216.32812" + y="191.44563" + id="text432" + inkscape:label="value"><tspan + sodipodi:role="line" + id="tspan430" + x="216.32812" + y="191.44563" + style="font-size:84.41815948px;text-align:end;text-anchor:end;fill:#ff8c00;stroke-width:0.37711531px">8</tspan></text> + <path + transform="scale(1,-1)" + sodipodi:type="star" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:1.88557661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="path436" + sodipodi:sides="3" + sodipodi:cx="276.74072" + sodipodi:cy="-224.98808" + sodipodi:r1="29.912722" + sodipodi:r2="14.956361" + sodipodi:arg1="0.52359878" + sodipodi:arg2="1.5707963" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="m 302.6459,-210.03172 -51.81035,0 25.90517,-44.86908 z" + inkscape:transform-center-y="7.4781812" + inkscape:label="-1" /> + <rect + inkscape:label="edit" + onclick="" + y="95.40741" + x="1.8178837" + height="128" + width="230.94511" + id="rect438" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.88557661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <path + inkscape:label="+1" + inkscape:transform-center-y="-7.4781804" + d="m 302.6459,111.4008 -51.81035,0 25.90517,-44.869079 z" + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="1.5707963" + sodipodi:arg1="0.52359878" + sodipodi:r2="14.956361" + sodipodi:r1="29.912722" + sodipodi:cy="96.444443" + sodipodi:cx="276.74072" + sodipodi:sides="3" + id="path442" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:1.88557661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + sodipodi:type="star" /> + <path + inkscape:label="=0" + inkscape:transform-center-y="-10.828983" + d="m 306.14807,189.68763 -58.37872,0.43598 -0.43597,-58.37872 58.37871,-0.43597 z" + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="1.5633284" + sodipodi:arg1="0.77793027" + sodipodi:r2="21.657967" + sodipodi:r1="41.281136" + sodipodi:cy="160.71626" + sodipodi:cx="276.74072" + sodipodi:sides="4" + id="path444" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:1.88557661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + sodipodi:type="star" + inkscape:transform-center-x="1.0089177e-06" /> + </g> + <g + id="g446-3" + transform="matrix(0.75813069,0,0,0.75813069,956.1536,17.66828)" + inkscape:label="HMI:Input@/CSV_COLIDX" + style="stroke-width:0.37711531"> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:160px;line-height:125%;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#ff8c00;fill-opacity:1;stroke:none;stroke-width:0.37711531px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="216.32812" + y="191.44563" + id="text432-6" + inkscape:label="value"><tspan + sodipodi:role="line" + id="tspan430-7" + x="216.32812" + y="191.44563" + style="font-size:84.41815948px;text-align:end;text-anchor:end;fill:#ff8c00;stroke-width:0.37711531px">8</tspan></text> + <path + transform="scale(1,-1)" + sodipodi:type="star" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:1.88557661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="path436-5" + sodipodi:sides="3" + sodipodi:cx="276.74072" + sodipodi:cy="-224.98808" + sodipodi:r1="29.912722" + sodipodi:r2="14.956361" + sodipodi:arg1="0.52359878" + sodipodi:arg2="1.5707963" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="m 302.6459,-210.03172 -51.81035,0 25.90517,-44.86908 z" + inkscape:transform-center-y="7.4781812" + inkscape:label="-1" /> + <rect + inkscape:label="edit" + onclick="" + y="95.40741" + x="1.8178837" + height="128" + width="230.94511" + id="rect438-3" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.88557661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <path + inkscape:label="+1" + inkscape:transform-center-y="-7.4781804" + d="m 302.6459,111.4008 -51.81035,0 25.90517,-44.869079 z" + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="1.5707963" + sodipodi:arg1="0.52359878" + sodipodi:r2="14.956361" + sodipodi:r1="29.912722" + sodipodi:cy="96.444443" + sodipodi:cx="276.74072" + sodipodi:sides="3" + id="path442-5" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:1.88557661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + sodipodi:type="star" /> + <path + inkscape:label="=0" + inkscape:transform-center-y="-10.828983" + d="m 306.14807,189.68763 -58.37872,0.43598 -0.43597,-58.37872 58.37871,-0.43597 z" + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="1.5633284" + sodipodi:arg1="0.77793027" + sodipodi:r2="21.657967" + sodipodi:r1="41.281136" + sodipodi:cy="160.71626" + sodipodi:cx="276.74072" + sodipodi:sides="4" + id="path444-6" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:1.88557661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + sodipodi:type="star" + inkscape:transform-center-x="1.0089177e-06" /> + </g> + <text + id="text432-2" + y="287.5881" + x="1071.9137" + style="font-style:normal;font-weight:normal;font-size:70.26290131px;line-height:125%;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#ff8c00;fill-opacity:1;stroke:none;stroke-width:0.28590271px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve" + inkscape:label="HMI:Display@/CSV_RES_0"><tspan + style="font-size:64px;text-align:end;text-anchor:end;fill:#ff8c00;stroke-width:0.28590271px" + y="287.5881" + x="1071.9137" + id="tspan430-9" + sodipodi:role="line">8</tspan></text> + <g + style="stroke-width:0.38066483" + transform="matrix(9.9287544,0,0,9.9287544,31.703297,-525.3078)" + id="g72" + inkscape:label="HMI:Switch@/CSV_ACK_0"> + <text + inkscape:label="true" + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.10071757px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="112.6369" + y="83.254463" + id="text62"><tspan + sodipodi:role="line" + id="tspan60" + x="112.6369" + y="83.254463" + style="fill:#008000;stroke-width:0.10071757px">✔</tspan></text> + <text + inkscape:label="false" + id="text66" + y="83.254463" + x="112.6369" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.10071757px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="fill:#ff0000;stroke-width:0.10071757px" + y="83.254463" + x="112.6369" + id="tspan64" + sodipodi:role="line">✕</tspan></text> + </g> + <text + id="text94" + y="81.446617" + x="815.58868" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="81.446617" + x="815.58868" + id="tspan92" + sodipodi:role="line">Row#</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="1051.5886" + y="81.446617" + id="text98"><tspan + sodipodi:role="line" + id="tspan96" + x="1051.5886" + y="81.446617">Column#</tspan></text> + <g + style="stroke-width:0.37711531" + inkscape:label="HMI:Input@/CSV_NAME_0" + transform="matrix(0.75813069,0,0,0.75813069,298.48618,17.66828)" + id="g112"> + <text + inkscape:label="value" + id="text102" + y="192.18758" + x="-257.78806" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:62.1669426px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ff8c00;fill-opacity:1;stroke:none;stroke-width:0.37711531px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:62.1669426px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ff8c00;stroke-width:0.37711531px" + y="192.18758" + x="-257.78806" + id="tspan100" + sodipodi:role="line">file.csv</tspan></text> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.88557661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect106" + width="855.69763" + height="128" + x="-359.35144" + y="95.40741" + onclick="" + inkscape:label="edit" /> + </g> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="196.74792" + y="81.446617" + id="text116"><tspan + sodipodi:role="line" + id="tspan114" + x="196.74792" + y="81.446617">File name</tspan></text> + <g + id="g4278" + style="fill-rule:evenodd;stroke-width:0.47631353" + transform="matrix(3.3549332,0,0,3.14525,-181.87457,1036.0198)" + inkscape:label="HMI:Keypad:HMI_STRING:HMI_LOCAL:PAGE_LOCAL"> + <path + sodipodi:nodetypes="ccccc" + inkscape:label="Background" + inkscape:connector-curvature="0" + id="rect1006-3" + d="M 54.211084,1.2654702 H 435.7388 V 230.18209 H 54.211084 Z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.6;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.16776976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <path + inkscape:label="Space" + inkscape:connector-curvature="0" + d="m 162,197 h -11 c -2,0 -3,1 -3,3 v 18 c 0,2 1,3 3,3 h 11 168 18 c 0,0 1,-1 1,-3 v -18 c 0,-2 -1,-3 -1,-3 h -18 z" + id="path185" + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <g + transform="translate(0,-19.076386)" + style="stroke-width:0.47631353" + inkscape:label="Keys" + id="g4380"> + <g + transform="translate(0,-9.5381931)" + style="stroke-width:0.47631353" + inkscape:label="q Q" + id="g4283"> + <path + inkscape:connector-curvature="0" + d="m 95,121 h 19 c 2,0 3,1 3,3 v 18 c 0,1 -1,3 -3,3 H 95 c -1,0 -3,-2 -3,-3 v -18 c 0,-2 2,-3 3,-3 z" + id="path41" + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <text + transform="scale(1.0007154,0.99928514)" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826" + id="text203" + y="138.28395" + x="99.378708">Q</text> + </g> + <g + transform="translate(0,-9.5381931)" + style="stroke-width:0.47631353" + inkscape:label="w W" + id="g4337"> + <path + inkscape:connector-curvature="0" + d="m 124,121 h 20 c 2,0 3,1 3,3 v 18 c 0,1 -1,3 -3,3 h -20 c -1,0 -3,-2 -3,-3 v -18 c 0,-2 2,-3 3,-3 z" + id="path43" + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <text + transform="scale(1.0007154,0.99928514)" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826" + id="text207" + y="138.28395" + x="127.0709">W</text> + </g> + <g + transform="translate(0,-9.5381931)" + style="stroke-width:0.47631353" + inkscape:label="e E" + id="g4332"> + <path + inkscape:connector-curvature="0" + d="m 154,121 h 20 c 2,0 3,1 3,3 v 18 c 0,1 -1,3 -3,3 h -20 c -1,0 -3,-2 -3,-3 v -18 c 0,-2 2,-3 3,-3 z" + id="path45" + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <text + transform="scale(1.0007154,0.99928514)" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826" + id="text211" + y="138.28395" + x="159.70854">E</text> + </g> + <g + transform="translate(0,-9.5381931)" + style="stroke-width:0.47631353" + inkscape:label="r R" + id="g4326"> + <path + inkscape:connector-curvature="0" + d="m 184,121 h 19 c 2,0 3,1 3,3 v 18 c 0,1 -1,3 -3,3 h -19 c -1,0 -3,-2 -3,-3 v -18 c 0,-2 2,-3 3,-3 z" + id="path47" + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <text + transform="scale(1.0007154,0.99928514)" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826" + id="text215" + y="138.28395" + x="188.39003">R</text> + </g> + <g + transform="translate(0,-9.5381931)" + style="stroke-width:0.47631353" + inkscape:label="t T" + id="g4321"> + <path + inkscape:connector-curvature="0" + d="m 213,121 h 20 c 2,0 3,1 3,3 v 18 c 0,1 -1,3 -3,3 h -20 c -1,0 -2,-2 -2,-3 v -18 c 0,-2 1,-3 2,-3 z" + id="path49" + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <text + transform="scale(1.0007154,0.99928514)" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826" + id="text219" + y="138.28395" + x="219.04961">T</text> + </g> + <g + transform="translate(0,-9.5381931)" + style="stroke-width:0.47631353" + inkscape:label="y Y" + id="g4316"> + <path + inkscape:connector-curvature="0" + d="m 243,121 h 20 c 2,0 3,1 3,3 v 18 c 0,1 -1,3 -3,3 h -20 c -1,0 -2,-2 -2,-3 v -18 c 0,-2 1,-3 2,-3 z" + id="path51" + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <text + transform="scale(1.0007154,0.99928514)" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826" + id="text223" + y="138.28395" + x="248.72017">Y</text> + </g> + <g + transform="translate(0,-9.5381931)" + style="stroke-width:0.47631353" + inkscape:label="u U" + id="g4311"> + <path + inkscape:connector-curvature="0" + d="m 273,121 h 20 c 2,0 3,1 3,3 v 18 c 0,1 -1,3 -3,3 h -20 c -1,0 -2,-2 -2,-3 v -18 c 0,-2 1,-3 2,-3 z" + id="path53" + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <text + transform="scale(1.0007154,0.99928514)" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826" + id="text227" + y="138.28395" + x="278.39075">U</text> + </g> + <g + transform="translate(0,-9.5381931)" + style="stroke-width:0.47631353" + inkscape:label="i I" + id="g4306"> + <path + inkscape:connector-curvature="0" + d="m 302,121 h 20 c 2,0 3,1 3,3 v 18 c 0,1 -1,3 -3,3 h -20 c -1,0 -2,-2 -2,-3 v -18 c 0,-2 1,-3 2,-3 z" + id="path55" + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <text + transform="scale(1.0007154,0.99928514)" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826" + id="text231" + y="138.28395" + x="311.02859">I</text> + </g> + <g + transform="translate(0,-9.5381931)" + style="stroke-width:0.47631353" + inkscape:label="o O" + id="g4301"> + <path + inkscape:connector-curvature="0" + d="m 332,121 h 20 c 2,0 3,1 3,3 v 18 c 0,1 -1,3 -3,3 h -20 c -1,0 -2,-2 -2,-3 v -18 c 0,-2 1,-3 2,-3 z" + id="path57" + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <text + transform="scale(1.0007154,0.99928514)" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826" + id="text235" + y="138.28395" + x="336.74319">O</text> + </g> + <g + transform="translate(0,-9.5381931)" + style="stroke-width:0.47631353" + inkscape:label="p P" + id="g4296"> + <path + inkscape:connector-curvature="0" + d="m 362,121 h 20 c 2,0 3,1 3,3 v 18 c 0,1 -1,3 -3,3 h -20 c -1,0 -2,-2 -2,-3 v -18 c 0,-2 1,-3 2,-3 z" + id="path59" + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <text + transform="scale(1.0007154,0.99928514)" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826" + id="text239" + y="138.28395" + x="367.40256">P</text> + </g> + <g + inkscape:label="a A" + id="g4511" + style="fill-rule:evenodd;stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path65" + d="m 103,147 h 19 c 1,0 3,1 3,2 v 19 c 0,1 -2,2 -3,2 h -19 c -2,0 -3,-1 -3,-2 v -19 c 0,-1 1,-2 3,-2 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="107.29005" + y="163.99854" + id="text243" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">A</text> + </g> + <g + inkscape:label="s S" + id="g4516" + style="fill-rule:evenodd;stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path67" + d="m 132,147 h 20 c 1,0 3,1 3,2 v 19 c 0,1 -2,2 -3,2 h -20 c -2,0 -3,-1 -3,-2 v -19 c 0,-1 1,-2 3,-2 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="137.95012" + y="163.99854" + id="text247" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">S</text> + </g> + <g + inkscape:label="d D" + id="g4521" + style="fill-rule:evenodd;stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path69" + d="m 162,147 h 20 c 2,0 3,1 3,2 v 19 c 0,1 -1,2 -3,2 h -20 c -2,0 -3,-1 -3,-2 v -19 c 0,-1 1,-2 3,-2 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="166.63159" + y="163.99854" + id="text251" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">D</text> + </g> + <g + inkscape:label="f F" + id="g4526" + style="fill-rule:evenodd;stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path71" + d="m 192,147 h 19 c 2,0 3,1 3,2 v 19 c 0,1 -1,2 -3,2 h -19 c -2,0 -3,-1 -3,-2 v -19 c 0,-1 1,-2 3,-2 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="197.29166" + y="163.99854" + id="text255" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">F</text> + </g> + <g + inkscape:label="g G" + id="g4531" + style="fill-rule:evenodd;stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path73" + d="m 221,147 h 20 c 2,0 3,1 3,2 v 19 c 0,1 -1,2 -3,2 h -20 c -2,0 -3,-1 -3,-2 v -19 c 0,-1 1,-2 3,-2 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="225.97284" + y="163.99854" + id="text259" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">G</text> + </g> + <g + inkscape:label="h H" + id="g4536" + style="fill-rule:evenodd;stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path75" + d="m 251,147 h 20 c 2,0 3,1 3,2 v 19 c 0,1 -1,2 -3,2 h -20 c -1,0 -3,-1 -3,-2 v -19 c 0,-1 2,-2 3,-2 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="255.64342" + y="163.99854" + id="text263" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">H</text> + </g> + <g + inkscape:label="j J" + id="g4541" + style="fill-rule:evenodd;stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path77" + d="m 281,147 h 19 c 2,0 3,1 3,2 v 19 c 0,1 -1,2 -3,2 h -19 c -1,0 -3,-1 -3,-2 v -19 c 0,-1 2,-2 3,-2 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="287.29208" + y="163.99854" + id="text267" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">J</text> + </g> + <g + inkscape:label="k K" + id="g4546" + style="fill-rule:evenodd;stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path79" + d="m 310,147 h 20 c 2,0 3,1 3,2 v 19 c 0,1 -1,2 -3,2 h -20 c -1,0 -3,-1 -3,-2 v -19 c 0,-1 2,-2 3,-2 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="314.98465" + y="163.99854" + id="text271" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">K</text> + </g> + <g + inkscape:label="l L" + id="g4551" + style="fill-rule:evenodd;stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path81" + d="m 340,147 h 20 c 2,0 3,1 3,2 v 19 c 0,1 -1,2 -3,2 h -20 c -1,0 -3,-1 -3,-2 v -19 c 0,-1 2,-2 3,-2 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="345.64444" + y="163.99854" + id="text275" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">L</text> + </g> + <g + transform="translate(0,9.5381929)" + inkscape:label="z Z" + id="g4586" + style="fill-rule:evenodd;stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path87-3" + d="m 113,172 h 21 c 1,0 2,2 2,3 v 17 c 0,2 -1,3 -2,3 h -21 c -1,0 -2,-1 -2,-3 v -17 c 0,-1 1,-3 2,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="119.15855" + y="188.72411" + id="text279" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">Z</text> + </g> + <g + transform="translate(0,9.5381929)" + inkscape:label="x X" + id="g4581" + style="fill-rule:evenodd;stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path89-6" + d="m 143,172 h 21 c 1,0 2,2 2,3 v 17 c 0,2 -1,3 -2,3 h -21 c -1,0 -2,-1 -2,-3 v -17 c 0,-1 1,-3 2,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="148.82933" + y="188.72411" + id="text283" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">X</text> + </g> + <g + transform="translate(0,9.5381929)" + inkscape:label="c C" + id="g4576" + style="fill-rule:evenodd;stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path91-7" + d="m 173,172 h 21 c 1,0 2,2 2,3 v 17 c 0,2 -1,3 -2,3 h -21 c -1,0 -2,-1 -2,-3 v -17 c 0,-1 1,-3 2,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="178.50011" + y="188.72411" + id="text287" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">C</text> + </g> + <g + transform="translate(0,9.5381929)" + inkscape:label="v V" + id="g4571" + style="fill-rule:evenodd;stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path195" + d="m 202,172 h 21 c 1,0 2,2 2,3 v 17 c 0,2 -1,3 -2,3 h -21 c 0,0 -1,-1 -1,-3 v -17 c 0,-1 1,-3 1,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="208.16988" + y="188.72411" + id="text291" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">V</text> + </g> + <g + transform="translate(0,9.5381929)" + inkscape:label="b B" + id="g4566" + style="fill-rule:evenodd;stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path93" + d="m 233,172 h 20 c 1,0 2,2 2,3 v 17 c 0,2 -1,3 -2,3 h -20 c -2,0 -3,-1 -3,-3 v -17 c 0,-1 1,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="237.84096" + y="188.72411" + id="text295" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">B</text> + </g> + <g + transform="translate(0,9.5381929)" + inkscape:label="n N" + id="g4561" + style="fill-rule:evenodd;stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path95" + d="m 263,172 h 20 c 1,0 2,2 2,3 v 17 c 0,2 -1,3 -2,3 h -20 c -2,0 -3,-1 -3,-3 v -17 c 0,-1 1,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="267.51193" + y="188.72411" + id="text299" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">N</text> + </g> + <g + transform="translate(0,9.5381929)" + inkscape:label="m M" + id="g4556" + style="fill-rule:evenodd;stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path97" + d="m 293,172 h 19 c 1,0 2,2 2,3 v 17 c 0,2 -1,3 -2,3 h -19 c -2,0 -3,-1 -3,-3 v -17 c 0,-1 1,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="296.1933" + y="188.72411" + id="text303" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">M</text> + </g> + <g + transform="translate(0,9.5381929)" + style="stroke-width:0.47631353" + inkscape:label=". :" + id="g4818"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path101" + d="m 352,172 h 20 c 1,0 2,2 2,3 v 17 c 0,2 -1,3 -2,3 h -20 c -2,0 -3,-1 -3,-3 v -17 c 0,-1 1,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + x="359.58276" + y="189.66107" + id="text719" + style="font-weight:normal;font-size:9.28803921px;font-family:Arial;fill:#2b2828;fill-rule:evenodd;stroke-width:0.36866826" + transform="scale(1.0007154,0.99928513)">.</text> + <text + transform="scale(1.0007154,0.99928512)" + style="font-weight:normal;font-size:9.28803921px;font-family:Arial;fill:#2b2828;fill-rule:evenodd;stroke-width:0.36866826" + id="text4834" + y="181.64532" + x="359.58276">:</text> + </g> + <g + transform="translate(0,9.5381929)" + style="stroke-width:0.47631353" + inkscape:label=", ;" + id="g4813"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path99" + d="m 322,172 h 20 c 1,0 2,2 2,3 v 17 c 0,2 -1,3 -2,3 h -20 c -2,0 -3,-1 -3,-3 v -17 c 0,-1 1,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928512)" + x="330.00806" + y="181.64532" + id="text727" + style="font-weight:normal;font-size:9.28803921px;font-family:Arial;fill:#2b2828;fill-rule:evenodd;stroke-width:0.36866826">;</text> + <text + id="text4826" + transform="scale(1.0007154,0.99928512)" + x="330.00806" + y="189.66107" + style="font-weight:normal;font-size:9.28803921px;font-family:Arial;fill:#2b2828;fill-rule:evenodd;stroke-width:0.36866826">,</text> + </g> + <g + transform="translate(-13.353469,-45.783327)" + id="g2845" + inkscape:label="1" + style="stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path2839" + d="m 95,121 h 19 c 2,0 3,1 3,3 v 18 c 0,1 -1,3 -3,3 H 95 c -1,0 -3,-2 -3,-3 v -18 c 0,-2 2,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928513)" + x="101.07153" + y="138.28395" + id="text2841" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">1</text> + </g> + <g + transform="translate(-13.353469,-45.783327)" + id="g2853" + inkscape:label="2" + style="stroke-width:0.47631353"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path2847" + d="m 124,121 h 20 c 2,0 3,1 3,3 v 18 c 0,1 -1,3 -3,3 h -20 c -1,0 -3,-2 -3,-3 v -18 c 0,-2 2,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928513)" + x="130.18704" + y="138.28395" + id="text2849" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">2</text> + </g> + <g + transform="translate(-13.353469,-45.783327)" + style="stroke-width:0.47631353" + id="g2861" + inkscape:label="3"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path2855" + d="m 154,121 h 20 c 2,0 3,1 3,3 v 18 c 0,1 -1,3 -3,3 h -20 c -1,0 -3,-2 -3,-3 v -18 c 0,-2 2,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="159.70854" + y="138.28395" + id="text2857" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">3</text> + </g> + <g + transform="translate(0,-19.076386)" + inkscape:label="4" + id="g2957"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path2865" + d="m 170.64653,94.293059 h 19 c 2,0 3,1 3,3 v 18.000001 c 0,1 -1,3 -3,3 h -19 c -1,0 -3,-2 -3,-3 V 97.293059 c 0,-2 2,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="176.39188" + y="111.55791" + id="text2867" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">4</text> + </g> + <g + transform="translate(0,-19.076386)" + inkscape:label="5" + id="g2962"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path2873" + d="m 199.64653,94.293059 h 20 c 2,0 3,1 3,3 v 18.000001 c 0,1 -1,3 -3,3 h -20 c -1,0 -2,-2 -2,-3 V 97.293059 c 0,-2 1,-3 2,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="205.70567" + y="111.55791" + id="text2875" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">5</text> + </g> + <g + transform="translate(0,-19.076386)" + inkscape:label="6" + id="g2967"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path2881" + d="m 229.64653,94.293059 h 20 c 2,0 3,1 3,3 v 18.000001 c 0,1 -1,3 -3,3 h -20 c -1,0 -2,-2 -2,-3 V 97.293059 c 0,-2 1,-3 2,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="236.15851" + y="111.55791" + id="text2883" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">6</text> + </g> + <g + transform="translate(0,-19.076386)" + inkscape:label="7" + id="g2972"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path2889" + d="m 259.64653,94.293059 h 20 c 2,0 3,1 3,3 v 18.000001 c 0,1 -1,3 -3,3 h -20 c -1,0 -2,-2 -2,-3 V 97.293059 c 0,-2 1,-3 2,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="266.06564" + y="111.55791" + id="text2891" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">7</text> + </g> + <g + transform="translate(0,-19.076386)" + inkscape:label="8" + id="g2977"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path2897" + d="m 288.64653,94.293059 h 20 c 2,0 3,1 3,3 v 18.000001 c 0,1 -1,3 -3,3 h -20 c -1,0 -2,-2 -2,-3 V 97.293059 c 0,-2 1,-3 2,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="295.08231" + y="111.55791" + id="text2899" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">8</text> + </g> + <g + transform="translate(0,-19.076386)" + inkscape:label="9 -" + id="g2982"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path2905" + d="m 318.64653,94.293059 h 20 c 2,0 3,1 3,3 v 18.000001 c 0,1 -1,3 -3,3 h -20 c -1,0 -2,-2 -2,-3 V 97.293059 c 0,-2 1,-3 2,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="325.05408" + y="111.55791" + id="text2907" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">9</text> + <text + style="font-weight:normal;font-size:9.28803921px;font-family:Arial;fill:#2b2828;fill-rule:evenodd;stroke-width:0.36866826" + id="text806" + y="102.42173" + x="335.72681" + transform="scale(1.0007154,0.99928511)">-</text> + </g> + <g + transform="translate(0,-19.076386)" + inkscape:label="0 +" + id="g2987"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path2913" + d="m 348.64653,94.293059 h 20 c 2,0 3,1 3,3 v 18.000001 c 0,1 -1,3 -3,3 h -20 c -1,0 -2,-2 -2,-3 V 97.293059 c 0,-2 1,-3 2,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="355.05984" + y="111.55791" + id="text2915" + style="font-weight:normal;font-size:13.93205929px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">0</text> + <text + x="365.30151" + y="102.42173" + id="text804" + style="font-weight:normal;font-size:9.28803921px;font-family:Arial;fill:#2b2828;fill-rule:evenodd;stroke-width:0.36866826" + transform="scale(1.0007154,0.99928511)">+</text> + </g> + </g> + <g + style="stroke-width:0.47631353" + inkscape:label="Esc" + id="g3544" + transform="translate(335.89988,-58.934803)"> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + d="m 47.948645,115.07509 h 39.076386 c 1,0 3,1 3,3 v 18 c 0,1 -2,3 -3,3 H 47.948645 c -2,0 -3,-2 -3,-3 v -18 c 0,-2 1,-3 3,-3 z" + id="path105" + style="opacity:1;vector-effect:none;fill:#4f4c4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.16824313;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <text + x="59.288635" + y="130.02028" + id="text469" + style="font-weight:normal;font-size:9.37966251px;font-family:Arial;fill:#ffffff;fill-rule:evenodd;stroke-width:0.36866826" + transform="scale(1.0007154,0.99928512)">Esc</text> + </g> + <g + transform="translate(0,-19.076386)" + style="stroke-width:0.47631353" + id="g4291" + inkscape:label="Enter"> + <path + inkscape:connector-curvature="0" + d="m 368.68274,170 c -1,0 -2,-1 -2,-3 v -17 c 0,-1 1,-3 2,-3 h 54.24217 c 2,0 3,2 3,3 v 17 c 0,2 -1,3 -3,3 z" + id="path3616" + style="opacity:1;vector-effect:none;fill:#4f4c4d;fill-opacity:1;stroke:none;stroke-width:0.16824313;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + sodipodi:nodetypes="sssssssss" /> + <path + inkscape:connector-curvature="0" + id="path6545" + transform="matrix(0.47690966,0,0,0.47690966,531.12074,-361.18588)" + d="m -260.23633,1080.8125 v 15.7949 h -38.68555 v -3 l -6.91992,4 6.91992,4 v -3.0019 h 40.6836 v -17.793 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + </g> + <g + transform="translate(2.3648311e-6,-28.614579)" + style="fill-rule:evenodd;stroke-width:0.47631353" + id="g4287" + inkscape:label="BackSpace"> + <path + inkscape:connector-curvature="0" + d="m 391.97749,144 c -1,0 -2,-1 -2,-3 v -17 c 0,-1 1,-3 2,-3 h 30.94742 c 2,0 3,2 3,3 v 17 c 0,2 -1,3 -3,3 z" + id="path3624" + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + sodipodi:nodetypes="sssssssss" /> + <path + inkscape:connector-curvature="0" + id="path11623-1-0" + transform="matrix(0.47690966,0,0,0.47690966,531.12074,-351.64769)" + d="m -268.72656,1011.1777 -6.91992,4 6.91992,4 v -3.0019 h 29.18945 v -1.9981 h -29.18945 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2b2828;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + </g> + <g + inkscape:label="CapsLock" + id="g934"> + <g + transform="translate(0,-19.076386)" + style="display:inline;fill-rule:evenodd;stroke-width:0.47631353" + id="g942" + inkscape:label="inactive"> + <path + inkscape:connector-curvature="0" + d="m 67.025031,170 c -1,0 -3,-1 -3,-2 v -19 c 0,-1 2,-2 3,-2 H 92 c 2,0 4,1 4,2 v 19 c 0,1 -2,2 -4,2 z" + id="path936" + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + sodipodi:nodetypes="sssssssss" /> + <text + transform="scale(1.0007154,0.99928515)" + style="font-weight:normal;font-size:8.66233635px;font-family:Arial;fill:#2b2828;stroke-width:0.36866823" + id="text938-5" + y="156.71973" + x="69.789322">Caps</text> + <text + transform="scale(1.0007154,0.99928515)" + style="font-weight:normal;font-size:8.66233635px;font-family:Arial;fill:#2b2828;stroke-width:0.36866823" + id="text940" + y="166.5585" + x="69.789322">Lock</text> + </g> + <g + inkscape:label="active" + id="g4429" + style="fill-rule:evenodd;stroke-width:0.47631353" + transform="translate(0,-19.076386)"> + <path + sodipodi:nodetypes="sssssssss" + style="opacity:1;vector-effect:none;fill:#4f4c4d;fill-opacity:1;stroke:none;stroke-width:0.16824313;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path199" + d="m 67.025031,170 c -1,0 -3,-1 -3,-2 v -19 c 0,-1 2,-2 3,-2 H 92 c 2,0 4,1 4,2 v 19 c 0,1 -2,2 -4,2 z" + inkscape:connector-curvature="0" /> + <text + x="69.789322" + y="156.71973" + id="text647" + style="font-weight:normal;font-size:8.66233635px;font-family:Arial;fill:#ffffff;stroke-width:0.36866823" + transform="scale(1.0007154,0.99928515)">Caps</text> + <text + x="69.789322" + y="166.5585" + id="text651" + style="font-weight:normal;font-size:8.66233635px;font-family:Arial;fill:#ffffff;stroke-width:0.36866823" + transform="scale(1.0007154,0.99928515)">Lock</text> + </g> + </g> + <rect + inkscape:label="Field" + ry="3.8152773" + rx="3.8152773" + y="15.771065" + x="64.024956" + height="30.150299" + width="361.89996" + id="rect2130" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#fffff5;fill-opacity:1;fill-rule:nonzero;stroke:#202326;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + inkscape:label="Value" + id="text1309" + y="38.296417" + x="72.50132" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.0763855px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47690967px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="text-align:start;text-anchor:start;stroke-width:0.47690967px" + y="38.296417" + x="72.50132" + id="tspan1307" + sodipodi:role="line">text</tspan></text> + <g + inkscape:label="Shift" + id="g437"> + <g + inkscape:label="inactive" + id="g421"> + <path + sodipodi:nodetypes="sssssssss" + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path910" + d="m 379.96247,185.46181 c -1,0 -2,-1 -2,-3 v -17 c 0,-1 1,-3 2,-3 h 42.96244 c 2,0 3,2 3,3 v 17 c 0,2 -1,3 -3,3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928513)" + x="392.55679" + y="177.90059" + id="text912" + style="font-weight:normal;font-size:8.92098808px;font-family:Arial;fill:#2b2828;stroke-width:0.36866826">Shift</text> + <path + inkscape:connector-curvature="0" + d="m 67.025031,185.46181 c -1,0 -3,-1 -3,-3 v -17 c 0,-1 2,-3 3,-3 H 104 c 1,0 2,2 2,3 v 17 c 0,2 -1,3 -2,3 z" + id="path856" + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + sodipodi:nodetypes="sssssssss" /> + <text + transform="scale(1.0007154,0.99928513)" + style="font-weight:normal;font-size:8.92098808px;font-family:Arial;fill:#2b2828;fill-rule:evenodd;stroke-width:0.36866826" + id="text858" + y="177.90059" + x="75.85218">Shift</text> + </g> + <g + inkscape:label="active" + id="g413"> + <path + inkscape:connector-curvature="0" + d="m 379.96247,185.46181 c -1,0 -2,-1 -2,-3 v -17 c 0,-1 1,-3 2,-3 h 42.96244 c 2,0 3,2 3,3 v 17 c 0,2 -1,3 -3,3 z" + id="path551" + style="opacity:1;vector-effect:none;fill:#4f4c4d;fill-opacity:1;stroke:none;stroke-width:0.16824313;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + sodipodi:nodetypes="sssssssss" /> + <text + style="font-weight:normal;font-size:8.92098808px;font-family:Arial;fill:#ffffff;stroke-width:0.36866826" + id="text629" + y="177.90059" + x="392.55679" + transform="scale(1.0007154,0.99928513)">Shift</text> + <path + sodipodi:nodetypes="sssssssss" + style="opacity:1;vector-effect:none;fill:#4f4c4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.16824313;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path879" + d="m 67.025031,185.46181 c -1,0 -3,-1 -3,-3 v -17 c 0,-1 2,-3 3,-3 H 104 c 1,0 2,2 2,3 v 17 c 0,2 -1,3 -2,3 z" + inkscape:connector-curvature="0" /> + <text + x="75.85218" + y="177.90059" + id="text881" + style="font-weight:normal;font-size:8.92098808px;font-family:Arial;fill:#ffffff;fill-rule:evenodd;stroke-width:0.36866826" + transform="scale(1.0007154,0.99928513)">Shift</text> + </g> + </g> + <text + inkscape:label="Info" + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.31375408px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.30784383px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="252.9579" + y="12.333657" + id="text471" + transform="scale(0.96824588,1.0327955)"><tspan + sodipodi:role="line" + id="tspan469" + x="252.9579" + y="12.333657" + style="stroke-width:0.30784383px">information</tspan></text> + </g> + <g + transform="matrix(3.3549332,0,0,3.14525,-181.87461,1836.0198)" + style="fill-rule:evenodd;stroke-width:0.47631353" + id="g2432" + inkscape:label="HMI:Keypad:HMI_INT:HMI_REAL"> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.6;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.16776976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="M 54.211099,1.2654702 H 435.73881 V 230.18209 H 54.211099 Z" + id="path2136" + inkscape:connector-curvature="0" + inkscape:label="Background" + sodipodi:nodetypes="ccccc" /> + <rect + inkscape:label="Field" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#fffff5;fill-opacity:1;fill-rule:nonzero;stroke:#202326;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect2426" + width="361.89996" + height="30.150299" + x="64.024963" + y="15.77106" + rx="3.8152773" + ry="3.8152773" /> + <text + inkscape:label="Value" + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.0763855px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47690967px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="72.50132" + y="37.408375" + id="text2430"><tspan + sodipodi:role="line" + id="tspan2428" + x="72.50132" + y="37.408375" + style="text-align:start;text-anchor:start;stroke-width:0.47690967px">number</tspan></text> + <g + transform="matrix(1.6700128,0,0,1.6700128,-826.83854,-145.60855)" + id="g4947" + inkscape:label="Enter" + style="fill-rule:evenodd;stroke-width:0.13585199"> + <path + inkscape:connector-curvature="0" + d="m 750,175 c 0,-2 -1,-3 -3,-3 h -20 c -1,0 -3,1 -3,3 v 43 c 0,1 2,2 3,2 h 20 c 2,0 3,-1 3,-2 z" + id="path193" + style="opacity:1;vector-effect:none;fill:#4f4c4d;fill-opacity:1;stroke:none;stroke-width:0.10074362;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path6545-4" + transform="matrix(0.28557246,0,0,0.28557246,1098.7155,-140.51013)" + d="m -1244.2949,1166.5938 v 15.791 h -38.6875 v -2.9981 l -6.9199,4 6.9199,4 v -2.998 h 40.6836 v -17.7949 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + </g> + <g + transform="matrix(1.6700128,0,0,1.6700128,-826.83854,-145.60855)" + id="g4993" + inkscape:label="Keys" + style="fill-rule:evenodd;stroke-width:0.13585199"> + <g + id="g4892" + inkscape:label="7" + style="stroke-width:0.13585199"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.10074359;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path163" + d="m 638,120 h 20 c 2,0 3,2 3,3 v 18 c 0,2 -1,3 -3,3 h -20 c -1,0 -3,-1 -3,-3 v -18 c 0,-1 2,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="636.4165" + y="129.38269" + id="text331" + style="font-weight:normal;font-size:9.28803921px;font-family:Arial;fill:#2b2828;stroke-width:0.10514989">7</text> + </g> + <g + id="g4907" + inkscape:label="4" + style="stroke-width:0.13585199"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.10074359;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path169" + d="m 638,146 h 20 c 2,0 3,1 3,3 v 18 c 0,2 -1,3 -3,3 h -20 c -1,0 -3,-1 -3,-3 v -18 c 0,-2 2,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="636.4165" + y="154.10822" + id="text335" + style="font-weight:normal;font-size:9.28803921px;font-family:Arial;fill:#2b2828;stroke-width:0.10514989">4</text> + </g> + <g + id="g4922" + inkscape:label="1" + style="stroke-width:0.13585199"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.10074359;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path175" + d="m 638,172 h 20 c 2,0 3,1 3,3 v 17 c 0,1 -1,3 -3,3 h -20 c -1,0 -3,-2 -3,-3 v -17 c 0,-2 2,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="636.4165" + y="179.82285" + id="text339" + style="font-weight:normal;font-size:9.28803921px;font-family:Arial;fill:#2b2828;stroke-width:0.10514989">1</text> + </g> + <g + id="g4897" + inkscape:label="8" + style="stroke-width:0.13585199"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.10074359;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path165" + d="m 668,120 h 19 c 2,0 3,2 3,3 v 18 c 0,2 -1,3 -3,3 h -19 c -1,0 -3,-1 -3,-3 v -18 c 0,-1 2,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="667.07562" + y="129.38269" + id="text347" + style="font-weight:normal;font-size:9.28803921px;font-family:Arial;fill:#2b2828;stroke-width:0.10514989">8</text> + </g> + <g + id="g4912" + inkscape:label="5" + style="stroke-width:0.13585199"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.10074359;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path171" + d="m 668,146 h 19 c 2,0 3,1 3,3 v 18 c 0,2 -1,3 -3,3 h -19 c -1,0 -3,-1 -3,-3 v -18 c 0,-2 2,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="667.07562" + y="154.10822" + id="text351" + style="font-weight:normal;font-size:9.28803921px;font-family:Arial;fill:#2b2828;stroke-width:0.10514989">5</text> + </g> + <g + id="g4927" + inkscape:label="2" + style="stroke-width:0.13585199"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.10074359;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path177" + d="m 668,172 h 19 c 2,0 3,1 3,3 v 17 c 0,1 -1,3 -3,3 h -19 c -1,0 -3,-2 -3,-3 v -17 c 0,-2 2,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="667.07562" + y="179.82285" + id="text355" + style="font-weight:normal;font-size:9.28803921px;font-family:Arial;fill:#2b2828;stroke-width:0.10514989">2</text> + </g> + <g + id="g4902" + inkscape:label="9" + style="stroke-width:0.13585199"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.10074359;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path167" + d="m 697,120 h 20 c 2,0 3,2 3,3 v 18 c 0,2 -1,3 -3,3 h -20 c -1,0 -3,-1 -3,-3 v -18 c 0,-1 2,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="695.75708" + y="129.38269" + id="text363" + style="font-weight:normal;font-size:9.28803921px;font-family:Arial;fill:#2b2828;stroke-width:0.10514989">9</text> + </g> + <g + id="g4917" + inkscape:label="6" + style="stroke-width:0.13585199"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.10074359;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path173" + d="m 697,146 h 20 c 2,0 3,1 3,3 v 18 c 0,2 -1,3 -3,3 h -20 c -1,0 -3,-1 -3,-3 v -18 c 0,-2 2,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="695.75708" + y="154.10822" + id="text367" + style="font-weight:normal;font-size:9.28803921px;font-family:Arial;fill:#2b2828;stroke-width:0.10514989">6</text> + </g> + <g + id="g4932" + inkscape:label="3" + style="stroke-width:0.13585199"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.10074359;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path179" + d="m 697,172 h 20 c 2,0 3,1 3,3 v 17 c 0,1 -1,3 -3,3 h -20 c -1,0 -3,-2 -3,-3 v -17 c 0,-2 2,-3 3,-3 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="695.75708" + y="179.82285" + id="text371" + style="font-weight:normal;font-size:9.28803921px;font-family:Arial;fill:#2b2828;stroke-width:0.10514989">3</text> + </g> + <g + id="g4937" + inkscape:label="0" + style="stroke-width:0.13585199"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.10074359;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path373" + d="m 638,220 c -1,0 -3,-1 -3,-2 v -19 c 0,-1 2,-2 3,-2 h 49 c 2,0 3,1 3,2 v 19 c 0,1 -1,2 -3,2 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="636.4165" + y="205.53712" + id="text377" + style="font-weight:normal;font-size:9.28803921px;font-family:Arial;fill:#2b2828;stroke-width:0.10514989">0</text> + </g> + </g> + <g + transform="translate(-318.22576)" + inkscape:label="Esc" + id="g3113"> + <path + inkscape:connector-curvature="0" + d="m 387.26079,54.792986 h 33.40019 c 3.34,0 5.01006,3.34003 5.01006,5.010045 v 30.060225 c 0,3.340029 -1.67006,5.010032 -5.01006,5.010032 h -33.40019 c -1.67006,0 -5.01007,-1.670003 -5.01007,-5.010032 V 59.803031 c 0,-1.670015 3.34001,-5.010045 5.01007,-5.010045 z" + id="path167-3" + style="opacity:1;vector-effect:none;fill:#4f4c4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.16824313;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <text + transform="scale(1.0007154,0.99928511)" + style="font-weight:normal;font-size:10.63882256px;font-family:Arial;fill:#ffffff;fill-rule:evenodd;stroke-width:0.36866826" + id="text469-4" + y="78.632088" + x="394.42801">Esc</text> + </g> + <g + transform="translate(0,-43.420332)" + inkscape:label="BackSpace" + id="g3109"> + <path + inkscape:connector-curvature="0" + d="m 387.26079,98.213318 h 33.40019 c 3.34,0 5.01006,1.670013 5.01006,5.010032 v 30.06024 c 0,3.34002 -1.67006,5.01003 -5.01006,5.01003 h -33.40019 c -1.67006,0 -5.01007,-1.67001 -5.01007,-5.01003 v -30.06024 c 0,-3.340019 3.34001,-5.010032 5.01007,-5.010032 z" + id="path173-1" + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.16824308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path11623-1-0-2" + transform="matrix(0.47690966,0,0,0.47690966,1008.0304,-380.26227)" + d="m -1278.9668,1041.3047 -6.9199,4 6.9199,4 v -3 h 33.416 v -1.9981 h -33.416 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2b2828;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + </g> + <g + transform="matrix(1.6700128,0,0,1.6700128,-678.20742,-102.18822)" + style="fill-rule:evenodd;stroke-width:0.13585199" + inkscape:label="Sign" + id="g787"> + <path + inkscape:connector-curvature="0" + d="m 638,120 h 20 c 2,0 3,2 3,3 v 18 c 0,2 -1,3 -3,3 h -20 c -1,0 -3,-1 -3,-3 v -18 c 0,-1 2,-3 3,-3 z" + id="path781" + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.10074359;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <text + transform="scale(1.0007154,0.99928514)" + style="font-weight:normal;font-size:9.28803921px;font-family:Arial;fill:#2b2828;stroke-width:0.10514989" + id="text783" + y="135.09822" + x="642.1239">+/-</text> + </g> + <text + inkscape:label="Info" + transform="scale(0.96824589,1.0327955)" + id="text509" + y="12.333653" + x="252.9579" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.31375408px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.30784383px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="stroke-width:0.30784383px" + y="12.333653" + x="252.9579" + id="tspan507" + sodipodi:role="line">information</tspan></text> + <g + inkscape:label="NumDot" + id="g4942" + style="fill-rule:evenodd;stroke-width:0.13585199" + transform="matrix(1.6700128,0,0,1.6700128,-826.83854,-145.60856)"> + <path + style="opacity:1;vector-effect:none;fill:#d3d2d2;fill-opacity:1;stroke:none;stroke-width:0.10074359;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path181" + d="m 697,197 h 20 c 2,0 3,1 3,2 v 19 c 0,1 -1,2 -3,2 h -20 c -1,0 -3,-1 -3,-2 v -19 c 0,-1 2,-2 3,-2 z" + inkscape:connector-curvature="0" /> + <text + transform="scale(1.0007154,0.99928514)" + x="696.7464" + y="204.54802" + id="text771" + style="font-weight:normal;font-size:6.96602964px;font-family:Arial;fill:#2b2828;stroke-width:0.10514989">.</text> + </g> + </g> + <text + id="text1212" + y="269.6839" + x="109.1618" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="269.6839" + x="109.1618" + id="tspan1210" + sodipodi:role="line">Result:</tspan></text> + <g + style="stroke-width:0.37711531" + inkscape:label="HMI:Input@/CSV_ROWSTR" + transform="matrix(0.75813069,0,0,0.75813069,778.48618,317.66828)" + id="g1226"> + <text + inkscape:label="value" + id="text1216" + y="181.75911" + x="216.03668" + style="font-style:normal;font-weight:normal;font-size:93.45226288px;line-height:125%;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#ff8c00;fill-opacity:1;stroke:none;stroke-width:0.37711531px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="font-size:49.243927px;text-align:end;text-anchor:end;fill:#ff8c00;stroke-width:0.37711531px" + y="181.75911" + x="216.03667" + id="tspan1214" + sodipodi:role="line">Ingredient A</tspan></text> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.88557661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect1220" + width="333.56146" + height="128" + x="-100.79848" + y="95.40741" + onclick="" + inkscape:label="edit" /> + </g> + <g + style="stroke-width:0.37711531" + inkscape:label="HMI:Input@/CSV_COLSTR" + transform="matrix(0.75813069,0,0,0.75813069,1034.6282,317.66828)" + id="g1240"> + <text + inkscape:label="value" + id="text1230" + y="186.09921" + x="216.32812" + style="font-style:normal;font-weight:normal;font-size:160px;line-height:125%;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#ff8c00;fill-opacity:1;stroke:none;stroke-width:0.37711531px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="font-size:49.243927px;text-align:end;text-anchor:end;fill:#ff8c00;stroke-width:0.37711531px" + y="186.09921" + x="216.32812" + id="tspan1228" + sodipodi:role="line">Recipe 1</tspan></text> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.88557661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect1234" + width="311.42853" + height="128" + x="-78.665535" + y="95.40741" + onclick="" + inkscape:label="edit" /> + </g> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="809.58868" + y="395.44662" + id="text1258"><tspan + sodipodi:role="line" + id="tspan1256" + x="809.58868" + y="395.44662">Row name</tspan></text> + <text + id="text1262" + y="395.44662" + x="1111.5886" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="395.44662" + x="1111.5886" + id="tspan1260" + sodipodi:role="line">Column name</tspan></text> + <g + id="g1270" + transform="matrix(0.75813069,0,0,0.75813069,298.48618,317.66828)" + inkscape:label="HMI:Input@/CSV_NAME_1" + style="stroke-width:0.37711531"> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:62.1669426px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ff8c00;fill-opacity:1;stroke:none;stroke-width:0.37711531px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="-257.78806" + y="192.18758" + id="text1266" + inkscape:label="value"><tspan + sodipodi:role="line" + id="tspan1264" + x="-257.78806" + y="192.18758" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:62.1669426px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ff8c00;stroke-width:0.37711531px">file.csv</tspan></text> + <rect + inkscape:label="edit" + onclick="" + y="95.40741" + x="-359.35144" + height="128" + width="855.69763" + id="rect1268" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.88557661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + </g> + <text + id="text1274" + y="395.44662" + x="196.74792" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="395.44662" + x="196.74792" + id="tspan1272" + sodipodi:role="line">File name</tspan></text> + <rect + y="506.61017" + x="184.57626" + height="88.474594" + width="918.30505" + id="rect2087" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.2822581;fill-rule:nonzero;stroke:#212121;stroke-width:3.77999997;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + inkscape:label="HMI:Display@/CSV_RES_1" + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:70.26290131px;line-height:125%;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#ff8c00;fill-opacity:1;stroke:none;stroke-width:0.28590271px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="1071.9137" + y="573.58813" + id="text2091"><tspan + sodipodi:role="line" + id="tspan2089" + x="1071.9137" + y="573.58813" + style="font-size:64px;text-align:end;text-anchor:end;fill:#ff8c00;stroke-width:0.28590271px">8</tspan></text> + <g + inkscape:label="HMI:Switch@/CSV_ACK_1" + id="g2101" + transform="matrix(9.928748,0,0,9.9287551,31.704016,-239.30786)" + style="stroke-width:0.38066494"> + <text + id="text2095" + y="83.254463" + x="112.6369" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.1007176px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve" + inkscape:label="true"><tspan + style="fill:#008000;stroke-width:0.1007176px" + y="83.254463" + x="112.6369" + id="tspan2093" + sodipodi:role="line">✔</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.1007176px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="112.6369" + y="83.254463" + id="text2099" + inkscape:label="false"><tspan + sodipodi:role="line" + id="tspan2097" + x="112.6369" + y="83.254463" + style="fill:#ff0000;stroke-width:0.1007176px">✕</tspan></text> + </g> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="109.1618" + y="555.6839" + id="text2105" + inkscape:label="text2105"><tspan + sodipodi:role="line" + id="tspan2103" + x="109.1618" + y="555.6839">Result:</tspan></text> + <g + style="stroke-width:1.42987263" + inkscape:label="HMI:Button@/CSV_RELOAD_BTN" + id="g3512" + transform="translate(338.88972,295.52394)"> + <g + id="g3500" + inkscape:label="active" + transform="matrix(1,0,0,0.75444798,0,-12.446902)" + style="stroke-width:1.64620042"> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#radialGradient3514);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:6.90774965;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect3496" + width="320.99121" + height="125.00497" + x="518.36066" + y="618.00537" + ry="28.3067" + rx="21.355932" /> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.15129161;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.45387496, 3.45387496;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect3498" + width="320.99121" + height="125.00497" + x="518.36066" + y="618.00537" + inkscape:label="frame" /> + </g> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffa32a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.77952743;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect3502" + width="320.99121" + height="94.309746" + x="518.36066" + y="318.00534" + ry="21.355932" + rx="21.355932" + inkscape:label="inactive" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="677.57697" + y="379.98633" + id="text3508"><tspan + sodipodi:role="line" + x="677.57697" + y="379.98633" + id="tspan3506">Reload CSVs</tspan></text> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.00000004, 3.00000004;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect3510" + width="320.99121" + height="94.309746" + x="518.36066" + y="318.00534" + inkscape:label="reference" /> + </g> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="62.560974" + y="676.85449" + id="text292"><tspan + sodipodi:role="line" + id="tspan290" + x="62.560974" + y="712.24512"></tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="443.43649" + y="673.12445" + id="text898"><tspan + sodipodi:role="line" + id="tspan896" + x="443.43649" + y="673.12445" + style="font-size:32px">Upload csv at http://localhost:8009/settings/</tspan></text> +</svg>
--- a/exemples/svghmi_jumps/svghmi_0@svghmi/svghmi.svg Mon Feb 27 13:47:36 2023 +0100 +++ b/exemples/svghmi_jumps/svghmi_0@svghmi/svghmi.svg Tue Feb 28 09:39:51 2023 +0100 @@ -25,7 +25,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -40,17 +40,17 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1600" - inkscape:window-height="836" + inkscape:window-width="1850" + inkscape:window-height="1036" id="namedview4" showgrid="false" - inkscape:zoom="0.23177389" - inkscape:cx="1999.5317" - inkscape:cy="-682.74047" + inkscape:zoom="0.46354778" + inkscape:cx="-544.27948" + inkscape:cy="655.56978" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" - inkscape:current-layer="hmi0" + inkscape:current-layer="g2496" showguides="true" inkscape:guide-bbox="true" borderlayer="true" @@ -67,7 +67,7 @@ transform="translate(1320,1520)" width="100%" height="100%" - inkscape:label="HMI:Page:RelativePage@/FB_ZERO" /> + inkscape:label="HMI:Page:RelativePage:p=6@p=page_number@/FB_ZERO" /> <use sodipodi:insensitive="true" x="0" @@ -77,7 +77,7 @@ transform="translate(2640,759.99998)" width="100%" height="100%" - inkscape:label="HMI:Page:Relative" /> + inkscape:label="HMI:Page:Relative:p=5@p=page_number" /> <use x="0" y="0" @@ -86,10 +86,10 @@ transform="translate(3940,-2.1367187e-5)" width="100%" height="100%" - inkscape:label="HMI:Page:Conditional" + inkscape:label="HMI:Page:Conditional:p=4@p=page_number" sodipodi:insensitive="true" /> <use - inkscape:label="HMI:Page:Unconditional" + inkscape:label="HMI:Page:Unconditional:p=3@p=page_number" height="100%" width="100%" transform="translate(2640,-2.1367187e-5)" @@ -99,7 +99,7 @@ x="0" sodipodi:insensitive="true" /> <use - inkscape:label="HMI:Page:AbsolutePage" + inkscape:label="HMI:Page:AbsolutePage:p=2@p=page_number" height="100%" width="100%" transform="translate(1320,759.99998)" @@ -116,7 +116,7 @@ transform="translate(1320,-2.1367187e-5)" width="100%" height="100%" - inkscape:label="HMI:Page:Home" + inkscape:label="HMI:Page:Home:p=1@p=page_number" sodipodi:insensitive="true" /> <text id="text837" @@ -621,6 +621,18 @@ id="tspan1849" x="-1166.3386" y="598.98303">HMI:Jump:RelativePage</tspan></text> + <text + inkscape:label="HMI:Display@page_number" + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.03883362px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="-75.162941" + y="702.24023" + id="text296"><tspan + sodipodi:role="line" + id="tspan294" + x="-75.162941" + y="702.24023" + style="stroke-width:1px">0</tspan></text> </g> <g id="g2585" @@ -1200,7 +1212,7 @@ <g id="g1711" inkscape:label="MYNODE:+1" - transform="matrix(1.3729714,0,0,1.3729714,-299.47126,-800.64485)" + transform="matrix(1.3729714,0,0,1.3729714,-359.47134,-800.64485)" style="stroke-width:0.7283473"> <rect rx="15.554536" @@ -1226,7 +1238,7 @@ <g inkscape:label="MYNODE:3" id="g1837" - transform="translate(665.54481,-11.353461)"> + transform="translate(620.54487,-11.353461)"> <g transform="translate(1466.6549,2099.2529)" inkscape:label="HMI:Jump:RelativePage@/FB_TWO@enable=/FB_TWO/SOME_BOOL#enable" @@ -1286,7 +1298,7 @@ </g> </g> <g - transform="translate(342.39289,-11.353461)" + transform="translate(312.39295,-11.353461)" id="g1823" inkscape:label="MYNODE:2"> <g @@ -1350,7 +1362,7 @@ <g inkscape:label="MYNODE:1" id="g1717" - transform="translate(19.240974,-11.353461)"> + transform="translate(4.2410198,-11.353461)"> <g transform="translate(1466.6549,2099.2529)" inkscape:label="HMI:Jump:RelativePage@/FB_ZERO@enable=/FB_ZERO/SOME_BOOL#enable" @@ -1815,4 +1827,23 @@ x="44.283585" y="-39.185921" id="tspan2966">- Press Ctrl+X to edit SVG elements directly with XML editor</tspan></text> + <g + transform="translate(-4020,2.1367187e-5)" + inkscape:label="HMI:VarInit:0@page_number" + id="g304"> + <text + id="text302" + y="-108.39357" + x="3726.6924" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="-108.39357" + x="3726.6924" + id="tspan298" + sodipodi:role="line">declaration of user_level HMI local variable</tspan><tspan + id="tspan300" + y="-85.060234" + x="3726.6924" + sodipodi:role="line">(not a PLC variable)</tspan></text> + </g> </svg>
--- a/py_ext/pous.xml Mon Feb 27 13:47:36 2023 +0100 +++ b/py_ext/pous.xml Tue Feb 28 09:39:51 2023 +0100 @@ -1,10 +1,10 @@ <?xml version='1.0' encoding='utf-8'?> <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.plcopen.org/xml/tc6_0201" xmlns:xhtml="http://www.w3.org/1999/xhtml" xsi:schemaLocation="http://www.plcopen.org/xml/tc6_0201"> <fileHeader companyName="Beremiz" productName="Beremiz" productVersion="0.0" creationDateTime="2008-12-14T16:53:26"/> - <contentHeader name="Beremiz non-standard POUs library" modificationDateTime="2014-03-17T08:07:24"> + <contentHeader name="Beremiz non-standard POUs library" modificationDateTime="2022-12-16T11:59:30"> <coordinateInfo> <fbd> - <scaling x="0" y="0"/> + <scaling x="8" y="8"/> </fbd> <ld> <scaling x="0" y="0"/> @@ -17,6 +17,1646 @@ <types> <dataTypes/> <pous> + <pou name="csv_read_by_string" pouType="functionBlock"> + <interface> + <externalVars> + <variable name="pyext_csv_update"> + <type> + <BOOL/> + </type> + </variable> + </externalVars> + <outputVars> + <variable name="ACK"> + <type> + <BOOL/> + </type> + </variable> + <variable name="RESULT"> + <type> + <string/> + </type> + </variable> + </outputVars> + <inputVars> + <variable name="FILE_NAME"> + <type> + <string/> + </type> + </variable> + <variable name="ROW"> + <type> + <string/> + </type> + </variable> + <variable name="COLUMN"> + <type> + <string/> + </type> + </variable> + </inputVars> + <localVars> + <variable name="OLDCODE"> + <type> + <string/> + </type> + </variable> + <variable name="py_eval"> + <type> + <derived name="python_eval"/> + </type> + </variable> + <variable name="R_TRIG0"> + <type> + <derived name="R_TRIG"/> + </type> + </variable> + <variable name="R_TRIG1"> + <type> + <derived name="R_TRIG"/> + </type> + </variable> + <variable name="SR0"> + <type> + <derived name="SR"/> + </type> + </variable> + </localVars> + </interface> + <body> + <FBD> + <block localId="7" typeName="CONCAT" executionOrderId="0" height="192" width="64"> + <position x="360" y="112"/> + <inputVariables> + <variable formalParameter="IN1"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="8"> + <position x="360" y="144"/> + <position x="320" y="144"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN2"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="9"> + <position x="360" y="168"/> + <position x="152" y="168"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN3"> + <connectionPointIn> + <relPosition x="0" y="80"/> + <connection refLocalId="10"> + <position x="360" y="192"/> + <position x="320" y="192"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN4"> + <connectionPointIn> + <relPosition x="0" y="104"/> + <connection refLocalId="11"> + <position x="360" y="216"/> + <position x="152" y="216"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN5"> + <connectionPointIn> + <relPosition x="0" y="128"/> + <connection refLocalId="12"> + <position x="360" y="240"/> + <position x="320" y="240"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN6"> + <connectionPointIn> + <relPosition x="0" y="152"/> + <connection refLocalId="13"> + <position x="360" y="264"/> + <position x="152" y="264"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN7"> + <connectionPointIn> + <relPosition x="0" y="176"/> + <connection refLocalId="14"> + <position x="360" y="288"/> + <position x="320" y="288"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <inVariable localId="8" executionOrderId="0" height="24" width="160" negated="false"> + <position x="160" y="128"/> + <connectionPointOut> + <relPosition x="160" y="16"/> + </connectionPointOut> + <expression>'CSVRdStr("'</expression> + </inVariable> + <inVariable localId="9" executionOrderId="0" height="32" width="112" negated="false"> + <position x="40" y="152"/> + <connectionPointOut> + <relPosition x="112" y="16"/> + </connectionPointOut> + <expression>FILE_NAME</expression> + </inVariable> + <inVariable localId="10" executionOrderId="0" height="24" width="112" negated="false"> + <position x="208" y="184"/> + <connectionPointOut> + <relPosition x="112" y="8"/> + </connectionPointOut> + <expression>'","'</expression> + </inVariable> + <inVariable localId="11" executionOrderId="0" height="32" width="112" negated="false"> + <position x="40" y="200"/> + <connectionPointOut> + <relPosition x="112" y="16"/> + </connectionPointOut> + <expression>ROW</expression> + </inVariable> + <inVariable localId="12" executionOrderId="0" height="24" width="112" negated="false"> + <position x="208" y="224"/> + <connectionPointOut> + <relPosition x="112" y="16"/> + </connectionPointOut> + <expression>'","'</expression> + </inVariable> + <inVariable localId="13" executionOrderId="0" height="32" width="112" negated="false"> + <position x="40" y="248"/> + <connectionPointOut> + <relPosition x="112" y="16"/> + </connectionPointOut> + <expression>COLUMN</expression> + </inVariable> + <inVariable localId="14" executionOrderId="0" height="24" width="112" negated="false"> + <position x="208" y="272"/> + <connectionPointOut> + <relPosition x="112" y="16"/> + </connectionPointOut> + <expression>'")'</expression> + </inVariable> + <block localId="16" typeName="NE" executionOrderId="0" height="64" width="64"> + <position x="208" y="408"/> + <inputVariables> + <variable formalParameter="IN1"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="22"> + <position x="208" y="440"/> + <position x="168" y="440"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN2"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="21"> + <position x="208" y="464"/> + <position x="168" y="464"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="18" typeName="SEL" executionOrderId="0" height="96" width="64"> + <position x="680" y="376"/> + <inputVariables> + <variable formalParameter="G"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="25"> + <position x="680" y="408"/> + <position x="624" y="408"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN0"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="20"> + <position x="680" y="432"/> + <position x="632" y="432"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN1"> + <connectionPointIn> + <relPosition x="0" y="80"/> + <connection refLocalId="4"> + <position x="680" y="456"/> + <position x="632" y="456"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <connector name="Code" localId="19" height="24" width="128"> + <position x="480" y="136"/> + <connectionPointIn> + <relPosition x="0" y="8"/> + <connection refLocalId="7" formalParameter="OUT"> + <position x="480" y="144"/> + <position x="424" y="144"/> + </connection> + </connectionPointIn> + </connector> + <outVariable localId="17" executionOrderId="0" height="32" width="66" negated="false"> + <position x="784" y="392"/> + <connectionPointIn> + <relPosition x="0" y="16"/> + <connection refLocalId="18" formalParameter="OUT"> + <position x="784" y="408"/> + <position x="744" y="408"/> + </connection> + </connectionPointIn> + <expression>OLDCODE</expression> + </outVariable> + <inVariable localId="20" executionOrderId="0" height="32" width="72" negated="false"> + <position x="560" y="416"/> + <connectionPointOut> + <relPosition x="72" y="16"/> + </connectionPointOut> + <expression>OLDCODE</expression> + </inVariable> + <inVariable localId="21" executionOrderId="0" height="32" width="72" negated="false"> + <position x="96" y="448"/> + <connectionPointOut> + <relPosition x="72" y="16"/> + </connectionPointOut> + <expression>OLDCODE</expression> + </inVariable> + <continuation name="Code" localId="4" height="24" width="128"> + <position x="504" y="448"/> + <connectionPointOut> + <relPosition x="128" y="8"/> + </connectionPointOut> + </continuation> + <continuation name="Code" localId="22" height="24" width="128"> + <position x="40" y="424"/> + <connectionPointOut> + <relPosition x="128" y="16"/> + </connectionPointOut> + </continuation> + <connector name="CodeChange" localId="23" height="24" width="120"> + <position x="328" y="432"/> + <connectionPointIn> + <relPosition x="0" y="8"/> + <connection refLocalId="16" formalParameter="OUT"> + <position x="328" y="440"/> + <position x="272" y="440"/> + </connection> + </connectionPointIn> + </connector> + <continuation name="CodeChange" localId="25" height="24" width="120"> + <position x="504" y="392"/> + <connectionPointOut> + <relPosition x="120" y="16"/> + </connectionPointOut> + </continuation> + <comment localId="26" height="40" width="232"> + <position x="48" y="40"/> + <content> + <xhtml:p><![CDATA[Generate python code line]]></xhtml:p> + </content> + </comment> + <comment localId="27" height="48" width="312"> + <position x="40" y="328"/> + <content> + <xhtml:p><![CDATA[Detect changes in generated code line]]></xhtml:p> + </content> + </comment> + <comment localId="28" height="48" width="520"> + <position x="48" y="512"/> + <content> + <xhtml:p><![CDATA[Execute python code on change or globally when CSV is updated]]></xhtml:p> + </content> + </comment> + <block localId="1" width="104" height="80" typeName="python_eval" instanceName="py_eval" executionOrderId="0"> + <position x="552" y="600"/> + <inputVariables> + <variable formalParameter="TRIG"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="15" formalParameter="OUT"> + <position x="552" y="632"/> + <position x="360" y="632"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="CODE"> + <connectionPointIn> + <relPosition x="0" y="64"/> + <connection refLocalId="2"> + <position x="552" y="664"/> + <position x="528" y="664"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="ACK"> + <connectionPointOut> + <relPosition x="104" y="32"/> + </connectionPointOut> + </variable> + <variable formalParameter="RESULT"> + <connectionPointOut> + <relPosition x="104" y="64"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <inVariable localId="3" height="24" width="152" executionOrderId="0" negated="false"> + <position x="32" y="616"/> + <connectionPointOut> + <relPosition x="152" y="16"/> + </connectionPointOut> + <expression>pyext_csv_update</expression> + </inVariable> + <outVariable localId="5" height="24" width="40" executionOrderId="0" negated="false"> + <position x="1216" y="632"/> + <connectionPointIn> + <relPosition x="0" y="8"/> + <connection refLocalId="38" formalParameter="Q1"> + <position x="1216" y="640"/> + <position x="1168" y="640"/> + </connection> + </connectionPointIn> + <expression>ACK</expression> + </outVariable> + <outVariable localId="6" height="24" width="64" executionOrderId="0" negated="false"> + <position x="688" y="704"/> + <connectionPointIn> + <relPosition x="0" y="8"/> + <connection refLocalId="1" formalParameter="RESULT"> + <position x="688" y="712"/> + <position x="672" y="712"/> + <position x="672" y="664"/> + <position x="656" y="664"/> + </connection> + </connectionPointIn> + <expression>RESULT</expression> + </outVariable> + <continuation name="Code" localId="2" height="24" width="128"> + <position x="400" y="648"/> + <connectionPointOut> + <relPosition x="128" y="16"/> + </connectionPointOut> + </continuation> + <continuation name="CodeChange" localId="24" height="24" width="120"> + <position x="64" y="648"/> + <connectionPointOut> + <relPosition x="120" y="16"/> + </connectionPointOut> + </continuation> + <block localId="15" typeName="OR" executionOrderId="0" height="64" width="64"> + <position x="296" y="600"/> + <inputVariables> + <variable formalParameter="IN1"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="32" formalParameter="Q"> + <position x="296" y="632"/> + <position x="272" y="632"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN2"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="24"> + <position x="296" y="656"/> + <position x="184" y="656"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="32" typeName="R_TRIG" instanceName="R_TRIG0" executionOrderId="0" height="48" width="64"> + <position x="208" y="600"/> + <inputVariables> + <variable formalParameter="CLK"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="3"> + <position x="208" y="632"/> + <position x="184" y="632"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="Q"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="33" typeName="LEFT" executionOrderId="0" height="64" width="56"> + <position x="736" y="632"/> + <inputVariables> + <variable formalParameter="IN"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="1" formalParameter="RESULT"> + <position x="736" y="664"/> + <position x="656" y="664"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="L"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="35"> + <position x="736" y="688"/> + <position x="712" y="688"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="56" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="34" typeName="NE" executionOrderId="0" height="64" width="64"> + <position x="880" y="632"/> + <inputVariables> + <variable formalParameter="IN1"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="33" formalParameter="OUT"> + <position x="880" y="664"/> + <position x="792" y="664"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN2"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="36"> + <position x="880" y="688"/> + <position x="856" y="688"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <inVariable localId="35" executionOrderId="0" height="24" width="24" negated="false"> + <position x="688" y="672"/> + <connectionPointOut> + <relPosition x="24" y="16"/> + </connectionPointOut> + <expression>1</expression> + </inVariable> + <inVariable localId="36" executionOrderId="0" height="24" width="40" negated="false"> + <position x="816" y="672"/> + <connectionPointOut> + <relPosition x="40" y="16"/> + </connectionPointOut> + <expression>'#'</expression> + </inVariable> + <block localId="37" typeName="R_TRIG" instanceName="R_TRIG1" executionOrderId="0" height="48" width="64"> + <position x="880" y="576"/> + <inputVariables> + <variable formalParameter="CLK"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="1" formalParameter="ACK"> + <position x="880" y="608"/> + <position x="688" y="608"/> + <position x="688" y="632"/> + <position x="656" y="632"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="Q"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="38" typeName="SR" instanceName="SR0" executionOrderId="0" height="64" width="48"> + <position x="1120" y="608"/> + <inputVariables> + <variable formalParameter="S1"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="39" formalParameter="OUT"> + <position x="1120" y="640"/> + <position x="1056" y="640"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="R" edge="rising"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="15" formalParameter="OUT"> + <position x="1120" y="664"/> + <position x="1088" y="664"/> + <position x="1088" y="736"/> + <position x="376" y="736"/> + <position x="376" y="632"/> + <position x="360" y="632"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="Q1"> + <connectionPointOut> + <relPosition x="48" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="39" typeName="AND" executionOrderId="0" height="64" width="64"> + <position x="992" y="608"/> + <inputVariables> + <variable formalParameter="IN1"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="37" formalParameter="Q"> + <position x="992" y="640"/> + <position x="976" y="640"/> + <position x="976" y="608"/> + <position x="944" y="608"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN2"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="34" formalParameter="OUT"> + <position x="992" y="664"/> + <position x="944" y="664"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + </FBD> + </body> + </pou> + <pou name="csv_reload" pouType="functionBlock"> + <interface> + <externalVars> + <variable name="pyext_csv_update"> + <type> + <BOOL/> + </type> + </variable> + </externalVars> + <outputVars> + <variable name="ACK"> + <type> + <BOOL/> + </type> + </variable> + <variable name="RESULT"> + <type> + <string/> + </type> + </variable> + </outputVars> + <localVars> + <variable name="py_eval"> + <type> + <derived name="python_eval"/> + </type> + </variable> + </localVars> + <inputVars> + <variable name="TRIG"> + <type> + <BOOL/> + </type> + </variable> + </inputVars> + <localVars> + <variable name="R_TRIG0"> + <type> + <derived name="R_TRIG"/> + </type> + </variable> + <variable name="F_TRIG0"> + <type> + <derived name="F_TRIG"/> + </type> + </variable> + </localVars> + </interface> + <body> + <FBD> + <block localId="1" width="104" height="80" typeName="python_eval" instanceName="py_eval" executionOrderId="0"> + <position x="232" y="328"/> + <inputVariables> + <variable formalParameter="TRIG"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="3"> + <position x="232" y="360"/> + <position x="200" y="360"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="CODE"> + <connectionPointIn> + <relPosition x="0" y="64"/> + <connection refLocalId="8"> + <position x="232" y="392"/> + <position x="200" y="392"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="ACK"> + <connectionPointOut> + <relPosition x="104" y="32"/> + </connectionPointOut> + </variable> + <variable formalParameter="RESULT"> + <connectionPointOut> + <relPosition x="104" y="64"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <inVariable localId="3" height="24" width="152" executionOrderId="0" negated="false"> + <position x="48" y="352"/> + <connectionPointOut> + <relPosition x="152" y="8"/> + </connectionPointOut> + <expression>TRIG</expression> + </inVariable> + <outVariable localId="5" height="24" width="40" executionOrderId="0" negated="false"> + <position x="384" y="344"/> + <connectionPointIn> + <relPosition x="0" y="16"/> + <connection refLocalId="1" formalParameter="ACK"> + <position x="384" y="360"/> + <position x="336" y="360"/> + </connection> + </connectionPointIn> + <expression>ACK</expression> + </outVariable> + <outVariable localId="6" height="24" width="64" executionOrderId="0" negated="false"> + <position x="384" y="376"/> + <connectionPointIn> + <relPosition x="0" y="16"/> + <connection refLocalId="1" formalParameter="RESULT"> + <position x="384" y="392"/> + <position x="336" y="392"/> + </connection> + </connectionPointIn> + <expression>RESULT</expression> + </outVariable> + <inVariable localId="8" executionOrderId="0" height="24" width="176" negated="false"> + <position x="24" y="384"/> + <connectionPointOut> + <relPosition x="176" y="16"/> + </connectionPointOut> + <expression>'pyext_csv_reload()'</expression> + </inVariable> + <outVariable localId="2" executionOrderId="0" height="24" width="146" negated="false"> + <position x="864" y="320"/> + <connectionPointIn> + <relPosition x="0" y="8"/> + <connection refLocalId="12" formalParameter="OUT"> + <position x="864" y="328"/> + <position x="816" y="328"/> + </connection> + </connectionPointIn> + <expression>pyext_csv_update</expression> + </outVariable> + <block localId="9" typeName="R_TRIG" instanceName="R_TRIG0" executionOrderId="0" height="48" width="64"> + <position x="472" y="224"/> + <inputVariables> + <variable formalParameter="CLK"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="1" formalParameter="ACK"> + <position x="472" y="256"/> + <position x="368" y="256"/> + <position x="368" y="360"/> + <position x="336" y="360"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="Q"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="10" typeName="F_TRIG" instanceName="F_TRIG0" executionOrderId="0" height="48" width="64"> + <position x="472" y="296"/> + <inputVariables> + <variable formalParameter="CLK"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="1" formalParameter="ACK"> + <position x="472" y="328"/> + <position x="368" y="328"/> + <position x="368" y="360"/> + <position x="336" y="360"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="Q"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="11" typeName="OR" executionOrderId="0" height="64" width="64"> + <position x="584" y="272"/> + <inputVariables> + <variable formalParameter="IN1"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="9" formalParameter="Q"> + <position x="584" y="304"/> + <position x="560" y="304"/> + <position x="560" y="256"/> + <position x="536" y="256"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN2"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="10" formalParameter="Q"> + <position x="584" y="328"/> + <position x="536" y="328"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="12" typeName="MOVE" executionOrderId="0" height="64" width="56"> + <position x="760" y="272"/> + <inputVariables> + <variable formalParameter="EN"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="11" formalParameter="OUT"> + <position x="760" y="304"/> + <position x="648" y="304"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="13" formalParameter="OUT"> + <position x="760" y="328"/> + <position x="724" y="328"/> + <position x="724" y="256"/> + <position x="712" y="256"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="ENO"> + <connectionPointOut> + <relPosition x="56" y="32"/> + </connectionPointOut> + </variable> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="56" y="56"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="13" typeName="NOT" executionOrderId="0" height="48" width="56"> + <position x="656" y="224"/> + <inputVariables> + <variable formalParameter="IN"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="9" formalParameter="Q"> + <position x="656" y="256"/> + <position x="536" y="256"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="56" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <comment localId="14" height="72" width="664"> + <position x="368" y="136"/> + <content> + <xhtml:p><![CDATA[pyext_csv_update initial value is True so that all CSV blocks get at least updated once at start. +When calling csv_reload, return from python pyext_csv_reload makes a pulse on pyext_csv_update]]></xhtml:p> + </content> + </comment> + </FBD> + </body> + </pou> + <pou name="csv_read_by_int" pouType="functionBlock"> + <interface> + <externalVars> + <variable name="pyext_csv_update"> + <type> + <BOOL/> + </type> + </variable> + </externalVars> + <outputVars> + <variable name="ACK"> + <type> + <BOOL/> + </type> + </variable> + <variable name="RESULT"> + <type> + <string/> + </type> + </variable> + </outputVars> + <inputVars> + <variable name="FILE_NAME"> + <type> + <string/> + </type> + </variable> + <variable name="ROW"> + <type> + <INT/> + </type> + </variable> + <variable name="COLUMN"> + <type> + <INT/> + </type> + </variable> + </inputVars> + <localVars> + <variable name="OLDCODE"> + <type> + <string/> + </type> + </variable> + <variable name="py_eval0"> + <type> + <derived name="python_eval"/> + </type> + </variable> + <variable name="R_TRIG1"> + <type> + <derived name="R_TRIG"/> + </type> + </variable> + <variable name="R_TRIG2"> + <type> + <derived name="R_TRIG"/> + </type> + </variable> + <variable name="SR0"> + <type> + <derived name="SR"/> + </type> + </variable> + </localVars> + </interface> + <body> + <FBD> + <block localId="7" typeName="CONCAT" executionOrderId="0" height="192" width="64"> + <position x="520" y="112"/> + <inputVariables> + <variable formalParameter="IN1"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="8"> + <position x="520" y="144"/> + <position x="480" y="144"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN2"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="9"> + <position x="520" y="168"/> + <position x="312" y="168"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN3"> + <connectionPointIn> + <relPosition x="0" y="80"/> + <connection refLocalId="10"> + <position x="520" y="192"/> + <position x="480" y="192"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN4"> + <connectionPointIn> + <relPosition x="0" y="104"/> + <connection refLocalId="31" formalParameter="OUT"> + <position x="520" y="216"/> + <position x="320" y="216"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN5"> + <connectionPointIn> + <relPosition x="0" y="128"/> + <connection refLocalId="12"> + <position x="520" y="240"/> + <position x="480" y="240"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN6"> + <connectionPointIn> + <relPosition x="0" y="152"/> + <connection refLocalId="2" formalParameter="OUT"> + <position x="520" y="264"/> + <position x="320" y="264"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN7"> + <connectionPointIn> + <relPosition x="0" y="176"/> + <connection refLocalId="14"> + <position x="520" y="288"/> + <position x="480" y="288"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <inVariable localId="8" executionOrderId="0" height="24" width="160" negated="false"> + <position x="320" y="128"/> + <connectionPointOut> + <relPosition x="160" y="16"/> + </connectionPointOut> + <expression>'CSVRdInt("'</expression> + </inVariable> + <inVariable localId="9" executionOrderId="0" height="32" width="112" negated="false"> + <position x="200" y="152"/> + <connectionPointOut> + <relPosition x="112" y="16"/> + </connectionPointOut> + <expression>FILE_NAME</expression> + </inVariable> + <inVariable localId="10" executionOrderId="0" height="24" width="112" negated="false"> + <position x="368" y="184"/> + <connectionPointOut> + <relPosition x="112" y="8"/> + </connectionPointOut> + <expression>'",'</expression> + </inVariable> + <inVariable localId="11" executionOrderId="0" height="32" width="112" negated="false"> + <position x="40" y="200"/> + <connectionPointOut> + <relPosition x="112" y="16"/> + </connectionPointOut> + <expression>ROW</expression> + </inVariable> + <inVariable localId="12" executionOrderId="0" height="24" width="112" negated="false"> + <position x="368" y="224"/> + <connectionPointOut> + <relPosition x="112" y="16"/> + </connectionPointOut> + <expression>','</expression> + </inVariable> + <inVariable localId="13" executionOrderId="0" height="32" width="112" negated="false"> + <position x="40" y="248"/> + <connectionPointOut> + <relPosition x="112" y="16"/> + </connectionPointOut> + <expression>COLUMN</expression> + </inVariable> + <inVariable localId="14" executionOrderId="0" height="24" width="112" negated="false"> + <position x="368" y="272"/> + <connectionPointOut> + <relPosition x="112" y="16"/> + </connectionPointOut> + <expression>')'</expression> + </inVariable> + <continuation name="Code" localId="4" height="24" width="128"> + <position x="504" y="496"/> + <connectionPointOut> + <relPosition x="128" y="16"/> + </connectionPointOut> + </continuation> + <block localId="16" typeName="NE" executionOrderId="0" height="64" width="64"> + <position x="208" y="456"/> + <inputVariables> + <variable formalParameter="IN1"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="22"> + <position x="208" y="488"/> + <position x="188" y="488"/> + <position x="188" y="480"/> + <position x="168" y="480"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN2"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="21"> + <position x="208" y="512"/> + <position x="168" y="512"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <outVariable localId="17" executionOrderId="0" height="32" width="66" negated="false"> + <position x="784" y="440"/> + <connectionPointIn> + <relPosition x="0" y="16"/> + <connection refLocalId="18" formalParameter="OUT"> + <position x="784" y="456"/> + <position x="744" y="456"/> + </connection> + </connectionPointIn> + <expression>OLDCODE</expression> + </outVariable> + <block localId="18" typeName="SEL" executionOrderId="0" height="96" width="64"> + <position x="680" y="424"/> + <inputVariables> + <variable formalParameter="G"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="25"> + <position x="680" y="456"/> + <position x="652" y="456"/> + <position x="652" y="448"/> + <position x="624" y="448"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN0"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="20"> + <position x="680" y="480"/> + <position x="632" y="480"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN1"> + <connectionPointIn> + <relPosition x="0" y="80"/> + <connection refLocalId="4"> + <position x="680" y="504"/> + <position x="656" y="504"/> + <position x="656" y="512"/> + <position x="632" y="512"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <inVariable localId="20" executionOrderId="0" height="32" width="72" negated="false"> + <position x="560" y="464"/> + <connectionPointOut> + <relPosition x="72" y="16"/> + </connectionPointOut> + <expression>OLDCODE</expression> + </inVariable> + <inVariable localId="21" executionOrderId="0" height="32" width="72" negated="false"> + <position x="96" y="496"/> + <connectionPointOut> + <relPosition x="72" y="16"/> + </connectionPointOut> + <expression>OLDCODE</expression> + </inVariable> + <continuation name="Code" localId="22" height="24" width="128"> + <position x="40" y="472"/> + <connectionPointOut> + <relPosition x="128" y="8"/> + </connectionPointOut> + </continuation> + <connector name="CodeChange" localId="23" height="24" width="120"> + <position x="328" y="480"/> + <connectionPointIn> + <relPosition x="0" y="16"/> + <connection refLocalId="16" formalParameter="OUT"> + <position x="328" y="496"/> + <position x="300" y="496"/> + <position x="300" y="488"/> + <position x="272" y="488"/> + </connection> + </connectionPointIn> + </connector> + <continuation name="CodeChange" localId="25" height="24" width="120"> + <position x="504" y="440"/> + <connectionPointOut> + <relPosition x="120" y="8"/> + </connectionPointOut> + </continuation> + <comment localId="27" height="48" width="312"> + <position x="40" y="376"/> + <content> + <xhtml:p><![CDATA[Detect changes in generated code line]]></xhtml:p> + </content> + </comment> + <comment localId="28" height="48" width="520"> + <position x="48" y="560"/> + <content> + <xhtml:p><![CDATA[Execute python code on change or globally when CSV is updated]]></xhtml:p> + </content> + </comment> + <comment localId="29" height="40" width="232"> + <position x="64" y="32"/> + <content> + <xhtml:p><![CDATA[Generate python code line]]></xhtml:p> + </content> + </comment> + <connector name="Code" localId="30" height="24" width="128"> + <position x="632" y="128"/> + <connectionPointIn> + <relPosition x="0" y="16"/> + <connection refLocalId="7" formalParameter="OUT"> + <position x="632" y="144"/> + <position x="584" y="144"/> + </connection> + </connectionPointIn> + </connector> + <block localId="31" typeName="INT_TO_STRING" executionOrderId="0" height="48" width="120"> + <position x="200" y="184"/> + <inputVariables> + <variable formalParameter="IN"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="11"> + <position x="200" y="216"/> + <position x="152" y="216"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="120" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="2" typeName="INT_TO_STRING" executionOrderId="0" height="48" width="120"> + <position x="200" y="232"/> + <inputVariables> + <variable formalParameter="IN"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="13"> + <position x="200" y="264"/> + <position x="152" y="264"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="120" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="40" width="104" height="80" typeName="python_eval" instanceName="py_eval0" executionOrderId="0"> + <position x="552" y="640"/> + <inputVariables> + <variable formalParameter="TRIG"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="15" formalParameter="OUT"> + <position x="552" y="672"/> + <position x="360" y="672"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="CODE"> + <connectionPointIn> + <relPosition x="0" y="64"/> + <connection refLocalId="41"> + <position x="552" y="704"/> + <position x="528" y="704"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="ACK"> + <connectionPointOut> + <relPosition x="104" y="32"/> + </connectionPointOut> + </variable> + <variable formalParameter="RESULT"> + <connectionPointOut> + <relPosition x="104" y="64"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <continuation name="Code" localId="41" height="24" width="128"> + <position x="400" y="688"/> + <connectionPointOut> + <relPosition x="128" y="16"/> + </connectionPointOut> + </continuation> + <inVariable localId="42" height="24" width="152" executionOrderId="0" negated="false"> + <position x="32" y="656"/> + <connectionPointOut> + <relPosition x="152" y="16"/> + </connectionPointOut> + <expression>pyext_csv_update</expression> + </inVariable> + <outVariable localId="43" height="24" width="40" executionOrderId="0" negated="false"> + <position x="1216" y="672"/> + <connectionPointIn> + <relPosition x="0" y="16"/> + <connection refLocalId="38" formalParameter="Q1"> + <position x="1216" y="688"/> + <position x="1192" y="688"/> + <position x="1192" y="680"/> + <position x="1168" y="680"/> + </connection> + </connectionPointIn> + <expression>ACK</expression> + </outVariable> + <outVariable localId="44" height="24" width="64" executionOrderId="0" negated="false"> + <position x="688" y="744"/> + <connectionPointIn> + <relPosition x="0" y="8"/> + <connection refLocalId="40" formalParameter="RESULT"> + <position x="688" y="752"/> + <position x="672" y="752"/> + <position x="672" y="704"/> + <position x="656" y="704"/> + </connection> + </connectionPointIn> + <expression>RESULT</expression> + </outVariable> + <block localId="15" typeName="OR" executionOrderId="0" height="64" width="64"> + <position x="296" y="640"/> + <inputVariables> + <variable formalParameter="IN1"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="46" formalParameter="Q"> + <position x="296" y="672"/> + <position x="272" y="672"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN2"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="45"> + <position x="296" y="696"/> + <position x="240" y="696"/> + <position x="240" y="704"/> + <position x="184" y="704"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <continuation name="CodeChange" localId="45" height="24" width="120"> + <position x="64" y="688"/> + <connectionPointOut> + <relPosition x="120" y="16"/> + </connectionPointOut> + </continuation> + <block localId="46" typeName="R_TRIG" instanceName="R_TRIG1" executionOrderId="0" height="48" width="64"> + <position x="208" y="640"/> + <inputVariables> + <variable formalParameter="CLK"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="42"> + <position x="208" y="672"/> + <position x="184" y="672"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="Q"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="33" typeName="LEFT" executionOrderId="0" height="64" width="56"> + <position x="736" y="672"/> + <inputVariables> + <variable formalParameter="IN"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="40" formalParameter="RESULT"> + <position x="736" y="704"/> + <position x="656" y="704"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="L"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="35"> + <position x="736" y="728"/> + <position x="724" y="728"/> + <position x="724" y="720"/> + <position x="712" y="720"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="56" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="34" typeName="NE" executionOrderId="0" height="64" width="64"> + <position x="880" y="672"/> + <inputVariables> + <variable formalParameter="IN1"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="33" formalParameter="OUT"> + <position x="880" y="704"/> + <position x="792" y="704"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN2"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="36"> + <position x="880" y="728"/> + <position x="868" y="728"/> + <position x="868" y="720"/> + <position x="856" y="720"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <inVariable localId="35" executionOrderId="0" height="24" width="24" negated="false"> + <position x="688" y="712"/> + <connectionPointOut> + <relPosition x="24" y="8"/> + </connectionPointOut> + <expression>1</expression> + </inVariable> + <inVariable localId="36" executionOrderId="0" height="24" width="40" negated="false"> + <position x="816" y="712"/> + <connectionPointOut> + <relPosition x="40" y="8"/> + </connectionPointOut> + <expression>'#'</expression> + </inVariable> + <block localId="37" typeName="R_TRIG" instanceName="R_TRIG2" executionOrderId="0" height="48" width="64"> + <position x="880" y="616"/> + <inputVariables> + <variable formalParameter="CLK"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="40" formalParameter="ACK"> + <position x="880" y="648"/> + <position x="688" y="648"/> + <position x="688" y="672"/> + <position x="656" y="672"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="Q"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="38" typeName="SR" instanceName="SR0" executionOrderId="0" height="64" width="48"> + <position x="1120" y="648"/> + <inputVariables> + <variable formalParameter="S1"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="39" formalParameter="OUT"> + <position x="1120" y="680"/> + <position x="1056" y="680"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="R" edge="rising"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="15" formalParameter="OUT"> + <position x="1120" y="704"/> + <position x="1088" y="704"/> + <position x="1088" y="776"/> + <position x="376" y="776"/> + <position x="376" y="672"/> + <position x="360" y="672"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="Q1"> + <connectionPointOut> + <relPosition x="48" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <block localId="39" typeName="AND" executionOrderId="0" height="64" width="64"> + <position x="992" y="648"/> + <inputVariables> + <variable formalParameter="IN1"> + <connectionPointIn> + <relPosition x="0" y="32"/> + <connection refLocalId="37" formalParameter="Q"> + <position x="992" y="680"/> + <position x="976" y="680"/> + <position x="976" y="648"/> + <position x="944" y="648"/> + </connection> + </connectionPointIn> + </variable> + <variable formalParameter="IN2"> + <connectionPointIn> + <relPosition x="0" y="56"/> + <connection refLocalId="34" formalParameter="OUT"> + <position x="992" y="704"/> + <position x="944" y="704"/> + </connection> + </connectionPointIn> + </variable> + </inputVariables> + <inOutVariables/> + <outputVariables> + <variable formalParameter="OUT"> + <connectionPointOut> + <relPosition x="64" y="32"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + </FBD> + </body> + </pou> <pou name="python_eval" pouType="functionBlock"> <interface> <inputVars> @@ -445,6 +2085,19 @@ </pous> </types> <instances> - <configurations/> + <configurations> + <configuration name="configuration0"> + <globalVars> + <variable name="pyext_csv_update"> + <type> + <BOOL/> + </type> + <initialValue> + <simpleValue value="TRUE"/> + </initialValue> + </variable> + </globalVars> + </configuration> + </configurations> </instances> </project>
--- a/py_ext/py_ext.py Mon Feb 27 13:47:36 2023 +0100 +++ b/py_ext/py_ext.py Tue Feb 28 09:39:51 2023 +0100 @@ -30,6 +30,98 @@ from py_ext.PythonFileCTNMixin import PythonFileCTNMixin import util.paths as paths +pyext_python_lib_code = """ + +import csv +from collections import OrderedDict + +csv_int_files = {} +def CSVRdInt(fname, rowidx, colidx): + \"\"\" + Return value at row/column pointed by integer indexes + Assumes data starts at first row and first column, no headers. + \"\"\" + global csv_int_files + data = csv_int_files.get(fname, None) + if data is None: + data = list() + try: + csvfile = open(fname, 'rb') + except IOError: + return "#FILE_NOT_FOUND" + try: + dialect = csv.Sniffer().sniff(csvfile.read(1024)) + csvfile.seek(0) + reader = csv.reader(csvfile, dialect) + for row in reader: + data.append(row) + except csv.Error: + return "#CSV_ERROR" + finally: + csvfile.close() + csv_int_files[fname] = data + + try: + row = data[rowidx] + except IndexError: + return "#ROW_NOT_FOUND" + + try: + return row[colidx] + except IndexError: + return "#COL_NOT_FOUND" + + +csv_str_files = {} +def CSVRdStr(fname, rowname, colname): + \"\"\" + Return value at row/column pointed by a pair of names as string + Assumes first row is column headers and first column is row name. + \"\"\" + global csv_str_files + entry = csv_str_files.get(fname, None) + if entry is None: + data = dict() + try: + csvfile = open(fname, 'rb') + except IOError: + return "#FILE_NOT_FOUND" + try: + dialect = csv.Sniffer().sniff(csvfile.read(1024)) + csvfile.seek(0) + reader = csv.reader(csvfile, dialect) + headers = dict([(name, index) for index, name in enumerate(reader.next()[1:])]) + for row in reader: + data[row[0]] = row[1:] + except csv.Error: + return "#CSV_ERROR" + finally: + csvfile.close() + csv_str_files[fname] = (headers, data) + else: + headers, data = entry + + try: + row = data[rowname] + except KeyError: + return "#ROW_NOT_FOUND" + + try: + colidx = headers[colname] + except KeyError: + return "#COL_NOT_FOUND" + + try: + return row[colidx] + except IndexError: + return "#COL_NOT_FOUND" + +def pyext_csv_reload(): + global csv_int_files, csv_str_files + csv_int_files.clear() + csv_str_files.clear() + +""" class PythonLibrary(POULibrary): def GetLibraryPath(self): @@ -57,7 +149,13 @@ pythonfile.write(plc_python_code) pythonfile.close() - return (["py_ext"], [(Gen_Pythonfile_path, IECCFLAGS)], True), "" + runtimefile_path = os.path.join(buildpath, "runtime_00_pyext.py") + runtimefile = open(runtimefile_path, 'w') + runtimefile.write(pyext_python_lib_code) + runtimefile.close() + return ((["py_ext"], [(Gen_Pythonfile_path, IECCFLAGS)], True), "", + ("runtime_00_pyext.py", open(runtimefile_path, "rb"))) + class PythonFile(PythonFileCTNMixin):
--- a/runtime/NevowServer.py Mon Feb 27 13:47:36 2023 +0100 +++ b/runtime/NevowServer.py Tue Feb 28 09:39:51 2023 +0100 @@ -27,6 +27,7 @@ from __future__ import print_function import os import collections +import shutil import platform as platform_module from zope.interface import implements from nevow import appserver, inevow, tags, loaders, athena, url, rend @@ -230,6 +231,18 @@ "Restart or Repair"), action=_("Do")) + # pylint: disable=no-self-argument + def uploadFile( + ctx=annotate.Context(), + uploadedfile=annotate.FileUpload(required=True, + label=_("File to upload"))): + pass + + uploadFile = annotate.autocallable(uploadFile, + label=_( + "Upload a file to PLC working directory"), + action=_("Upload")) + customSettingsURLs = { } @@ -304,8 +317,14 @@ GetPLCObjectSingleton().RepairPLC() else: MainWorker.quit() - - + + def uploadFile(self, uploadedfile, **kwargs): + if uploadedfile is not None: + fobj = getattr(uploadedfile, "file", None) + if fobj is not None: + with open(uploadedfile.filename, 'w') as destfd: + fobj.seek(0) + shutil.copyfileobj(fobj,destfd) def locateChild(self, ctx, segments): if segments[0] in customSettingsURLs:
--- a/svghmi/analyse_widget.xslt Mon Feb 27 13:47:36 2023 +0100 +++ b/svghmi/analyse_widget.xslt Tue Feb 28 09:39:51 2023 +0100 @@ -854,6 +854,46 @@ <xsl:text>Value to display</xsl:text> </path> </xsl:template> + <xsl:template match="widget[@type='Page']" mode="widget_desc"> + <type> + <xsl:value-of select="@type"/> + </type> + <longdesc> + <xsl:text> +</xsl:text> + <xsl:text>Arguments are either: +</xsl:text> + <xsl:text> +</xsl:text> + <xsl:text>- XXX reference path TODO +</xsl:text> + <xsl:text> +</xsl:text> + <xsl:text>- name=value: setting variable with literal value. +</xsl:text> + <xsl:text>- name=other_name: copy variable content into another +</xsl:text> + <xsl:text> +</xsl:text> + <xsl:text>"active"+"inactive" labeled elements can be provided to show feedback when pressed +</xsl:text> + <xsl:text> +</xsl:text> + <xsl:text>Exemples: +</xsl:text> + <xsl:text> +</xsl:text> + <xsl:text>HMI:Page:notify=1@notify=/PLCVAR +</xsl:text> + <xsl:text>HMI:Page:ack=2:notify=1@ack=.local_var@notify=/PLCVAR +</xsl:text> + <xsl:text> +</xsl:text> + </longdesc> + <shortdesc> + <xsl:text>Page </xsl:text> + </shortdesc> + </xsl:template> <xsl:template match="widget[@type='PathSlider']" mode="widget_desc"> <type> <xsl:value-of select="@type"/>
--- a/svghmi/detachable_pages.ysl2 Mon Feb 27 13:47:36 2023 +0100 +++ b/svghmi/detachable_pages.ysl2 Tue Feb 28 09:39:51 2023 +0100 @@ -137,6 +137,10 @@ const "_detachable_elements", "func:detachable_elements($hmi_pages | $keypads)"; const "detachable_elements", "$_detachable_elements[not(ancestor::*/@id = $_detachable_elements/@id)]"; +emit "declarations:page-class" { + | class PageWidget extends Widget{} +} + emit "declarations:detachable-elements" { | | var detachable_elements = { @@ -165,8 +169,13 @@ const "all_page_widgets","$hmi_widgets[@id = $page_all_elements/@id and @id != $page/@id]"; const "page_managed_widgets","$all_page_widgets[not(@id=$in_forEach_widget_ids)]"; + + const "page_root_path", "$desc/path[not(@assign)]"; + if "count($page_root_path)>1" + error > Page id="«$page/@id»" : only one root path can be declared + const "page_relative_widgets", - "$page_managed_widgets[func:is_descendant_path(func:widget(@id)/path/@value, $desc/path/@value)]"; + "$page_managed_widgets[func:is_descendant_path(func:widget(@id)/path/@value, $page_root_path/@value)]"; // Take closest ancestor in detachable_elements // since nested detachable elements are filtered out @@ -178,19 +187,19 @@ ancestor-or-self::*[@id = $detachable_elements/@id]"""; | "«$pagename»": { - //| widget: hmi_widgets["«@id»"], | bbox: [«$p/@x», «$p/@y», «$p/@w», «$p/@h»], - if "$desc/path/@value" { - if "count($desc/path/@index)=0" - warning > Page id="«$page/@id»" : No match for path "«$desc/path/@value»" in HMI tree - | page_index: «$desc/path/@index», - | page_class: "«$indexed_hmitree/*[@hmipath = $desc/path/@value]/@class»", + if "count($page_root_path)=1"{ + if "count($page_root_path/@index)=0" + warning > Page id="«$page/@id»" : No match for path "«$page_root_path/@value»" in HMI tree + | page_index: «$page_root_path/@index», + | page_class: "«$indexed_hmitree/*[@hmipath = $page_root_path/@value]/@class»", } | widgets: [ + | [hmi_widgets["«$page/@id»"], []], foreach "$page_managed_widgets" { const "widget_paths_relativeness" foreach "func:widget(@id)/path" { - value "func:is_descendant_path(@value, $desc/path/@value)"; + value "func:is_descendant_path(@value, $page_root_path/@value)"; if "position()!=last()" > , } | [hmi_widgets["«@id»"], [«$widget_paths_relativeness»]]`if "position()!=last()" > ,`
--- a/svghmi/gen_index_xhtml.xslt Mon Feb 27 13:47:36 2023 +0100 +++ b/svghmi/gen_index_xhtml.xslt Tue Feb 28 09:39:51 2023 +0100 @@ -734,6 +734,21 @@ </func:function> <xsl:variable name="_detachable_elements" select="func:detachable_elements($hmi_pages | $keypads)"/> <xsl:variable name="detachable_elements" select="$_detachable_elements[not(ancestor::*/@id = $_detachable_elements/@id)]"/> + <declarations:page-class/> + <xsl:template match="declarations:page-class"> + <xsl:text> +</xsl:text> + <xsl:text>/* </xsl:text> + <xsl:value-of select="local-name()"/> + <xsl:text> */ +</xsl:text> + <xsl:text> +</xsl:text> + <xsl:text>class PageWidget extends Widget{} +</xsl:text> + <xsl:text> +</xsl:text> + </xsl:template> <declarations:detachable-elements/> <xsl:template match="declarations:detachable-elements"> <xsl:text> @@ -787,7 +802,15 @@ <xsl:variable name="page_all_elements" select="func:all_related_elements($page)"/> <xsl:variable name="all_page_widgets" select="$hmi_widgets[@id = $page_all_elements/@id and @id != $page/@id]"/> <xsl:variable name="page_managed_widgets" select="$all_page_widgets[not(@id=$in_forEach_widget_ids)]"/> - <xsl:variable name="page_relative_widgets" select="$page_managed_widgets[func:is_descendant_path(func:widget(@id)/path/@value, $desc/path/@value)]"/> + <xsl:variable name="page_root_path" select="$desc/path[not(@assign)]"/> + <xsl:if test="count($page_root_path)>1"> + <xsl:message terminate="yes"> + <xsl:text>Page id="</xsl:text> + <xsl:value-of select="$page/@id"/> + <xsl:text>" : only one root path can be declared</xsl:text> + </xsl:message> + </xsl:if> + <xsl:variable name="page_relative_widgets" select="$page_managed_widgets[func:is_descendant_path(func:widget(@id)/path/@value, $page_root_path/@value)]"/> <xsl:variable name="sumarized_page" select="func:sumarized_elements($page_all_elements)"/> <xsl:variable name="required_detachables" select="$sumarized_page/ ancestor-or-self::*[@id = $detachable_elements/@id]"/> <xsl:text> "</xsl:text> @@ -804,31 +827,35 @@ <xsl:value-of select="$p/@h"/> <xsl:text>], </xsl:text> - <xsl:if test="$desc/path/@value"> - <xsl:if test="count($desc/path/@index)=0"> + <xsl:if test="count($page_root_path)=1"> + <xsl:if test="count($page_root_path/@index)=0"> <xsl:message terminate="no"> <xsl:text>Page id="</xsl:text> <xsl:value-of select="$page/@id"/> <xsl:text>" : No match for path "</xsl:text> - <xsl:value-of select="$desc/path/@value"/> + <xsl:value-of select="$page_root_path/@value"/> <xsl:text>" in HMI tree</xsl:text> </xsl:message> </xsl:if> <xsl:text> page_index: </xsl:text> - <xsl:value-of select="$desc/path/@index"/> + <xsl:value-of select="$page_root_path/@index"/> <xsl:text>, </xsl:text> <xsl:text> page_class: "</xsl:text> - <xsl:value-of select="$indexed_hmitree/*[@hmipath = $desc/path/@value]/@class"/> + <xsl:value-of select="$indexed_hmitree/*[@hmipath = $page_root_path/@value]/@class"/> <xsl:text>", </xsl:text> </xsl:if> <xsl:text> widgets: [ </xsl:text> + <xsl:text> [hmi_widgets["</xsl:text> + <xsl:value-of select="$page/@id"/> + <xsl:text>"], []], +</xsl:text> <xsl:for-each select="$page_managed_widgets"> <xsl:variable name="widget_paths_relativeness"> <xsl:for-each select="func:widget(@id)/path"> - <xsl:value-of select="func:is_descendant_path(@value, $desc/path/@value)"/> + <xsl:value-of select="func:is_descendant_path(@value, $page_root_path/@value)"/> <xsl:if test="position()!=last()"> <xsl:text>,</xsl:text> </xsl:if> @@ -1190,6 +1217,8 @@ </xsl:text> <xsl:text> </xsl:text> + <xsl:text>const xmlns = "http://www.w3.org/2000/svg"; +</xsl:text> <xsl:text>let id = document.getElementById.bind(document); </xsl:text> <xsl:text>var svg_root = id("</xsl:text> @@ -1440,7 +1469,7 @@ <xsl:text>,{ </xsl:text> <xsl:if test="$widget/@enable_expr"> - <xsl:text> assignments: [], + <xsl:text> enable_assignments: [], </xsl:text> <xsl:text> compute_enable: function(value, oldval, varnum) { </xsl:text> @@ -1456,13 +1485,13 @@ <xsl:if test="$varid = generate-id()"> <xsl:text> if(varnum == </xsl:text> <xsl:value-of select="$varnum"/> - <xsl:text>) this.assignments[</xsl:text> + <xsl:text>) this.enable_assignments[</xsl:text> <xsl:value-of select="position()-1"/> <xsl:text>] = value; </xsl:text> <xsl:text> let </xsl:text> <xsl:value-of select="@assign"/> - <xsl:text> = this.assignments[</xsl:text> + <xsl:text> = this.enable_assignments[</xsl:text> <xsl:value-of select="position()-1"/> <xsl:text>]; </xsl:text> @@ -2131,7 +2160,7 @@ </xsl:text> <xsl:text> } </xsl:text> - <xsl:text> + <xsl:text> </xsl:text> <xsl:text> undeafen(index){ </xsl:text> @@ -2141,6 +2170,10 @@ </xsl:text> <xsl:text> this.incoming[index] = undefined; </xsl:text> + <xsl:text> // TODO: add timestamp argument to dispatch, so that defered data do not appear wrong on graphs +</xsl:text> + <xsl:text> this.lastdispatch[index] = Date.now(); +</xsl:text> <xsl:text> this.do_dispatch(new_val, old_val, index); </xsl:text> <xsl:text> } @@ -2388,7 +2421,9 @@ </xsl:message> </xsl:template> <xsl:variable name="included_ids" select="$parsed_widgets/widget[not(@type = $excluded_types) and not(@id = $discardable_elements/@id)]/@id"/> + <xsl:variable name="page_ids" select="$parsed_widgets/widget[@type = 'Page']/@id"/> <xsl:variable name="hmi_widgets" select="$hmi_elements[@id = $included_ids]"/> + <xsl:variable name="page_widgets" select="$hmi_elements[@id = $page_ids]"/> <xsl:variable name="result_widgets" select="$result_svg_ns//*[@id = $hmi_widgets/@id]"/> <declarations:hmi-elements/> <xsl:template match="declarations:hmi-elements"> @@ -2402,7 +2437,7 @@ </xsl:text> <xsl:text>var hmi_widgets = { </xsl:text> - <xsl:apply-templates mode="hmi_widgets" select="$hmi_widgets"/> + <xsl:apply-templates mode="hmi_widgets" select="$hmi_widgets | $page_widgets"/> <xsl:text>} </xsl:text> <xsl:text> @@ -5557,7 +5592,7 @@ <xsl:if test="$have_value"> <xsl:text> animate: function(){ </xsl:text> - <xsl:text> this.value_elt.textContent = String(this.display); + <xsl:text> multiline_to_svg_text(this.value_elt, String(this.display)); </xsl:text> <xsl:text> }, </xsl:text> @@ -5595,7 +5630,7 @@ </xsl:text> </xsl:for-each> <xsl:if test="$have_value"> - <xsl:text> this.value_elt.textContent = ""; + <xsl:text> multiline_to_svg_text(this.value_elt, ""); </xsl:text> </xsl:if> <xsl:text> }, @@ -6367,10 +6402,10 @@ <xsl:variable name="target_page_path"> <xsl:choose> <xsl:when test="arg"> - <xsl:value-of select="$hmi_pages_descs[arg[1]/@value = $target_page_name]/path[1]/@value"/> + <xsl:value-of select="$hmi_pages_descs[arg[1]/@value = $target_page_name]/path[not(@assign)]/@value"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="$page_desc/path[1]/@value"/> + <xsl:value-of select="$page_desc/path[not(@assign)]/@value"/> </xsl:otherwise> </xsl:choose> </xsl:variable> @@ -7195,6 +7230,128 @@ <xsl:text> ], </xsl:text> </xsl:template> + <xsl:template match="widget[@type='Page']" mode="widget_desc"> + <type> + <xsl:value-of select="@type"/> + </type> + <longdesc> + <xsl:text> +</xsl:text> + <xsl:text>Arguments are either: +</xsl:text> + <xsl:text> +</xsl:text> + <xsl:text>- XXX reference path TODO +</xsl:text> + <xsl:text> +</xsl:text> + <xsl:text>- name=value: setting variable with literal value. +</xsl:text> + <xsl:text>- name=other_name: copy variable content into another +</xsl:text> + <xsl:text> +</xsl:text> + <xsl:text>"active"+"inactive" labeled elements can be provided to show feedback when pressed +</xsl:text> + <xsl:text> +</xsl:text> + <xsl:text>Exemples: +</xsl:text> + <xsl:text> +</xsl:text> + <xsl:text>HMI:Page:notify=1@notify=/PLCVAR +</xsl:text> + <xsl:text>HMI:Page:ack=2:notify=1@ack=.local_var@notify=/PLCVAR +</xsl:text> + <xsl:text> +</xsl:text> + </longdesc> + <shortdesc> + <xsl:text>Page </xsl:text> + </shortdesc> + </xsl:template> + <xsl:template match="widget[@type='Page']" mode="widget_defs"> + <xsl:param name="hmi_element"/> + <xsl:variable name="disability"> + <xsl:call-template name="defs_by_labels"> + <xsl:with-param name="hmi_element" select="$hmi_element"/> + <xsl:with-param name="labels"> + <xsl:text>/disabled</xsl:text> + </xsl:with-param> + <xsl:with-param name="mandatory" select="'no'"/> + </xsl:call-template> + </xsl:variable> + <xsl:value-of select="$disability"/> + <xsl:variable name="has_disability" select="string-length($disability)>0"/> + <xsl:text> assignments: {}, +</xsl:text> + <xsl:text> dispatch: function(value, oldval, varnum) { +</xsl:text> + <xsl:variable name="widget" select="."/> + <xsl:for-each select="path"> + <xsl:variable name="varid" select="generate-id()"/> + <xsl:variable name="varnum" select="position()-1"/> + <xsl:if test="@assign"> + <xsl:for-each select="$widget/path[@assign]"> + <xsl:if test="$varid = generate-id()"> + <xsl:text> if(varnum == </xsl:text> + <xsl:value-of select="$varnum"/> + <xsl:text>) this.assignments["</xsl:text> + <xsl:value-of select="@assign"/> + <xsl:text>"] = value; +</xsl:text> + </xsl:if> + </xsl:for-each> + </xsl:if> + </xsl:for-each> + <xsl:text> }, +</xsl:text> + <xsl:text> assign: function() { +</xsl:text> + <xsl:variable name="paths" select="path"/> + <xsl:for-each select="arg[contains(@value,'=')]"> + <xsl:variable name="name" select="substring-before(@value,'=')"/> + <xsl:variable name="value" select="substring-after(@value,'=')"/> + <xsl:variable name="index"> + <xsl:for-each select="$paths"> + <xsl:if test="@assign = $name"> + <xsl:value-of select="position()-1"/> + </xsl:if> + </xsl:for-each> + </xsl:variable> + <xsl:variable name="isVarName" select="regexp:test($value,'^[a-zA-Z_][a-zA-Z0-9_]+$')"/> + <xsl:choose> + <xsl:when test="$isVarName"> + <xsl:text> const </xsl:text> + <xsl:value-of select="$value"/> + <xsl:text> = this.assignments["</xsl:text> + <xsl:value-of select="$value"/> + <xsl:text>"]; +</xsl:text> + <xsl:text> if(</xsl:text> + <xsl:value-of select="$value"/> + <xsl:text> != undefined) +</xsl:text> + <xsl:text> this.apply_hmi_value(</xsl:text> + <xsl:value-of select="$index"/> + <xsl:text>, </xsl:text> + <xsl:value-of select="$value"/> + <xsl:text>); +</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text> this.apply_hmi_value(</xsl:text> + <xsl:value-of select="$index"/> + <xsl:text>, </xsl:text> + <xsl:value-of select="$value"/> + <xsl:text>); +</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> + <xsl:text> }, +</xsl:text> + </xsl:template> <xsl:template match="widget[@type='PathSlider']" mode="widget_desc"> <type> <xsl:value-of select="@type"/> @@ -8994,21 +9151,23 @@ </xsl:text> <xsl:text> // Compute visible Y range by merging fixed curves Y ranges </xsl:text> - <xsl:text> for(let minmax of this.minmaxes){ -</xsl:text> - <xsl:text> if(minmax){ -</xsl:text> - <xsl:text> let [min,max] = minmax; -</xsl:text> - <xsl:text> if(min < y_min) -</xsl:text> - <xsl:text> y_min = min; -</xsl:text> - <xsl:text> if(max > y_max) -</xsl:text> - <xsl:text> y_max = max; -</xsl:text> - <xsl:text> } + <xsl:text> for(let varopts of this.variables_options){ +</xsl:text> + <xsl:text> let minmax = varopts.minmax +</xsl:text> + <xsl:text> if(minmax){ +</xsl:text> + <xsl:text> let [min,max] = minmax; +</xsl:text> + <xsl:text> if(min < y_min) +</xsl:text> + <xsl:text> y_min = min; +</xsl:text> + <xsl:text> if(max > y_max) +</xsl:text> + <xsl:text> y_max = max; +</xsl:text> + <xsl:text> } </xsl:text> <xsl:text> } </xsl:text> @@ -9016,11 +9175,11 @@ </xsl:text> <xsl:text> if(y_min !== Infinity && y_max !== -Infinity){ </xsl:text> - <xsl:text> this.fixed_y_range = true; + <xsl:text> this.fixed_y_range = true; </xsl:text> <xsl:text> } else { </xsl:text> - <xsl:text> this.fixed_y_range = false; + <xsl:text> this.fixed_y_range = false; </xsl:text> <xsl:text> } </xsl:text> @@ -9114,6 +9273,8 @@ </xsl:text> <xsl:text> </xsl:text> + <xsl:text> console.log("dispatch(",value,oldval, index, time); +</xsl:text> <xsl:text> // naive local buffer impl. </xsl:text> <xsl:text> // data is updated only when graph is visible @@ -12128,29 +12289,37 @@ </xsl:text> <xsl:text> </xsl:text> - <xsl:text>var screensaver_timer = null; -</xsl:text> - <xsl:text>function reset_screensaver_timer() { -</xsl:text> - <xsl:text> if(screensaver_timer){ -</xsl:text> - <xsl:text> window.clearTimeout(screensaver_timer); + <xsl:text>if(screensaver_delay){ +</xsl:text> + <xsl:text> var screensaver_timer = null; +</xsl:text> + <xsl:text> function reset_screensaver_timer() { +</xsl:text> + <xsl:text> if(screensaver_timer){ +</xsl:text> + <xsl:text> window.clearTimeout(screensaver_timer); +</xsl:text> + <xsl:text> } +</xsl:text> + <xsl:text> screensaver_timer = window.setTimeout(() => { +</xsl:text> + <xsl:text> switch_page("ScreenSaver"); +</xsl:text> + <xsl:text> screensaver_timer = null; +</xsl:text> + <xsl:text> }, screensaver_delay*1000); </xsl:text> <xsl:text> } </xsl:text> - <xsl:text> screensaver_timer = window.setTimeout(() => { -</xsl:text> - <xsl:text> switch_page("ScreenSaver"); -</xsl:text> - <xsl:text> screensaver_timer = null; -</xsl:text> - <xsl:text> }, screensaver_delay*1000); + <xsl:text> document.body.addEventListener('pointerdown', reset_screensaver_timer); +</xsl:text> + <xsl:text> // initialize screensaver +</xsl:text> + <xsl:text> reset_screensaver_timer(); </xsl:text> <xsl:text>} </xsl:text> - <xsl:text>if(screensaver_delay) -</xsl:text> - <xsl:text> document.body.addEventListener('pointerdown', reset_screensaver_timer); + <xsl:text> </xsl:text> <xsl:text> </xsl:text> @@ -12314,6 +12483,12 @@ </xsl:text> <xsl:text> </xsl:text> + <xsl:text> // when entering a page, assignments are evaluated +</xsl:text> + <xsl:text> new_desc.widgets[0][0].assign(); +</xsl:text> + <xsl:text> +</xsl:text> <xsl:text> return true; </xsl:text> <xsl:text>}; @@ -12474,16 +12649,12 @@ </xsl:text> <xsl:text> </xsl:text> - <xsl:text>// initialize screensaver -</xsl:text> - <xsl:text>reset_screensaver_timer(); -</xsl:text> - <xsl:text> -</xsl:text> <xsl:text>var reconnect_delay = 0; </xsl:text> <xsl:text>var periodic_reconnect_timer; </xsl:text> + <xsl:text>var force_reconnect = false; +</xsl:text> <xsl:text> </xsl:text> <xsl:text>// Once connection established @@ -12504,6 +12675,8 @@ </xsl:text> <xsl:text> periodic_reconnect_timer = window.setTimeout(() => { </xsl:text> + <xsl:text> force_reconnect = true; +</xsl:text> <xsl:text> ws.close(); </xsl:text> <xsl:text> periodic_reconnect_timer = null; @@ -12540,14 +12713,26 @@ </xsl:text> <xsl:text> ws = null; </xsl:text> - <xsl:text> // reconect -</xsl:text> - <xsl:text> // TODO : add visible notification while waiting for reload + <xsl:text> // Do not attempt to reconnect immediately in case: +</xsl:text> + <xsl:text> // - connection was closed by server (PLC stop) +</xsl:text> + <xsl:text> // - connection was closed locally with an intention to reconnect +</xsl:text> + <xsl:text> if(evt.code=1000 && !force_reconnect){ +</xsl:text> + <xsl:text> window.alert("Connection closed by server"); +</xsl:text> + <xsl:text> location.reload(); +</xsl:text> + <xsl:text> } </xsl:text> <xsl:text> window.setTimeout(create_ws, reconnect_delay); </xsl:text> <xsl:text> reconnect_delay += 500; </xsl:text> + <xsl:text> force_reconnect = false; +</xsl:text> <xsl:text>}; </xsl:text> <xsl:text> @@ -12580,8 +12765,6 @@ </xsl:text> <xsl:text> </xsl:text> - <xsl:text>const xmlns = "http://www.w3.org/2000/svg"; -</xsl:text> <xsl:text>var edit_callback; </xsl:text> <xsl:text>const localtypes = {"PAGE_LOCAL":null, "HMI_LOCAL":null}
--- a/svghmi/inline_svg.ysl2 Mon Feb 27 13:47:36 2023 +0100 +++ b/svghmi/inline_svg.ysl2 Tue Feb 28 09:39:51 2023 +0100 @@ -209,6 +209,7 @@ const "result_svg_ns", "exsl:node-set($result_svg)"; emit "preamble:inline-svg" { + | const xmlns = "http://www.w3.org/2000/svg"; | let id = document.getElementById.bind(document); | var svg_root = id("«$svg/@id»"); }
--- a/svghmi/svghmi.js Mon Feb 27 13:47:36 2023 +0100 +++ b/svghmi/svghmi.js Tue Feb 28 09:39:51 2023 +0100 @@ -525,6 +525,9 @@ ? page_name : page_name + "@" + hmitree_paths[page_index]); + // when entering a page, assignments are evaluated + new_desc.widgets[0][0].assign(); + return true; }; @@ -607,6 +610,7 @@ var reconnect_delay = 0; var periodic_reconnect_timer; +var force_reconnect = false; // Once connection established function ws_onopen(evt) { @@ -617,6 +621,7 @@ window.clearTimeout(periodic_reconnect_timer); } periodic_reconnect_timer = window.setTimeout(() => { + force_reconnect = true; ws.close(); periodic_reconnect_timer = null; }, 3600000); @@ -635,10 +640,16 @@ function ws_onclose(evt) { console.log("Connection closed. code:"+evt.code+" reason:"+evt.reason+" wasClean:"+evt.wasClean+" Reload in "+reconnect_delay+"ms."); ws = null; - // reconect - // TODO : add visible notification while waiting for reload + // Do not attempt to reconnect immediately in case: + // - connection was closed by server (PLC stop) + // - connection was closed locally with an intention to reconnect + if(evt.code=1000 && !force_reconnect){ + window.alert("Connection closed by server"); + location.reload(); + } window.setTimeout(create_ws, reconnect_delay); reconnect_delay += 500; + force_reconnect = false; }; var ws_url = @@ -655,7 +666,6 @@ create_ws() -const xmlns = "http://www.w3.org/2000/svg"; var edit_callback; const localtypes = {"PAGE_LOCAL":null, "HMI_LOCAL":null} function edit_value(path, valuetype, callback, initial) {
--- a/svghmi/svghmi.py Mon Feb 27 13:47:36 2023 +0100 +++ b/svghmi/svghmi.py Tue Feb 28 09:39:51 2023 +0100 @@ -650,8 +650,8 @@ def svghmi_{location}_watchdog_trigger(): global browser_proc - restart_proc = {svghmi_cmds[Watchdog]} - waitpid_timeout(restart_proc, "SVGHMI watchdog triggered command") + watchdog_proc = {svghmi_cmds[Watchdog]} + waitpid_timeout(watchdog_proc, "SVGHMI watchdog triggered command") stop_proc = {svghmi_cmds[Stop]} waitpid_timeout(stop_proc, "SVGHMI stop command") waitpid_timeout(browser_proc, "SVGHMI browser process")
--- a/svghmi/widget_input.ysl2 Mon Feb 27 13:47:36 2023 +0100 +++ b/svghmi/widget_input.ysl2 Tue Feb 28 09:39:51 2023 +0100 @@ -92,7 +92,7 @@ if "$have_value" { | animate: function(){ - | this.value_elt.textContent = String(this.display); + | multiline_to_svg_text(this.value_elt, String(this.display)); | }, } @@ -114,7 +114,7 @@ } if "$have_value" { - | this.value_elt.textContent = ""; + | multiline_to_svg_text(this.value_elt, ""); } | }, }
--- a/svghmi/widget_jump.ysl2 Mon Feb 27 13:47:36 2023 +0100 +++ b/svghmi/widget_jump.ysl2 Tue Feb 28 09:39:51 2023 +0100 @@ -143,8 +143,8 @@ otherwise value "$page_desc/arg[1]/@value"; } const "target_page_path" choose { - when "arg" value "$hmi_pages_descs[arg[1]/@value = $target_page_name]/path[1]/@value"; - otherwise value "$page_desc/path[1]/@value"; + when "arg" value "$hmi_pages_descs[arg[1]/@value = $target_page_name]/path[not(@assign)]/@value"; + otherwise value "$page_desc/path[not(@assign)]/@value"; } if "not(func:same_class_paths($target_page_path, path[1]/@value))"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/svghmi/widget_page.ysl2 Tue Feb 28 09:39:51 2023 +0100 @@ -0,0 +1,60 @@ +// widget_page.ysl2 + +widget_desc("Page") { + longdesc + || + + Arguments are either: + + - XXX reference path TODO + + - name=value: setting variable with literal value. + - name=other_name: copy variable content into another + + "active"+"inactive" labeled elements can be provided to show feedback when pressed + + Exemples: + + HMI:Page:notify=1@notify=/PLCVAR + HMI:Page:ack=2:notify=1@ack=.local_var@notify=/PLCVAR + + || + + shortdesc > Page + +} + +widget_defs("Page") { + + | assignments: {}, + | dispatch: function(value, oldval, varnum) { + const "widget", "."; + foreach "path" { + const "varid","generate-id()"; + const "varnum","position()-1"; + if "@assign" foreach "$widget/path[@assign]" if "$varid = generate-id()" { + | if(varnum == «$varnum») this.assignments["«@assign»"] = value; + } + } + | }, + | assign: function() { + const "paths","path"; + foreach "arg[contains(@value,'=')]"{ + const "name","substring-before(@value,'=')"; + const "value","substring-after(@value,'=')"; + const "index" foreach "$paths" if "@assign = $name" value "position()-1"; + const "isVarName", "regexp:test($value,'^[a-zA-Z_][a-zA-Z0-9_]+$')"; + choose { + when "$isVarName"{ + | const «$value» = this.assignments["«$value»"]; + | if(«$value» != undefined) + | this.apply_hmi_value(«$index», «$value»); + } + otherwise { + | this.apply_hmi_value(«$index», «$value»); + } + } + } + | }, +} +
--- a/svghmi/widget_xygraph.ysl2 Mon Feb 27 13:47:36 2023 +0100 +++ b/svghmi/widget_xygraph.ysl2 Tue Feb 28 09:39:51 2023 +0100 @@ -58,20 +58,21 @@ let y_min = Infinity, y_max = -Infinity; // Compute visible Y range by merging fixed curves Y ranges - for(let minmax of this.minmaxes){ - if(minmax){ - let [min,max] = minmax; - if(min < y_min) - y_min = min; - if(max > y_max) - y_max = max; - } + for(let varopts of this.variables_options){ + let minmax = varopts.minmax + if(minmax){ + let [min,max] = minmax; + if(min < y_min) + y_min = min; + if(max > y_max) + y_max = max; + } } if(y_min !== Infinity && y_max !== -Infinity){ - this.fixed_y_range = true; + this.fixed_y_range = true; } else { - this.fixed_y_range = false; + this.fixed_y_range = false; } this.ymin = y_min;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/svghmi/widgetlib/bool_indicator.svg Tue Feb 28 09:39:51 2023 +0100 @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="210mm" + height="297mm" + viewBox="0 0 210 297" + version="1.1" + id="svg2283" + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" + sodipodi:docname="bool_indicator.svg"> + <defs + id="defs2277" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1.4" + inkscape:cx="462.51005" + inkscape:cy="731.33409" + inkscape:document-units="mm" + inkscape:current-layer="g72" + showgrid="false" + inkscape:window-width="1850" + inkscape:window-height="1036" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" + borderlayer="false" /> + <metadata + id="metadata2280"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + id="g72" + transform="matrix(2.7990784,0,0,2.7990784,-196.86918,-137.27685)" + style="stroke-width:0.35726044" + inkscape:label="HMI:Switch"> + <text + id="text62" + y="83.254463" + x="112.6369" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.09452516px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve" + inkscape:label="true"><tspan + style="fill:#008000;stroke-width:0.09452516px" + y="83.254463" + x="112.6369" + id="tspan60" + sodipodi:role="line">✔</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.09452516px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="112.6369" + y="83.254463" + id="text66" + inkscape:label="false"><tspan + sodipodi:role="line" + id="tspan64" + x="112.6369" + y="83.254463" + style="fill:#ff0000;stroke-width:0.09452516px">✕</tspan></text> + </g> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/svghmi/widgetlib/simple_text_display.svg Tue Feb 28 09:39:51 2023 +0100 @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="210mm" + height="297mm" + viewBox="0 0 210 297" + version="1.1" + id="svg2283" + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" + sodipodi:docname="display.svg"> + <defs + id="defs2277" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1.979899" + inkscape:cx="272.49799" + inkscape:cy="696.53067" + inkscape:document-units="mm" + inkscape:current-layer="svg2283" + showgrid="false" + inkscape:window-width="1850" + inkscape:window-height="1036" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" + borderlayer="false" /> + <metadata + id="metadata2280"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.10321426px;line-height:125%;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#ff8c00;fill-opacity:1;stroke:none;stroke-width:0.07564509px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="105.0444" + y="118.41108" + id="text432" + inkscape:label="HMI:Display"><tspan + sodipodi:role="line" + id="tspan430" + x="105.0444" + y="118.41108" + style="text-align:end;text-anchor:end;fill:#ff8c00;stroke-width:0.07564509px">value</tspan></text> +</svg>
--- a/svghmi/widgets_common.ysl2 Mon Feb 27 13:47:36 2023 +0100 +++ b/svghmi/widgets_common.ysl2 Tue Feb 28 09:39:51 2023 +0100 @@ -134,7 +134,7 @@ | "«@id»": new «$widget/@type»Widget ("«@id»",«$freq»,[«$args»],[«$variables»],«$enable_expr»,{ if "$widget/@enable_expr" { - | assignments: [], + | enable_assignments: [], | compute_enable: function(value, oldval, varnum) { | let result = false; | do { @@ -142,8 +142,8 @@ const "varid","generate-id()"; const "varnum","position()-1"; if "@assign" foreach "$widget/path[@assign]" if "$varid = generate-id()" { - | if(varnum == «$varnum») this.assignments[«position()-1»] = value; - | let «@assign» = this.assignments[«position()-1»]; + | if(varnum == «$varnum») this.enable_assignments[«position()-1»] = value; + | let «@assign» = this.enable_assignments[«position()-1»]; | if(«@assign» == undefined) break; } } @@ -464,11 +464,12 @@ } } } - + undeafen(index){ this.deafen[index] = undefined; let [new_val, old_val] = this.incoming[index]; this.incoming[index] = undefined; + this.lastdispatch[index] = Date.now(); this.do_dispatch(new_val, old_val, index); } @@ -600,12 +601,14 @@ } const "included_ids","$parsed_widgets/widget[not(@type = $excluded_types) and not(@id = $discardable_elements/@id)]/@id"; +const "page_ids","$parsed_widgets/widget[@type = 'Page']/@id"; const "hmi_widgets","$hmi_elements[@id = $included_ids]"; +const "page_widgets","$hmi_elements[@id = $page_ids]"; const "result_widgets","$result_svg_ns//*[@id = $hmi_widgets/@id]"; emit "declarations:hmi-elements" { | var hmi_widgets = { - apply "$hmi_widgets", mode="hmi_widgets"; + apply "$hmi_widgets | $page_widgets", mode="hmi_widgets"; | } | }
--- a/targets/Linux/XSD Mon Feb 27 13:47:36 2023 +0100 +++ b/targets/Linux/XSD Tue Feb 28 09:39:51 2023 +0100 @@ -1,6 +1,7 @@ <xsd:element name="Linux"> <xsd:complexType> + <xsd:attribute name="RealTime" type="xsd:boolean" use="optional" default="false"/> %(toolchain_gcc)s </xsd:complexType> - </xsd:element> \ No newline at end of file + </xsd:element>
--- a/targets/Linux/__init__.py Mon Feb 27 13:47:36 2023 +0100 +++ b/targets/Linux/__init__.py Tue Feb 28 09:39:51 2023 +0100 @@ -32,7 +32,11 @@ extension = ".so" def getBuilderCFLAGS(self): - return toolchain_gcc.getBuilderCFLAGS(self) + ["-fPIC"] + additional_cflags = ["-fPIC"] + build_for_realtime = self.CTRInstance.GetTarget().getcontent().getRealTime() + if build_for_realtime: + additional_cflags.append("-DREALTIME_LINUX") + return toolchain_gcc.getBuilderCFLAGS(self) + additional_cflags def getBuilderLDFLAGS(self): return toolchain_gcc.getBuilderLDFLAGS(self) + ["-shared", "-lrt"]
--- a/targets/Linux/plc_Linux_main.c Mon Feb 27 13:47:36 2023 +0100 +++ b/targets/Linux/plc_Linux_main.c Tue Feb 28 09:39:51 2023 +0100 @@ -7,11 +7,23 @@ #include <time.h> #include <signal.h> #include <stdlib.h> +#include <errno.h> #include <pthread.h> #include <locale.h> #include <semaphore.h> - -static sem_t Run_PLC; +#ifdef REALTIME_LINUX +#include <sys/mman.h> +#endif + +static unsigned long __debug_tick; + +static pthread_t PLC_thread; +static pthread_mutex_t python_wait_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t python_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t debug_wait_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t debug_mutex = PTHREAD_MUTEX_INITIALIZER; + +static int PLC_shutdown = 0; long AtomicCompareExchange(long* atomicvar,long compared, long exchange) { @@ -30,39 +42,34 @@ CURRENT_TIME->tv_nsec = tmp.tv_nsec; } -void PLC_timer_notify(sigval_t val) -{ - PLC_GetTime(&__CURRENT_TIME); - sem_post(&Run_PLC); -} - -timer_t PLC_timer; +static long long period_ns = 0; +struct timespec next_abs_time; + +static void inc_timespec(struct timespec *ts, unsigned long long value_ns) +{ + long long next_ns = ((long long) ts->tv_sec * 1000000000) + ts->tv_nsec + value_ns; +#ifdef __lldiv_t_defined + lldiv_t next_div = lldiv(next_ns, 1000000000); + ts->tv_sec = next_div.quot; + ts->tv_nsec = next_div.rem; +#else + ts->tv_sec = next_ns / 1000000000; + ts->tv_nsec = next_ns % 1000000000; +#endif +} void PLC_SetTimer(unsigned long long next, unsigned long long period) { - struct itimerspec timerValues; - /* - printf("SetTimer(%lld,%lld)\n",next, period); - */ - memset (&timerValues, 0, sizeof (struct itimerspec)); - { -#ifdef __lldiv_t_defined - lldiv_t nxt_div = lldiv(next, 1000000000); - lldiv_t period_div = lldiv(period, 1000000000); - timerValues.it_value.tv_sec = nxt_div.quot; - timerValues.it_value.tv_nsec = nxt_div.rem; - timerValues.it_interval.tv_sec = period_div.quot; - timerValues.it_interval.tv_nsec = period_div.rem; -#else - timerValues.it_value.tv_sec = next / 1000000000; - timerValues.it_value.tv_nsec = next % 1000000000; - timerValues.it_interval.tv_sec = period / 1000000000; - timerValues.it_interval.tv_nsec = period % 1000000000; -#endif - } - timer_settime (PLC_timer, 0, &timerValues, NULL); -} -// + /* + printf("SetTimer(%lld,%lld)\n",next, period); + */ + period_ns = period; + clock_gettime(CLOCK_MONOTONIC, &next_abs_time); + inc_timespec(&next_abs_time, next); + // interrupt clock_nanpsleep + pthread_kill(PLC_thread, SIGUSR1); +} + void catch_signal(int sig) { // signal(SIGTERM, catch_signal); @@ -71,16 +78,11 @@ exit(0); } - -static unsigned long __debug_tick; - -pthread_t PLC_thread; -static pthread_mutex_t python_wait_mutex = PTHREAD_MUTEX_INITIALIZER; -static pthread_mutex_t python_mutex = PTHREAD_MUTEX_INITIALIZER; -static pthread_mutex_t debug_wait_mutex = PTHREAD_MUTEX_INITIALIZER; -static pthread_mutex_t debug_mutex = PTHREAD_MUTEX_INITIALIZER; - -int PLC_shutdown = 0; +void PLCThreadSignalHandler(int sig) +{ + if (sig == SIGUSR2) + pthread_exit(NULL); +} int ForceSaveRetainReq(void) { return PLC_shutdown; @@ -89,30 +91,79 @@ void PLC_thread_proc(void *arg) { while (!PLC_shutdown) { - sem_wait(&Run_PLC); + // Sleep until next PLC run + // TODO check result of clock_nanosleep and wait again or exit eventually + int res = clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &next_abs_time, NULL); + if(res==EINTR){ + continue; + } + if(res!=0){ + printf("PLC thread died with error %d \n", res); + return; + } + PLC_GetTime(&__CURRENT_TIME); __run(); + inc_timespec(&next_abs_time, period_ns); } pthread_exit(0); } +#define _LogError(text,...) \ + {\ + char mstr[256];\ + snprintf(mstr, 255, text, ##__VA_ARGS__);\ + LogMessage(LOG_CRITICAL, mstr, strlen(mstr));\ + } #define maxval(a,b) ((a>b)?a:b) int startPLC(int argc,char **argv) { - struct sigevent sigev; - setlocale(LC_NUMERIC, "C"); + + int ret; + pthread_attr_t *pattr = NULL; + +#ifdef REALTIME_LINUX + struct sched_param param; + pthread_attr_t attr; + + /* Lock memory */ + ret = mlockall(MCL_CURRENT|MCL_FUTURE); + if(ret == -1) { + _LogError("mlockall failed: %m\n"); + return ret; + } + + /* Initialize pthread attributes (default values) */ + ret = pthread_attr_init(&attr); + if (ret) { + _LogError("init pthread attributes failed\n"); + return ret; + } + + /* Set scheduler policy and priority of pthread */ + ret = pthread_attr_setschedpolicy(&attr, SCHED_FIFO); + if (ret) { + _LogError("pthread setschedpolicy failed\n"); + return ret; + } + param.sched_priority = PLC_THREAD_PRIORITY; + ret = pthread_attr_setschedparam(&attr, ¶m); + if (ret) { + _LogError("pthread setschedparam failed\n"); + return ret; + } + + /* Use scheduling parameters of attr */ + ret = pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED); + if (ret) { + _LogError("pthread setinheritsched failed\n"); + return ret; + } + + pattr = &attr; +#endif PLC_shutdown = 0; - sem_init(&Run_PLC, 0, 0); - - pthread_create(&PLC_thread, NULL, (void*) &PLC_thread_proc, NULL); - - memset (&sigev, 0, sizeof (struct sigevent)); - sigev.sigev_value.sival_int = 0; - sigev.sigev_notify = SIGEV_THREAD; - sigev.sigev_notify_attributes = NULL; - sigev.sigev_notify_function = PLC_timer_notify; - pthread_mutex_init(&debug_wait_mutex, NULL); pthread_mutex_init(&debug_mutex, NULL); pthread_mutex_init(&python_wait_mutex, NULL); @@ -121,14 +172,26 @@ pthread_mutex_lock(&debug_wait_mutex); pthread_mutex_lock(&python_wait_mutex); - timer_create (CLOCK_MONOTONIC, &sigev, &PLC_timer); - if( __init(argc,argv) == 0 ){ - PLC_SetTimer(common_ticktime__,common_ticktime__); - + if((ret = __init(argc,argv)) == 0 ){ + + /* Signal to wakeup PLC thread when period changes */ + signal(SIGUSR1, PLCThreadSignalHandler); + /* Signal to end PLC thread */ + signal(SIGUSR2, PLCThreadSignalHandler); /* install signal handler for manual break */ signal(SIGINT, catch_signal); + + /* initialize next occurence and period */ + period_ns = common_ticktime__; + clock_gettime(CLOCK_MONOTONIC, &next_abs_time); + + ret = pthread_create(&PLC_thread, pattr, (void*) &PLC_thread_proc, NULL); + if (ret) { + _LogError("create pthread failed\n"); + return ret; + } }else{ - return 1; + return ret; } return 0; } @@ -154,11 +217,9 @@ { /* Stop the PLC */ PLC_shutdown = 1; - sem_post(&Run_PLC); - PLC_SetTimer(0,0); - pthread_join(PLC_thread, NULL); - sem_destroy(&Run_PLC); - timer_delete (PLC_timer); + /* Order PLCThread to exit */ + pthread_kill(PLC_thread, SIGUSR2); + pthread_join(PLC_thread, NULL); __cleanup(); pthread_mutex_destroy(&debug_wait_mutex); pthread_mutex_destroy(&debug_mutex); @@ -196,7 +257,7 @@ /*__DEBUG is protected by this mutex */ __DEBUG = !disable; if (disable) - pthread_mutex_unlock(&debug_mutex); + pthread_mutex_unlock(&debug_mutex); return 0; } @@ -237,6 +298,7 @@ } struct RT_to_nRT_signal_s { + int used; pthread_cond_t WakeCond; pthread_mutex_t WakeCondLock; }; @@ -245,7 +307,7 @@ #define _LogAndReturnNull(text) \ {\ - char mstr[256] = text " for ";\ + char mstr[256] = text " for ";\ strncat(mstr, name, 255);\ LogMessage(LOG_CRITICAL, mstr, strlen(mstr));\ return NULL;\ @@ -254,9 +316,10 @@ void *create_RT_to_nRT_signal(char* name){ RT_to_nRT_signal_t *sig = (RT_to_nRT_signal_t*)malloc(sizeof(RT_to_nRT_signal_t)); - if(!sig) - _LogAndReturnNull("Failed allocating memory for RT_to_nRT signal"); - + if(!sig) + _LogAndReturnNull("Failed allocating memory for RT_to_nRT signal"); + + sig->used = 1; pthread_cond_init(&sig->WakeCond, NULL); pthread_mutex_init(&sig->WakeCondLock, NULL); @@ -266,10 +329,10 @@ void delete_RT_to_nRT_signal(void* handle){ RT_to_nRT_signal_t *sig = (RT_to_nRT_signal_t*)handle; - pthread_cond_destroy(&sig->WakeCond); - pthread_mutex_destroy(&sig->WakeCondLock); - - free(sig); + pthread_mutex_lock(&sig->WakeCondLock); + sig->used = 0; + pthread_cond_signal(&sig->WakeCond); + pthread_mutex_unlock(&sig->WakeCondLock); } int wait_RT_to_nRT_signal(void* handle){ @@ -277,7 +340,14 @@ RT_to_nRT_signal_t *sig = (RT_to_nRT_signal_t*)handle; pthread_mutex_lock(&sig->WakeCondLock); ret = pthread_cond_wait(&sig->WakeCond, &sig->WakeCondLock); + if(!sig->used) ret = -EINVAL; pthread_mutex_unlock(&sig->WakeCondLock); + + if(!sig->used){ + pthread_cond_destroy(&sig->WakeCond); + pthread_mutex_destroy(&sig->WakeCondLock); + free(sig); + } return ret; }
--- a/targets/Win32/plc_Win32_main.c Mon Feb 27 13:47:36 2023 +0100 +++ b/targets/Win32/plc_Win32_main.c Tue Feb 28 09:39:51 2023 +0100 @@ -82,7 +82,6 @@ { unsigned long thread_id = 0; BOOL tmp; - setlocale(LC_NUMERIC, "C"); debug_sem = CreateSemaphore( NULL, // default security attributes
--- a/targets/beremiz.h Mon Feb 27 13:47:36 2023 +0100 +++ b/targets/beremiz.h Tue Feb 28 09:39:51 2023 +0100 @@ -32,4 +32,13 @@ int unblock_RT_to_nRT_signal(void* handle); void nRT_reschedule(void); + +#ifdef REALTIME_LINUX + +#ifndef PLC_THREAD_PRIORITY +#define PLC_THREAD_PRIORITY 80 #endif + +#endif + +#endif
--- a/targets/plc_debug.c Mon Feb 27 13:47:36 2023 +0100 +++ b/targets/plc_debug.c Tue Feb 28 09:39:51 2023 +0100 @@ -270,7 +270,7 @@ default: break; } - force_list_apply_cursor++; \ + force_list_apply_cursor++; } /* Reset buffer cursor */
--- a/tests/projects/svghmi/svghmi_0@svghmi/svghmi.svg Mon Feb 27 13:47:36 2023 +0100 +++ b/tests/projects/svghmi/svghmi_0@svghmi/svghmi.svg Tue Feb 28 09:39:51 2023 +0100 @@ -136,11 +136,11 @@ inkscape:current-layer="hmi0" showgrid="false" units="px" - inkscape:zoom="0.40092403" - inkscape:cx="2333.0807" - inkscape:cy="1015.6842" - inkscape:window-width="1600" - inkscape:window-height="836" + inkscape:zoom="2.2679688" + inkscape:cx="1135.0439" + inkscape:cy="130.37028" + inkscape:window-width="1850" + inkscape:window-height="1036" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -149,6 +149,33 @@ inkscape:snap-global="true" inkscape:snap-bbox="true" inkscape:bbox-nodes="true" /> + <rect + y="-800" + x="1480" + height="720" + width="1280" + id="rect1282" + style="color:#000000;fill:#000000" + inkscape:label="HMI:Page:ScreenSaver:20:u="nobody"@u=user_role" /> + <g + transform="translate(-1072.3531,-845.86571)" + inkscape:label="HMI:VarInit:"admin"@user_role" + id="g304"> + <text + id="text302" + y="-108.39357" + x="3726.6924" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="-108.39357" + x="3726.6924" + id="tspan298" + sodipodi:role="line">declaration of user_level HMI local variable</tspan><tspan + id="tspan300" + y="-85.060234" + x="3726.6924" + sodipodi:role="line">(not a PLC variable)</tspan></text> + </g> <use x="0" y="0" @@ -6568,6 +6595,18 @@ id="tspan947-2-1" sodipodi:role="line">Back</tspan></text> </g> + <text + inkscape:label="HMI:Display@user_role" + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.03883362px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="1258.67" + y="-99.803093" + id="text296"><tspan + sodipodi:role="line" + id="tspan294" + x="1258.67" + y="-99.803093" + style="text-align:end;text-anchor:end;stroke-width:1px">user</tspan></text> </g> <text xml:space="preserve" @@ -7867,7 +7906,7 @@ </g> </g> <g - transform="translate(73.327079,-819.60552)" + transform="translate(73.327079,-879.60552)" inkscape:label="HMI:Jump:Freq0" id="g1294-6"> <g @@ -8582,14 +8621,6 @@ sodipodi:role="line">Home</tspan></text> </g> </g> - <rect - y="-800" - x="1480" - height="720" - width="1280" - id="rect1282" - style="color:#000000;fill:#000000" - inkscape:label="HMI:Page:ScreenSaver:12" /> <g id="g1280" transform="matrix(4.3157423,0,0,4.3157423,1737.4823,-785.25938)" @@ -8872,4 +8903,54 @@ id="tspan1503-0" /></text> </g> </g> + <text + inkscape:label="HMI:Display@user_role" + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.03883362px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + x="2680.3477" + y="-398.63266" + id="text296-3"><tspan + sodipodi:role="line" + id="tspan294-6" + x="2680.3477" + y="-398.63266" + style="text-align:end;text-anchor:end;stroke-width:1px;fill:#ffff00;">user</tspan></text> + <text + inkscape:label="HMI:Display@user_role" + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.03883362px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="1258.5922" + y="703.35767" + id="text296-3-7"><tspan + sodipodi:role="line" + id="tspan294-6-5" + x="1258.5922" + y="703.35767" + style="text-align:end;text-anchor:end;fill:#ffff00;stroke-width:1px">user</tspan></text> + <g + id="g242" + inkscape:label="HMI:Assign:u="admin"@u=user_role" + transform="matrix(0.699363,0,0,0.699363,-1374.9838,537.10221)" + style="stroke-width:1.42987263"> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffa32a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.40424299;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect236" + width="225.46321" + height="70.051811" + x="3457.5356" + y="99.406891" + ry="30.536264" + rx="30.536266" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:56.68354416px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.42987251px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="3570.8057" + y="153.18002" + id="text240"><tspan + style="stroke-width:1.42987251px" + sodipodi:role="line" + id="tspan238" + x="3570.8057" + y="153.18002">login</tspan></text> + </g> </svg>