fredlcore / BSB-LAN

LAN/WiFi interface for Boiler-System-Bus (BSB) and Local Process Bus (LPB) and Punkt-zu-Punkt Schnittstelle (PPS) with a Siemens® controller used by Elco®, Brötje® and similar heating systems
220 stars 83 forks source link

Fix broken merge for PRs 567 and 570 #578

Closed DE-cr closed 1 year ago

DE-cr commented 1 year ago

Since both 567 and 570 had been accepted, I'll combine the fix for their only partly successful merge here. (The changes in indentation only are from 571. They don't have any effect, but bring the master repo in sync with my fork / recent PRs.)

With these changes, the master repo will be in sync with the code I've successfully tested on my system, and which I've been running without problems for weeks now.

Please merge.