easycoder 250506.1__tar.gz → 250507.2__tar.gz

{easycoder-250506.1 → easycoder-250507.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easycoder
-Version: 250506.1
+Version: 250507.2
 Summary: Rapid scripting in English
 Keywords: compiler,scripting,prototyping,programming,coding,python,low code,hypertalk,computer language,learn to code
 Author-email: Graham Trott <gtanyware@gmail.com>

{easycoder-250506.1 → easycoder-250507.2}/easycoder/__init__.py

@@ -9,4 +9,4 @@ from .ec_program import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250506.1"
+__version__ = "250507.2"

{easycoder-250506.1 → easycoder-250507.2}/easycoder/ec_classes.py

@@ -8,6 +8,10 @@ class FatalError:
 		print(f'Compile error in {compiler.program.name} at line {lino + 1} ({script}): {message}')
 		sys.exit()
 
+class NoValueError(FatalError):
+	def __init__(self, compiler, record):
+		super().__init__(compiler, 'Variable {record["name"]} does not hold a value')
+
 class AssertionError:
 	def __init__(self, program, msg=None):
 		code = program.code[program.pc]
@@ -30,6 +34,10 @@ class RuntimeError:
 			print(f'Runtime Error in {program.name} at line {lino + 1} ({script}): {message}')
 			sys.exit()
 
+class NoValueRuntimeError(RuntimeError):
+	def __init__(self, program, record):
+		super().__init__(program, 'Variable {record["name"]} does not hold a value')
+
 class RuntimeWarning:
 	def __init__(self, program, message):
 		if program == None:

{easycoder-250506.1 → easycoder-250507.2}/easycoder/ec_core.py

@@ -2,7 +2,7 @@ import json, math, hashlib, threading, os, subprocess, sys, requests, time, numb
 from psutil import Process
 from datetime import datetime, timezone
 from random import randrange
-from .ec_classes import FatalError, RuntimeWarning, RuntimeError, AssertionError, Condition, Object
+from .ec_classes import FatalError, RuntimeWarning, RuntimeError, AssertionError, NoValueError, NoValueRuntimeError, Condition, Object
 from .ec_handler import Handler
 from .ec_timestamp import getTimestamp
 
@@ -94,7 +94,7 @@ class Core(Handler):
                     command['target'] = symbolRecord['name']
                     self.add(command)
                     return True
-                self.warning(f'Core.append: Variable "{symbolRecord["name"]}" does not hold a value')
+                self.warning(f'Core.append: Variable {symbolRecord["name"]} does not hold a value')
         return False
 
     def r_append(self, command):
@@ -251,7 +251,7 @@ class Core(Handler):
                 command['target'] = self.getToken()
                 self.add(command)
                 return True
-            self.warning(f'Core.decrement: Variable "{symbolRecord["name"]}" does not hold a value')
+            self.warning(f'Core.decrement: Variable {symbolRecord["name"]} does not hold a value')
         return False
 
     def r_decrement(self, command):
@@ -277,7 +277,7 @@ class Core(Handler):
                     command['var'] = record['name']
                     self.add(command)
                     return True
-                FatalError(self.compiler, f'Variable {record['name']} does not hold a value')
+                NoValueError(self.compiler, record)
             self.warning(f'Core.delete: variable expected; got {self.getToken()}')
         else:
             self.warning(f'Core.delete: "file", "property" or "element" expected; got {token}')
@@ -418,7 +418,7 @@ class Core(Handler):
             if symbolRecord['hasValue']:
                 command['target'] = self.getToken()
             else:
-                FatalError(self.compiler, f'Variable "{symbolRecord["name"]}" does not hold a value')
+                NoValueError(self.compiler, symbolRecord)
         if self.nextIs('from'):
             if self.nextIs('url'):
                 url = self.nextValue()
@@ -629,7 +629,7 @@ class Core(Handler):
                 command['target'] = self.getToken()
                 self.add(command)
                 return True
-            self.warning(f'Core.increment: Variable "{symbolRecord["name"]}" does not hold a value')
+            self.warning(f'Core.increment: Variable {symbolRecord["name"]} does not hold a value')
         return False
 
     def r_increment(self, command):
@@ -829,13 +829,13 @@ class Core(Handler):
                 command['target'] = self.getToken()
                 self.add(command)
                 return True
-            self.warning(f'Core.negate: Variable "{symbolRecord["name"]}" does not hold a value')
+            self.warning(f'Core.negate: Variable {symbolRecord["name"]} does not hold a value')
         return False
 
     def r_negate(self, command):
         symbolRecord = self.getVariable(command['target'])
         if not symbolRecord['hasValue']:
-            RuntimeError(self.program, f'{symbolRecord["name"]} does not hold a value')
+            NoValueRuntimeError(self.program, symbolRecord)
             return None
         value = self.getSymbolValue(symbolRecord)
         if value == None:
@@ -937,7 +937,7 @@ class Core(Handler):
     def r_pop(self, command):
         symbolRecord = self.getVariable(command['target'])
         if not symbolRecord['hasValue']:
-            RuntimeError(self.program, f'{symbolRecord["name"]} does not hold a value')
+            NoValueRuntimeError(self.program, symbolRecord)
         stackRecord = self.getVariable(command['from'])
         stack = self.getSymbolValue(stackRecord)
         v = stack.pop()
@@ -1091,7 +1091,7 @@ class Core(Handler):
             return -1
         symbolRecord = self.getVariable(command['target'])
         if not symbolRecord['hasValue']:
-            RuntimeError(self.program, f'{symbolRecord["name"]} does not hold a value')
+            NoValueRuntimeError(self.program, symbolRecord)
             return -1
         self.putSymbolValue(symbolRecord, value)
         return self.nextPC()
@@ -1406,13 +1406,13 @@ class Core(Handler):
                 command['target'] = self.getToken()
                 self.add(command)
                 return True
-            self.warning(f'Core.negate: Variable "{symbolRecord["name"]}" does not hold a value')
+            self.warning(f'Core.negate: Variable {symbolRecord["name"]} does not hold a value')
         return False
 
     def r_shuffle(self, command):
         symbolRecord = self.getVariable(command['target'])
         if not symbolRecord['hasValue']:
-            RuntimeError(self.program, f'{symbolRecord["name"]} does not hold a value')
+            NoValueRuntimeError(self.program, symbolRecord)
             return None
         value = self.getSymbolValue(symbolRecord)
         if value == None:
@@ -1735,7 +1735,7 @@ class Core(Handler):
     def incdec(self, command, mode):
         symbolRecord = self.getVariable(command['target'])
         if not symbolRecord['hasValue']:
-            RuntimeError(self.program, f'{symbolRecord["name"]} does not hold a value')
+            NoValueRuntimeError(self.program, symbolRecord)
         value = self.getSymbolValue(symbolRecord)
         if value == None:
             RuntimeError(self.program, f'{symbolRecord["name"]} has not been initialised')
@@ -1805,7 +1805,7 @@ class Core(Handler):
                     if symbolRecord['hasValue']:
                         value['target'] = symbolRecord['name']
                         return value
-                self.warning(f'Core.compileValue: Token \'{self.getToken()}\' does not hold a value')
+                self.warning(f'Core.compileValue: Token {symbolRecord["name"]} does not hold a value')
             return None
 
         if token == 'property':
@@ -1816,7 +1816,7 @@ class Core(Handler):
                     if symbolRecord['hasValue']:
                         value['target'] = symbolRecord['name']
                         return value
-                    FatalError(self.compiler, 'Variable does not hold a value')
+                    NoValueError(self.compiler, symbolRecord)
             return None
 
         if token == 'arg':

{easycoder-250506.1 → easycoder-250507.2}/easycoder/ec_pyside.py

@@ -1,5 +1,5 @@
 import sys
-from easycoder import Handler, FatalError, RuntimeError
+from easycoder import Handler, RuntimeError
 from PySide6.QtCore import Qt, QTimer
 from PySide6.QtGui import QPixmap
 from PySide6.QtWidgets import (
@@ -690,7 +690,7 @@ class Graphics(Handler):
             command['index'] = self.nextValue()
             self.skip('of')
         else:
-            command['name'] = self.nextValue()
+            command['name'] = self.getValue()
             self.skip('in')
         if self.nextIsSymbol():
             record = self.getSymbolRecord()
@@ -878,7 +878,6 @@ class Graphics(Handler):
         
     def r_start(self, command):
         def on_last_window_closed():
-            print("Kill the application...")
             self.program.kill()
         def resume():
             self.program.flush(self.nextPC())

easycoder-250506.1/config.ecs → easycoder-250507.2/rbrconf.ecs

@@ -1,6 +1,6 @@
-!   config.ecs
+!   rbrconf.ecs
 
-    script Configurator
+    script RBRConfigurator
 
     use graphics
 
@@ -109,7 +109,6 @@
     create Layout type QHBoxLayout
     add Layout to Group
     create SystemsCombo
-    on select SystemsCombo go to SystemsComboSelect
     add stretch SystemsCombo to Layout
     create ScanSystemsButton text `System Scan`
     disable ScanSystemsButton
@@ -294,6 +293,7 @@
     variable Pin
     variable D
     variable F
+    variable K
     variable N
     variable P
     variable S
@@ -319,6 +319,8 @@ Start:
     put empty into SystemIPAddr
     clear DeviceSelected
 
+    gosub to SetBusy
+
 !   Get the host SSID
     put `Getting host SSID...` into StatusMessage
     gosub to Working
@@ -352,17 +354,17 @@ Start:
     if the count of SystemsCombo is 0 put empty into SystemName
     else
     begin
-        put the keys of Systems into Keys
-        put element 0 of Keys into SystemName
-    end
-    set property `current-system` of Config to SystemName
-    if SystemName is not empty
-    begin
-        select SystemName in SystemsCombo
-        enable ClearSystemButton
+        put property `current-system` of Config into SystemName
+        if SystemName is not empty
+        begin
+            select SystemName in SystemsCombo
+!            log prettify SystemConfig
+            gosub to SelectSystem
+        end
     end
 
     gosub to ManageButtonStates
+    on select SystemsCombo go to SystemsComboSelect
     stop
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -403,13 +405,13 @@ ScanSystemsClick:
     stop
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!   Scan the network for RBR system controllers
+!   Scan the local network for RBR system controllers
 ScanSystems:
     log `Scan systems`
     put trim system `hostname -I` into MyIPAddr
     log MyIPAddr
-    put 245 into N
-    while N is less than 250
+    put 1 into N
+    while N is less than 255
     begin
         put the position of the last `.` in MyIPAddr into P
         increment P
@@ -420,7 +422,6 @@ ScanSystems:
         get Result from url `http://` cat IPAddr cat `:17348/cgi-bin/mac.py` timeout 1 or go to SS2
         increment Count
         put trim Result into Result
-        log Result
         log IPAddr cat `: ` cat Result
         put the position of ` ` in Result into P
         put left P of Result into SystemMAC
@@ -438,15 +439,17 @@ ScanSystems:
         set property `password` of SystemConfig to SystemPassword
         set property `devices` of SystemConfig to json `{}`
         log `Adding ` cat SystemName cat ` to Systems`
-        gosub UpdateSystems
-        log prettify SystemConfig
         gosub to GetConfigData
+!        log prettify SystemConfig
+        set property SystemName of Systems to SystemConfig
     SS2:
         wait 10 ticks
         increment N
     end
     set property `current-system` of Config to SystemName
-    log `After scan: ` cat prettify Config
+    gosub to UpdateSystems
+!    log `After scan: ` cat prettify Config
+    gosub to PostConfigData
     go to OK
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -454,8 +457,8 @@ ScanSystems:
 GetConfigData:
     gosub to SetBusy
     if SystemName is empty return
+    log prettify SystemConfig
     log `Get the config data for ` cat SystemName
-    put property `devices` of SystemConfig into Devices
     get Value from url `https://rbrheating.com/ui/resources/php/rest.php/config/`
         cat SystemMAC cat `/` cat SystemPassword
     or
@@ -463,16 +466,30 @@ GetConfigData:
         put `Can't read the config file for ` cat SystemName cat `(` cat MAC cat `/` cat Password cat `)` into StatusMessage
         go to Error
     end
-    ! If the server has data, use it instead of the local config
+!    log Value
+    ! If the server has data, copy it into the local config
+    if Value is `""` put empty into Value
     if Value is empty put `{}` into Value
     if Value is not `{}`
     begin
-        log `Use config data from the server`
-        put json Value into SystemConfig
-        gosub to UpdateSystems
+        log `Add config data from the server`
+        put json Value into Value
+!        log prettify Value
+        put the keys of Value into Keys
+        put 0 into K
+        while K is less than the count of Keys
+        begin
+            put element K of Keys into Name
+            log `Adding ` cat Name cat ` ` cat property Name of Value
+!            if Name is `ssid` set property `host-ssid` of SystemConfig to property Name of Value
+!            else if Name is `password` set property `host-password` of SystemConfig to property Name of Value
+!            else
+            set property Name of SystemConfig to property Name of Value
+            increment K
+        end
     end
-!    log prettify SystemConfig
-    gosub to PostConfigData
+    gosub to UpdateSystems
+    put property `devices` of SystemConfig into Devices
     return
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -496,19 +513,25 @@ RefreshSystemsCombo:
 SystemsComboSelect:
     gosub to ResumeSystemController
     put SystemsCombo into SystemName
-    if SystemName is not empty
-    begin
-        log `Select system ` cat SystemName
-        set property `current-system` of Config to SystemName
-        put property SystemName of Systems into SystemConfig
-        put property `ipaddr` of SystemConfig into SystemIPAddr
-        gosub to PopulateSystemInfo
-        gosub to PauseSystemController
-    end
+    if SystemName is not empty gosub to SelectSystem
     gosub to ManageButtonStates
     if not ErrorFlag gosub to OK
     stop
 
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!   Select a system
+SelectSystem:
+    log `Select system ` cat SystemName
+    set property `current-system` of Config to SystemName
+    put property SystemName of Systems into SystemConfig
+    put property `ipaddr` of SystemConfig into SystemIPAddr
+    put property `mac` of SystemConfig into SystemMAC
+    put property `password` of SystemConfig into SystemPassword
+    gosub to PopulateSystemInfo
+    gosub to PostConfigData
+    gosub to PauseSystemController
+    return
+
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !   Remove a system from the combo box
 RemoveSystemClick:
@@ -525,6 +548,9 @@ RemoveSystemClick:
         remove the current item from SystemsCombo
         delete property SystemName of Systems
         put empty into SystemName
+        put empty into SystemConfig
+        set the text of MasterDeviceButton to empty
+        clear SlaveList
         set property `current-system` of Config to SystemsCombo
         set property `systems` of Config to Systems
         put empty into SystemHostSSID
@@ -862,26 +888,48 @@ CreateDevice:
 PopulateSystemInfo:
     log `Populate fields for ` cat SystemName
     put property `host-ssid` of SystemConfig into SystemHostSSID
+    put property `host-password` of SystemConfig into Password
     if SystemHostSSID is not HostSSID
     begin
-        put property SystemHostSSID of Hosts into Password
-        put `Connect to host ` cat SystemHostSSID cat ` with password ` cat Password into StatusMessage
+        put `Different host SSID: ` cat SystemHostSSID into StatusMessage
         gosub to Working
-        put system `nmcli dev wifi connect ` cat SystemHostSSID cat ` password ` cat Password into SystemCallResult
-        split SystemCallResult on ` `
-        if the elements of SystemCallResult is greater than 2
+        create MessageBox on Window
+            style question
+            title `Move system`
+            message `Shall I move the system to the current host (` cat HostSSID cat `)?`
+        show MessageBox giving Value
+        if Value is `Yes`
+        begin
+            put HostSSID into SystemHostSSID
+            set property `host-ssid` of SystemConfig to HostSSID
+            set property `host-password` of SystemConfig to HostPassword
+            gosub to UpdateSystems
+        end
+        else
         begin
-            index SystemCallResult to 2
-            if SystemCallResult is `successfully`
+            put SystemHostSSID into HostSSID
+            put Password into HostPassword
+            put system `nmcli dev wifi connect ` cat HostSSID cat ` password ` cat HostPassword into SystemCallResult
+            split SystemCallResult on ` `
+            if the elements of SystemCallResult is greater than 2
             begin
-                put SystemHostSSID into HostSSID
-                put HostSSID into CurrentSSID
-                put `Connected to ` cat HostSSID into StatusMessage
-                go to Idle
+                index SystemCallResult to 2
+                if SystemCallResult is `successfully`
+                begin
+                    set property HostSSID of Hosts to HostPassword
+                    set property `hosts` of Config to Hosts
+                    gosub to PostConfigData
+                    put HostSSID into CurrentSSID
+                    put `Connected to ` cat HostSSID into StatusMessage
+                    gosub to Working
+                end
+                else
+                begin
+                    put `Failed to connect to ` cat HostSSID into StatusMessage
+                    go to Error
+                end
             end
         end
-        put `Failed to connect to ` cat HostSSID into StatusMessage
-        go to Error
     end
     put property `mac` of SystemConfig into SystemMAC
     put property `password` of SystemConfig into SystemPassword
@@ -930,7 +978,6 @@ MasterDeviceClick:
         set DeviceSelected
         set IsMaster
         put MasterDevice into Device
-        log prettify Device
         gosub to PopulateDeviceInfo
     end
     gosub to ManageButtonStates
@@ -960,7 +1007,7 @@ PopulateDeviceInfo:
         enable UpdateFilesButton
         enable DeleteFileButton
     end
-    return
+    go to OK
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !   Show information about a slave device
@@ -1193,10 +1240,9 @@ UpdateWidgetDataClick:
 UpdateFilesClick:
     if not DeviceSelected stop
     put property `ssid` of Device into SSID
-    split SSID on ` `
     put from 8 of SSID into MAC
 
-    put FirmwareDirectory cat `files.txt` into Path
+    put FirmwareDirectory cat `/files.txt` into Path
     load Files from Path
     split Files
     put 0 into F
@@ -1222,7 +1268,7 @@ UpdateFilesClick:
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !   Update a single file
 UpdateOneFile:
-    put FirmwareDirectory cat FileName into Path
+    put FirmwareDirectory cat `/` cat FileName into Path
     if file Path exists begin end
     else
     begin
@@ -1252,7 +1298,7 @@ SendFileToDevice:
     put the length of Content into FileSize
     put `Update device file ` cat FileName cat ` (size=` cat FileSize cat ` chars)` into StatusMessage
     gosub to Working
-    wait 2
+    wait 1
     put 0 into Sequence
     put 0 into Start
     put 0 into Total
@@ -1355,16 +1401,16 @@ CheckDevice:
     begin
         put `No response from ` cat Name into StatusMessage
         gosub to Error
-        put 0 into Uptime
+        put `0` into Uptime
     end
     else put from 3 of Response into Uptime
 
 CheckDevice2:
     put the position of ` ` in Uptime into P
-    put left P of Uptime into Uptime
+    if P is greater than 0 put left P of Uptime into Uptime
     log Name cat ` uptime: ` cat Uptime
     set the text of UptimeLabel to Uptime
-    return
+    go to OK
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! Turn a relay OFF
@@ -1377,7 +1423,7 @@ RelayOffClick:
     begin
         put `No response from ` cat Name into StatusMessage
         gosub to Error
-        put 0 into Uptime
+        put `0` into Uptime
     end
     begin
         put from 3 of Response into Uptime
@@ -1397,7 +1443,7 @@ RelayOnClick:
     begin
         put `No response from ` cat Name into StatusMessage
         gosub to Error
-        put 0 into Uptime
+        put `0` into Uptime
     end
     else
     begin
@@ -1465,10 +1511,11 @@ SendMessageToDevice:
         put empty into Response
         return
     end
+!    log URL cat ` - ` cat Response
     return
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!   Get data from a device
+!   Get information about a device
 GetDeviceData:
     put property `name` of Device into Name
     put property `ssid` of Device into SSID
@@ -1485,14 +1532,15 @@ GetDeviceData:
 !   Post the config data
 PostConfigData:
     if CurrentSSID is not HostSSID gosub to ConnectToHost
-    if SystemMAC is empty return
     save prettify Config to ConfigFile
 !    log `Config: ` cat prettify Config
+    if SystemMAC is empty return
+    if SystemConfig is empty return
     put `https://rbrheating.com/ui/resources/php/rest.php/config/` cat SystemMAC cat `/` cat SystemPassword into URL
-    log `Posting SystemConfig to ` cat URL
+!    log URL cat ` ` cat prettify SystemConfig
+!    log `Posting SystemConfig to ` cat URL
     post stringify SystemConfig to URL
-    or
-    begin
+    or begin
         put `I couldn't post the config file` into StatusMessage
         go to Error
     end

easycoder-250506.1/config.py → easycoder-250507.2/rbrconf.py

@@ -1,3 +1,3 @@
 from easycoder import Program
 
-Program('config.ecs').start()
+Program('rbrconf.ecs').start()

easycoder-250506.1/demo.ecs

@@ -1,34 +0,0 @@
-use graphics
-
-window Window
-layout MainPanel
-label Label
-pushbutton Button
-
-! Initialize the graphics environment
-init graphics
-
-! Create a main window
-create MainPanel type QVBoxLayout
-
-! Create a label
-create Label text `Click the button!`
-add Label to MainPanel
-
-! Create a button
-create Button text `Click Me`
-on click Button go to ButtonClick
-add Button to MainPanel
-
-! Create and show the window
-create Window title `Example` size 400 300 layout MainPanel
-show Window
-
-start graphics
-stop
-
-! Event handler for button click
-ButtonClick:
-    set the text of Label to `Button clicked!`
-    stop
-

easycoder-250506.1/group.py

@@ -1,36 +0,0 @@
-from PyQt6.QtWidgets import *
-import sys
-
-class GroupBox(QWidget):
-
-    def __init__(self):
-        QWidget.__init__(self)
-
-        self.setWindowTitle("GroupBox")
-        layout = QGridLayout()
-        self.setLayout(layout)
-
-        groupbox = QGroupBox("GroupBox Example")
-        # groupbox.setCheckable(True)
-        layout.addWidget(groupbox)
-        
-        vbox = QVBoxLayout()
-        groupbox.setLayout(vbox)
-
-        radiobutton = QRadioButton("RadioButton 1")
-        vbox.addWidget(radiobutton)
-        
-        radiobutton = QRadioButton("RadioButton 2")
-        vbox.addWidget(radiobutton)
-
-        radiobutton = QRadioButton("RadioButton 3")
-        vbox.addWidget(radiobutton)
-
-        radiobutton = QRadioButton("RadioButton 4")
-        vbox.addWidget(radiobutton)
-        
-        
-app = QApplication(sys.argv)
-screen = GroupBox()
-screen.show()
-sys.exit(app.exec())