Skip to content

Expanded to all lighting applications - backward compatible #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CABrouwers wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Expanded to all lighting applications - backward compatible #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b7056ce
Improve Windows compatibility
CABrouwers Apr 21, 2022
a1a7e8e
Provide way to bundle option files with the docker image
CABrouwers Apr 21, 2022
ef30f30
Correct bug preventing parsing of XML project file
CABrouwers Apr 21, 2022
155d254
Add option to select a bus network
CABrouwers Apr 23, 2022
01a7ddf
Preparation for multi application
CABrouwers Apr 26, 2022
218c09c
Add "application" argument to SAL class initialization
CABrouwers Apr 26, 2022
4056315
CNI set up for multi applications
CABrouwers Apr 26, 2022
0628774
Expand daemon to handle all Lighting application
CABrouwers Apr 26, 2022
c639d2b
Update label extraction
CABrouwers Apr 26, 2022
6a52e1f
Update Python and packages
CABrouwers Apr 26, 2022
41e74cc
Updated test routines
CABrouwers Apr 26, 2022
1a8946e
Clean obsolete comments
CABrouwers Apr 27, 2022
7fa0ffe
Small update gitignore
CABrouwers Apr 27, 2022
3930360
Removing redundant function
CABrouwers Apr 28, 2022
c48dfbc
Utility function
CABrouwers Apr 29, 2022
c8c4000
Update cmqttd.py
CABrouwers Apr 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,12 @@ example.*
home.*
img
.coverage
cmqttd_config/*.cbz
cmqttd_config/*.pem
cmqttd_config/*.key¸
cmqttd_config/*.xml
cmqttd_config/auth
certificates
.vscode
project.xml
venv
9 changes: 6 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
# $ docker build -t cmqttd .
# $ docker run --device /dev/ttyUSB0 -e "SERIAL_PORT=/dev/ttyUSB0" \
# -e "MQTT_SERVER=192.2.0.1" -e "TZ=Australia/Adelaide" -it cmqttd
FROM alpine:3.11 as base
FROM alpine:edge as base
# python 3.10 required, at date this file is created only available in alpine:edge

# Install most Python deps here, because that way we don't need to include build tools in the
# final image.
RUN apk add --no-cache python3 py3-cffi py3-paho-mqtt py3-six tzdata && \
pip3 install 'pyserial==3.4' 'pyserial_asyncio==0.4'
RUN apk add --no-cache python3 py-pip py3-cffi py3-paho-mqtt py3-six tzdata && \
pip3 install 'pyserial==3.5' 'pyserial_asyncio==0.6'

# Runs tests and builds a distribution tarball
FROM base as builder
Expand All @@ -27,8 +28,10 @@ RUN pip3 install 'parameterized' && \
# cmqttd runner image
FROM base as cmqttd
COPY COPYING COPYING.LESSER Dockerfile README.md entrypoint-cmqttd.sh /
RUN sed -i 's/\r$//' entrypoint-cmqttd.sh
COPY --from=builder /cbus/dist/cbus-0.2.generic.tar.gz /
RUN tar zxf /cbus-0.2.generic.tar.gz && rm /cbus-0.2.generic.tar.gz
COPY cmqttd_config/ /etc/cmqttd/

# Runs cmqttd itself
CMD /entrypoint-cmqttd.sh
6 changes: 6 additions & 0 deletions cbus/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,16 @@ class Application(IntEnum):
LIGHTING_5d = 0x5d
LIGHTING_5e = 0x5e
LIGHTING_LAST = LIGHTING_5f = 0x5f
HVACACTUATOR_73 = 0x73
HVACACTUATOR_74 = 0x74
HVAC = 0xCA
CLOCK = 0xDF
TRIGGER = 0xCA
ENABLE = 0xCB
MASTER_APPLICATION = STATUS_REQUEST = 0xff



class CAL(IntEnum):
RESET = 0x08
RECALL = 0x1a
Expand Down Expand Up @@ -429,3 +434,4 @@ def check_ga(group_addr: int) -> None:
raise ValueError(
'Group Address out of range ({}..{}), got {}'.format(
MIN_GROUP_ADDR, MAX_GROUP_ADDR, group_addr))

Loading