-
Notifications
You must be signed in to change notification settings - Fork 203
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- extended minimal display to support second CP (for DUO)
- merge max scale setting for multiple display themes - extend max scale setting for minimal display theme - allow max scale setting even if configured as blind CP E3DC Driver... Für Openwb 2.0 muss offensichtlich der die type Variable dem Verzeichnissnamen entsprechen , sonst Absturz im Online beim konfigurieren Bei der Verarbeitung des Befehls 'addDevice' mit den Parametern '[object Object]' ist ein Fehler aufgetreten: Es ist ein interner Fehler aufgetreten: Traceback (most recent call last): File "/var/www/html/openWB/packages/helpermodules/command.py", line 112, in on_message func(connection_id, payload) File "/var/www/html/openWB/packages/helpermodules/command.py", line 123, in addDevice dev = importlib.import_module(".devices."+payload["data"]["type"]+".device", "modules") File "/usr/lib/python3.9/importlib/__init__.py", line 127, in import_module return _bootstrap._gcd_import(name[level:], package, level) File "", line 1030, in _gcd_import File "", line 1007, in _find_and_load File "", line 972, in _find_and_load_unlocked File "", line 228, in _call_with_frames_removed File "", line 1030, in _gcd_import File "", line 1007, in _find_and_load File "", line 984, in _find_and_load_unlocked ModuleNotFoundError: No module named 'modules.devices.E3DC' Für openwb 1.9 keine Auswirkungen new isss for buchse master (#2550) * new isss for daemon * review * renaming Bump version 1.9.290 Bump version 1.9.291 batterx: fix ids remove unneccessary log msg refine duo display
Showing
18 changed files
with
1,413 additions
and
769 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,19 @@ | ||
<?php | ||
|
||
$result = ''; | ||
$lines = file($_SERVER['DOCUMENT_ROOT'].'/openWB/openwb.conf'); | ||
foreach($lines as $line) { | ||
if(strpos($line, "displayaktiv=") !== false) { | ||
list(, $displayaktivold) = explode("=", $line); | ||
} | ||
if(strpos($line, "displaylp1max=") !== false) { | ||
list(, $displaylp1maxold) = explode("=", $line); | ||
} | ||
// if(strpos($line, "displaylp2max=") !== false) { | ||
// list(, $displaylp2maxold) = explode("=", $line); | ||
// } | ||
if(strpos($line, "rfidakt=") !== false) { | ||
list(, $rfidaktold) = explode("=", $line); | ||
} | ||
if(strpos($line, "isss=") !== false) { | ||
list(, $isssold) = explode("=", $line); | ||
} | ||
} | ||
?> | ||
<?php | ||
|
||
$result = ''; | ||
$lines = file($_SERVER['DOCUMENT_ROOT'].'/openWB/openwb.conf'); | ||
foreach($lines as $line) { | ||
if(strpos($line, "displaylp1max=") !== false) { | ||
list(, $displaylp1maxold) = explode("=", $line); | ||
} | ||
if(strpos($line, "displaylp2max=") !== false) { | ||
list(, $displaylp2maxold) = explode("=", $line); | ||
} | ||
if(strpos($line, "rfidakt=") !== false) { | ||
list(, $rfidaktold) = explode("=", $line); | ||
} | ||
if(strpos($line, "lastmanagement=") !== false) { | ||
list(, $lastmanagementold) = explode("=", $line); | ||
} | ||
} | ||
?> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
1.9.289 | ||
1.9.291 |