3 Commits

Author SHA1 Message Date
4af20a9a91 Add packaging script 2025-06-20 14:25:15 +02:00
b0bd5f446f Finish V3.1.1 version bump 2025-06-20 14:13:59 +02:00
265288106e Fix issue with config parsing for filtering of cable 2025-06-20 14:07:26 +02:00
5 changed files with 53 additions and 9 deletions

View File

@@ -9,7 +9,7 @@ Only Version 3.1 and later are supported due to the poor code quality of V2.3.0
| Version | Supported | | Version | Supported |
| ------- | ------------------ | | ------- | ------------------ |
| 3.1.X | ✅ | | 3.1.X | ✅ |
| 3.0.X | | | 3.0.X | |
| 2.3.0 | ❎ | | 2.3.0 | ❎ |
| 2.2.0 | ❎ | | 2.2.0 | ❎ |
| 2.1.0 | ❎ | | 2.1.0 | ❎ |

View File

@@ -120,12 +120,12 @@ class BiogasControllerApp(MDApp):
def build(self): def build(self):
# Configure com # Configure com
filters = [ filters = [
x x.strip()
for x in read_config( for x in read_config(
"Connection", "Connection",
"filters", "filters",
"USB-Serial Controller, Prolific USB-Serial Controller", "USB-Serial Controller; Prolific USB-Serial Controller",
).split(",") ).split(";")
] ]
baudrate = int( baudrate = int(
@@ -163,7 +163,7 @@ class BiogasControllerApp(MDApp):
print("\n", "-" * 20, "\n") print("\n", "-" * 20, "\n")
self.icon = "./BiogasControllerAppLogo.png" self.icon = "./BiogasControllerAppLogo.png"
self.title = "BiogasControllerApp-V3.1.0" self.title = "BiogasControllerApp-V3.1.1"
self.screen_manager.add_widget(HomeScreen(com, name="home")) self.screen_manager.add_widget(HomeScreen(com, name="home"))
self.screen_manager.add_widget(MainScreen(com, name="main")) self.screen_manager.add_widget(MainScreen(com, name="main"))
self.screen_manager.add_widget(ProgramScreen(com, name="program")) self.screen_manager.add_widget(ProgramScreen(com, name="program"))
@@ -189,7 +189,7 @@ if __name__ == "__main__":
━━━━━━━━━━━┏━┛┃━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┃┃━━┃┃━━ ━━━━━━━━━━━┏━┛┃━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┃┃━━┃┃━━
━━━━━━━━━━━┗━━┛━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┗┛━━┗┛━━ ━━━━━━━━━━━┗━━┛━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┗┛━━┗┛━━
Version 3.1.0 Version 3.1.1
=> Initializing.... => Initializing....
""" """

View File

@@ -2,8 +2,8 @@
port_override = None port_override = None
baudrate = 19200 baudrate = 19200
# List the names as which the adapter cable will show up separated by commas below # List the names as which the adapter cable will show up separated by commas below
# For ENATECH, the below is likely correct. # For ENATECH, the below is likely correct. The name cannot contain a semicolon
filters = USB-Serial Controller, Prolific USB-Serial Controller filters = USB-Serial Controller; Prolific USB-Serial Controller
[UI] [UI]
height = 600 height = 600

View File

@@ -40,7 +40,7 @@
on_release: root.quit() on_release: root.quit()
MDLabel: MDLabel:
text: "You are running version V3.1.0" text: "You are running version V3.1.1"
font_size: 13 font_size: 13
pos_hint: {"y": -0.45, "x":0} pos_hint: {"y": -0.45, "x":0}
halign: 'center' halign: 'center'

44
package.sh Executable file
View File

@@ -0,0 +1,44 @@
#!/bin/sh
# packaging script
rm -rf ./build/
rm -rf ./dist/
# build windows package
wine pyinstaller BiogasControllerApp.spec
if [ $? -ne 0 ]; then
echo -e "\nBuild unsuccessful, aborting..."
exit 1
fi
# Build successful
cp -r ./gui ./dist
cp -r ./lib ./dist
cp ./biogascontrollerapp.py ./dist/
cp ./BiogasControllerAppLogo.png ./dist/
cp ./changelog ./dist/
cp ./config.ini ./dist/
cp ./README.md ./dist/
cp ./requirements.txt ./dist/
cp ./SECURITY.md ./dist/
# Remove build directories
rm -rf ./build/
rm -rf ./dist/biogascontrollerapp/
# Create Windows archive (zip)
zip -9r BiogasControllerApp-Windows.zip ./dist
# Create Linux archive (tar)
rm ./dist/BiogasControllerApp.exe
cp ./install-linux.sh ./dist/
cp ./launch.sh ./dist/
ouch compress -y ./dist/ biogascontrollerapp-linux.tar.gz
rm -rf ./dist
echo "Done!"