mirror of
https://github.com/PiBrewing/craftbeerpi4.git
synced 2024-11-25 08:28:23 +01:00
pyfiglet to version 1.0.2 and adaption in system controller to show ip address correctly
This commit is contained in:
parent
550f6551ac
commit
aa069c713c
4 changed files with 7 additions and 7 deletions
|
@ -1,3 +1,3 @@
|
||||||
__version__ = "4.2.0.a6"
|
__version__ = "4.2.0.a7"
|
||||||
__codename__ = "Indian Summer"
|
__codename__ = "Indian Summer"
|
||||||
|
|
||||||
|
|
|
@ -219,12 +219,12 @@ class SystemController:
|
||||||
for nic, addrs in ethernet.items():
|
for nic, addrs in ethernet.items():
|
||||||
if nic == "eth0":
|
if nic == "eth0":
|
||||||
for addr in addrs:
|
for addr in addrs:
|
||||||
if str(addr.family) == "AddressFamily.AF_INET":
|
if str(addr.family) == "AddressFamily.AF_INET" or str(addr.family) == "2":
|
||||||
if addr.address:
|
if addr.address:
|
||||||
eth0IP = addr.address
|
eth0IP = addr.address
|
||||||
if nic == "wlan0":
|
if nic == "wlan0":
|
||||||
for addr in addrs:
|
for addr in addrs:
|
||||||
if str(addr.family) == "AddressFamily.AF_INET":
|
if str(addr.family) == "AddressFamily.AF_INET" or str(addr.family) == "2":
|
||||||
if addr.address:
|
if addr.address:
|
||||||
wlan0IP = addr.address
|
wlan0IP = addr.address
|
||||||
info = psutil.net_if_stats()
|
info = psutil.net_if_stats()
|
||||||
|
|
|
@ -11,7 +11,7 @@ cryptography==41.0.4
|
||||||
pyopenssl==23.2.0
|
pyopenssl==23.2.0
|
||||||
requests==2.31.0
|
requests==2.31.0
|
||||||
voluptuous==0.13.1
|
voluptuous==0.13.1
|
||||||
pyfiglet==0.8.post1
|
pyfiglet==1.0.2
|
||||||
pandas==1.5.3
|
pandas==1.5.3
|
||||||
shortuuid==1.0.11
|
shortuuid==1.0.11
|
||||||
tabulate==0.9.0
|
tabulate==0.9.0
|
||||||
|
@ -20,7 +20,7 @@ cbpi4gui
|
||||||
click==8.1.3
|
click==8.1.3
|
||||||
importlib_metadata==4.11.1
|
importlib_metadata==4.11.1
|
||||||
aiomqtt==1.0.0
|
aiomqtt==1.0.0
|
||||||
psutil==5.9.4
|
psutil==5.9.6
|
||||||
zipp>=0.5
|
zipp>=0.5
|
||||||
colorama==0.4.6
|
colorama==0.4.6
|
||||||
pytest-aiohttp
|
pytest-aiohttp
|
||||||
|
|
4
setup.py
4
setup.py
|
@ -51,14 +51,14 @@ setup(name='cbpi4',
|
||||||
"pyopenssl==23.2.0",
|
"pyopenssl==23.2.0",
|
||||||
"requests==2.31.0",
|
"requests==2.31.0",
|
||||||
"voluptuous==0.13.1",
|
"voluptuous==0.13.1",
|
||||||
"pyfiglet==0.8.post1",
|
"pyfiglet==1.0.2",
|
||||||
'click==8.1.3',
|
'click==8.1.3',
|
||||||
'shortuuid==1.0.11',
|
'shortuuid==1.0.11',
|
||||||
'tabulate==0.9.0',
|
'tabulate==0.9.0',
|
||||||
'aiomqtt==1.0.0',
|
'aiomqtt==1.0.0',
|
||||||
'inquirer==3.1.1',
|
'inquirer==3.1.1',
|
||||||
'colorama==0.4.6',
|
'colorama==0.4.6',
|
||||||
'psutil==5.9.4',
|
'psutil==5.9.6',
|
||||||
'cbpi4gui',
|
'cbpi4gui',
|
||||||
'importlib_metadata',
|
'importlib_metadata',
|
||||||
'numpy==1.24.1',
|
'numpy==1.24.1',
|
||||||
|
|
Loading…
Reference in a new issue