250427.1

Author: graham-trott

config.ecs

@@ -16,19 +16,18 @@
     layout HLayout
     groupbox Group
     label Label
-    label MasterDeviceLabel
     label RelayStateLabel
     label StatusLabel
     pushbutton ResetConfigButton
-    pushbutton ScanNetworkButton
-    pushbutton SelectMasterButton
-    pushbutton SelectSlaveButton
+    pushbutton ScanDevicesButton
+    pushbutton ClearSystemButton
     pushbutton DeleteSlaveButton
-    pushbutton UpdateSlaveButton
+    pushbutton UpdateDeviceButton
     pushbutton DeleteFileButton
     pushbutton ExitButton
     pushbutton ScanSystemsButton
     pushbutton RemoveSystemButton
+    pushbutton MasterDeviceButton
     pushbutton RelayOffButton
     pushbutton RelayOnButton
     pushbutton SaveWidgetDataButton
@@ -59,25 +58,21 @@
 
     create LeftPanel type QVBoxLayout
     add LeftPanel to MainPanel
-    create ResetConfigButton text `Reset config`
+    create ResetConfigButton text `Reset everything`
     on click ResetConfigButton go to ResetConfigFileClick
     add ResetConfigButton to LeftPanel
 
-    create ScanNetworkButton text `Scan network`
-    on click ScanNetworkButton go to ScanNetworkClick
-    add ScanNetworkButton to LeftPanel
+    create ClearSystemButton text `Clear the selected system`
+    on click ClearSystemButton go to ClearSystemClick
+    add ClearSystemButton to LeftPanel
 
-    create SelectMasterButton text `Select master`
-    on click SelectMasterButton go to SelectMasterClick
-    add SelectMasterButton to LeftPanel
+    create ScanDevicesButton text `Scan for devices`
+    on click ScanDevicesButton go to ScanNetworkClick
+    add ScanDevicesButton to LeftPanel
 
-    create SelectSlaveButton text `Select slave`
-    on click SelectSlaveButton go to SelectSlaveClick
-    add SelectSlaveButton to LeftPanel
-
-    create UpdateSlaveButton text `Update slave`
-    on click UpdateSlaveButton go to UpdateSlaveClick
-    add UpdateSlaveButton to LeftPanel
+    create UpdateDeviceButton text `Update device`
+    on click UpdateDeviceButton go to UpdateDeviceClick
+    add UpdateDeviceButton to LeftPanel
 
     create DeleteFileButton text `Delete file`
     add DeleteFileButton to LeftPanel
@@ -107,7 +102,7 @@
     create SystemsCombo
     on select SystemsCombo go to SystemsComboSelect
     add stretch SystemsCombo to Layout
-    create ScanSystemsButton text `Scan`
+    create ScanSystemsButton text `System Scan`
     disable ScanSystemsButton
     on click ScanSystemsButton go to ScanSystemsClick
     add ScanSystemsButton to Layout
@@ -122,8 +117,9 @@
     add Group to RightPanel
     create Layout type QHBoxLayout
     add Layout to Group
-    create MasterDeviceLabel text `(none)`
-    add MasterDeviceLabel to Layout
+    create MasterDeviceButton text `(none)`
+    add MasterDeviceButton to Layout
+    on click MasterDeviceButton go to MasterDeviceClick
 
     ! Create the Slave Devices group
     create Group title `Slave devices`
@@ -133,6 +129,7 @@
     add Layout to Group
     create SlaveList
     add SlaveList to Layout
+    on select SlaveList go to SelectSlaveClick
 
     ! Create the Selected Device group
     create Group title `Selected device`
@@ -246,6 +243,7 @@
     variable MasterDevice
     variable MasterSSID
     variable MasterIPAddr
+    variable MasterDeviceName
     variable SlaveDevices
     variable RBRFlag
     variable Keys
@@ -260,6 +258,13 @@
 !   The main program starts here
 Start:
 
+!   Disable various buttons
+    disable ClearSystemButton
+    disable ScanDevicesButton
+    disable DeleteSlaveButton
+    disable UpdateDeviceButton
+    disable DeleteFileButton
+
 !   Load the main config file or create one if there is none
     put trim system `echo $HOME` cat `/.rbr.conf` into ConfigFile
     load Config from ConfigFile
@@ -311,28 +316,87 @@ Start:
     if Name is not empty
     begin
         select Name in SystemsCombo
+        enable ClearSystemButton
         gosub to SetupSystem
     end
 
     enable ScanSystemsButton
+    enable ScanDevicesButton
     stop
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !   Event handlers
 ResetConfigFileClick:
-    delete file ConfigFile
-    disable ScanSystemsButton
-    go to Start
+    create MessageBox on Window
+        style question
+        title `Master reset`
+        message `This will remove all information. Continue?`
+    show MessageBox giving Value
+    if Value is `Yes`
+    begin
+        delete file ConfigFile
+        disable RemoveSystemButton
+        set the text of MasterDeviceButton to `(none)`
+        clear SlaveList
+        go to Start
+    end
+    stop
 
-SelectMasterClick:
-    log `Select the master device`
+ClearSystemClick:
+    create MessageBox on Window
+        style question
+        title `System clear`
+        message `This will remove all devices from ` cat SystemsCombo 
+            cat `. Continue?`
+    show MessageBox giving Value
+    if Value is `Yes`
+    begin
+        put SystemsCombo into Name
+        put property Name of Systems into SystemConfig
+        put property `mac` of SystemConfig into MAC
+        put property `password` of SystemConfig into Password
+        put json `{}` into Devices
+        set property `devices` of SystemConfig to Devices
+        set property Name of Systems to SystemConfig
+        set property `systems` of Config to Systems
+        post stringify SystemConfig to
+            `https://rbrheating.com/ui/resources/php/rest.php/config/`
+                cat MAC cat `/` cat Password
+        or begin
+            log `I couldn't post the config file`
+            stop
+        end
+        disable RemoveSystemButton
+        set the text of MasterDeviceButton to `(none)`
+        clear SlaveList
+    end
+    stop
+
+ScanNetworkClick:
+    log `Scan the network for new devices`
+    stop
+
+MasterDeviceClick:
+    log MasterDeviceButton
+    if MasterDeviceButton is not empty
+    begin
+        log `Select the master device`
+        set the text of DeviceNameInput to MasterDeviceName
+        enable UpdateDeviceButton
+        enable DeleteFileButton
+        disable DeleteSlaveButton
+    end
     stop
 
 SelectSlaveClick:
-    log `Select a slave device`
+    log `Select ` cat SlaveList
+    set the text of DeviceNameInput to SlaveList
+    enable UpdateDeviceButton
+    enable DeleteSlaveButton
+    enable DeleteFileButton
     stop
 
-UpdateSlaveClick:
+UpdateDeviceClick:
     log `Update the files om the selected device`
     stop
 
@@ -344,12 +408,6 @@ DeleteSlaveClick:
     log `Delete the selected slave device`
     stop
 
-ExitClick:
-    log `Exit the configurator`
-    save stringify Config to ConfigFile
-    close Window
-    exit
-
 ScanSystemsClick:
     log `Scan systems`
     gosub to ScanSystems
@@ -358,7 +416,9 @@ ScanSystemsClick:
     stop
 
 SystemsComboSelect:
-    set property `current` of Config to SystemsCombo
+    put SystemsCombo into Name
+    set property `current` of Config to Name
+    gosub to SetupSystem
     stop
 
 RemoveSystemClick:
@@ -367,7 +427,7 @@ RemoveSystemClick:
     create MessageBox on Window
         style question
         title `Remove system`
-        message `Are you sure you want to remove ` cat Name cat `?`
+        message `Continue you want to remove ` cat Name cat `?`
     show MessageBox giving Value
     if Value is `Yes`
     begin
@@ -394,6 +454,12 @@ RelayOnClick:
     log `Turn the relay ON`
     stop
 
+ExitClick:
+    log `Exit the configurator`
+    save stringify Config to ConfigFile
+    close Window
+    exit
+
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !   Subroutines
 
@@ -542,6 +608,7 @@ ScanSystems:
         gosub to Working
         get Result from url `http://` cat IPAddr cat `:17348/cgi-bin/mac.py` timeout 1 or go to SS2
         put trim Result into Result
+        log IPAddr cat `: ` cat Result
         put the position of ` ` in Result into P
         put left P of Result into MAC
         increment P
@@ -579,7 +646,9 @@ GetConfigData:
         or log `Can't read the config file for ` cat Name
 !        log Value cat newline
         put json Value into Value
-        set property `devices` of SystemConfig to property `devices` of Value
+        if Value has property `devices`
+            set property `devices` of SystemConfig to property `devices` of Value
+        else set property `devices` of SystemConfig to json `{}`
         set property Name of Systems to SystemConfig
         increment S
     end
@@ -604,11 +673,14 @@ RefreshSystemsCombo:
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !   Set up the system, given its name
 SetupSystem:
+    if Name is empty return
     put property Name of Systems into System
     put property `devices` of System into Devices
     put the keys of Devices into Keys
     put empty into MasterDevice
+    set the text of MasterDeviceButton to `(none)`
     put json `[]` into SlaveDevices
+    clear SlaveList
     put 0 into D
     while D is less than the count of Keys
     begin
@@ -619,7 +691,8 @@ SetupSystem:
             put Device into MasterDevice
             put property `ssid` of MasterDevice into MasterSSID
             put property `ipaddr` of MasterDevice into MasterIPAddr
-            set the text of MasterDeviceLabel to MasterSSID cat ` ` cat Name cat ` ` cat MasterIPAddr
+            put Name into MasterDeviceName
+            set the text of MasterDeviceButton to MasterSSID cat ` ` cat MasterIPAddr cat ` ` cat Name
         end
         else
         begin

dist/easycoder-250425.1-py2.py3-none-any.whl renamed to dist/easycoder-250427.1-py2.py3-none-any.whl

@@ -9,4 +9,4 @@
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250425.1"
+__version__ = "250427.1"

dist/easycoder-250425.1.tar.gz renamed to dist/easycoder-250427.1.tar.gz

@@ -168,7 +168,7 @@ def compileToken(self):
 					self.rewindTo(mark)
 			else:
 				self.rewindTo(mark)
-		FatalError(self, f'Unable to compile "{token}" (in this context)')
+		FatalError(self, f'Unable to compile this "{token}" command. Perhaps a syntax error?')
 
 	# Compile a single command
 	def compileOne(self):

easycoder/__init__.py

@@ -424,7 +424,9 @@ def r_createLabel(self, command, record):
         return self.nextPC()
 
     def r_createPushbutton(self, command, record):
-        pushbutton = QPushButton(self.getRuntimeValue(command['text']))
+        text = self.getRuntimeValue(command['text'])
+        pushbutton = QPushButton(text)
+        pushbutton.setAccessibleName(text)
         if 'size' in command:
             fm = pushbutton.fontMetrics()
             c = pushbutton.contentsMargins()
@@ -689,7 +691,7 @@ def r_select(self, command):
         return self.nextPC()
 
     # set [the] height [of] {groupbox} [to] {height}
-    # set [the] text [of] {label}/{button} [to] {text}
+    # set [the] text [of] {label}/{button}/{lineinput} [to] {text}
     def k_set(self, command):
         self.skip('the')
         token = self.nextToken()
@@ -709,7 +711,7 @@ def k_set(self, command):
             self.skip('of')
             if self.nextIsSymbol():
                 record = self.getSymbolRecord()
-                if record['keyword'] in ['label', 'pushbutton']:
+                if record['keyword'] in ['label', 'pushbutton', 'lineinput']:
                     command['name'] = record['name']
                     self.skip('to')
                     command['value'] = self.nextValue()
@@ -723,8 +725,12 @@ def r_set(self, command):
             groupbox = self.getVariable(command['name'])['widget']
             groupbox.setFixedHeight(self.getRuntimeValue(command['value']))
         elif what == 'text':
+            record = self.getVariable(command['name'])
             widget = self.getVariable(command['name'])['widget']
-            widget.setText(self.getRuntimeValue(command['value']))
+            text = self.getRuntimeValue(command['value'])
+            widget.setText(text)
+            if record['keyword'] == 'pushbutton':
+                widget.setAccessibleName(text)
         return self.nextPC()
 
     # show {window}
@@ -861,7 +867,13 @@ def modifyValue(self, value):
     def v_symbol(self, symbolRecord):
         symbolRecord = self.getVariable(symbolRecord['name'])
         keyword = symbolRecord['keyword']
-        if keyword == 'lineinput':
+        if keyword == 'pushbutton':
+            pushbutton = symbolRecord['widget']
+            v = {}
+            v['type'] = 'text'
+            v['content'] = pushbutton.accessibleName()
+            return v
+        elif keyword == 'lineinput':
             lineinput = symbolRecord['widget']
             v = {}
             v['type'] = 'text'
@@ -873,6 +885,13 @@ def v_symbol(self, symbolRecord):
             v['type'] = 'text'
             v['content'] = combobox.currentText()
             return v
+        elif keyword == 'listbox':
+            listbox = symbolRecord['widget']
+            content = listbox.currentItem().text()
+            v = {}
+            v['type'] = 'text'
+            v['content'] = content
+            return v
         return None
 
     def v_count(self, v):