monster/aqara-mqtt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from monster1025/master

Browse Source 
Changes from upstream
This commit is contained in:
Eugene Burtsev
2018-02-17 15:48:15 +03:00
committed by GitHub
parent 012dfdf9e4 f0eda582e1
commit 3561d4e595
8 changed files with 162 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.semver
+1
View File
@@ -0,0 +1 @@
1.0.1
.travis.yml
+117
View File
@@ -0,0 +1,117 @@
sudo: true
language: python
services:
- docker
env:
global:
- PROJECT=aqara-mqtt
- IMAGE_NAME=$DOCKER_USERNAME/$PROJECT
- VERSION=$(cat .semver)
- MAJOR=$(cut -d. -f1 .semver)
- MINOR=$(cut -d. -f2 .semver)
- PATCH=$(cut -d. -f3 .semver)
jobs:
include:
- stage: build x64 image
before_script:
- ARCH=x64
script:
# build
- docker build -t $PROJECT -f Dockerfile-$ARCH .
# push image
- >
if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
#1.0.0-arch
docker tag $PROJECT $IMAGE_NAME:$VERSION-$ARCH
docker push $IMAGE_NAME:$VERSION-$ARCH
#1.0-arch
docker tag $PROJECT $IMAGE_NAME:$MAJOR.$MINOR-$ARCH
docker push $IMAGE_NAME:$MAJOR.$MINOR-$ARCH
#1-arch
docker tag $PROJECT $IMAGE_NAME:$MAJOR-$ARCH
docker push $IMAGE_NAME:$MAJOR-$ARCH
#latest by arch
docker tag $PROJECT $IMAGE_NAME:$ARCH
docker push $IMAGE_NAME:$ARCH
fi
- stage: build i386 image
before_script:
- ARCH=i386
script:
# build
- docker build -t $PROJECT -f Dockerfile-$ARCH .
# push image
- >
if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
#1.0.0-arch
docker tag $PROJECT $IMAGE_NAME:$VERSION-$ARCH
docker push $IMAGE_NAME:$VERSION-$ARCH
#1.0-arch
docker tag $PROJECT $IMAGE_NAME:$MAJOR.$MINOR-$ARCH
docker push $IMAGE_NAME:$MAJOR.$MINOR-$ARCH
#1-arch
docker tag $PROJECT $IMAGE_NAME:$MAJOR-$ARCH
docker push $IMAGE_NAME:$MAJOR-$ARCH
#latest by arch
docker tag $PROJECT $IMAGE_NAME:$ARCH
docker push $IMAGE_NAME:$ARCH
fi
- stage: build armhf image
before_script:
- ARCH=armhf
script:
# prepare qemu
- docker run --rm --privileged multiarch/qemu-user-static:register --reset
# get qemu-arm-static binary
- >
mkdir tmp &&
pushd tmp &&
curl -L -o qemu-arm-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/v2.6.0/qemu-arm-static.tar.gz &&
tar xzf qemu-arm-static.tar.gz &&
popd
#copy it to container
- sed -i -e '2iCOPY tmp/qemu-arm-static /usr/bin/qemu-arm-static\' Dockerfile-$ARCH
# build
- docker build -t $PROJECT -f Dockerfile-$ARCH .
# push image
- >
if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
#1.0.0-arch
docker tag $PROJECT $IMAGE_NAME:$VERSION-$ARCH
docker push $IMAGE_NAME:$VERSION-$ARCH
#1.0-arch
docker tag $PROJECT $IMAGE_NAME:$MAJOR.$MINOR-$ARCH
docker push $IMAGE_NAME:$MAJOR.$MINOR-$ARCH
#1-arch
docker tag $PROJECT $IMAGE_NAME:$MAJOR-$ARCH
docker push $IMAGE_NAME:$MAJOR-$ARCH
#latest by arch
docker tag $PROJECT $IMAGE_NAME:$ARCH
docker push $IMAGE_NAME:$ARCH
fi
Dockerfile-armhf
+15
View File
@@ -0,0 +1,15 @@
FROM arm32v7/python:slim
ENV LIBRARY_PATH=/lib:/usr/lib
ADD src/requirements.txt /
RUN apt-get update && apt-get install -y build-essential autoconf \
&& pip install --upgrade pip && pip install -r /requirements.txt \
&& apt-get remove -y build-essential autoconf \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /app
COPY src /app
CMD ["python3", "-u", "/app/main.py"]
Dockerfile-rpi
-11
View File
@@ -1,11 +0,0 @@
FROM alpine-python:latest
ENV LIBRARY_PATH=/lib:/usr/lib
ADD src/requirements.txt /
RUN pip install --upgrade pip && pip install -r /requirements.txt
WORKDIR /app
COPY src /app
CMD ["python3", "-u", "/app/main.py"]
README.md
+7 -1
View File
@@ -14,6 +14,12 @@ will turn on plug/heater and translate devices state from gateway:
"home/plug/heater/status" on
```
## Architecture
Docker image support following architectures (you must choose your architecture in docker-compose):
- armhf (raspberry pi 3, arm32v7)
- i386 (x86 pc)
- x64 (x64 pc)
## Config
Edit file config/config-sample.yaml and rename it to config/config.yaml
@@ -21,7 +27,7 @@ Edit file config/config-sample.yaml and rename it to config/config.yaml
Sample docker-compose.yaml file for user:
```
aqara:
image: monster1025/aqara-mqtt
image: monster1025/aqara-mqtt:1-armhf
container_name: aqara
volumes:
- "./config:/app/config"
config/config-sample.yaml
+2
View File
@@ -4,6 +4,8 @@ mqtt:
username: username
password: passw0rd
prefix: home
#send report as json
json: False
gateway:
password: passw0rd
docker-compose.yaml
+1 -2
View File
@@ -1,6 +1,5 @@
aqara:
build: .
dockerfile: Dockerfile-rpi
image: monster1025/aqara-mqtt:1-armhf
container_name: aqara
volumes:
- "./config:/app/config"
src/mqtt.py
+16 -5
View File
@@ -8,6 +8,7 @@ import json
_LOGGER = logging.getLogger(__name__)
class Mqtt:
event_based_sensors = ["switch", "cube"]
username = ""
password = ""
server = "localhost"
@@ -38,6 +39,7 @@ class Mqtt:
self.server = mqttConfig.get("server", "localhost")
self.port = mqttConfig.get("port", 1883)
self.prefix = mqttConfig.get("prefix", "home")
self.json = mqttConfig.get("json", False)
self._queue = Queue()
self._threads = []
@@ -72,8 +74,6 @@ class Mqtt:
model = sidprops.get("model",model)
sid = sidprops.get("name",sid)
# _LOGGER.info("data is " + format(data))
PATH_FMT = self.prefix + "/{model}/{sid}/{prop}"
for key, value in data.items():
# fix for latest motion value
if (model == "motion" and key == "no_motion"):
@@ -82,15 +82,26 @@ class Mqtt:
if (model == "magnet" and key == "no_close"):
key="status"
value="open"
# do not retain event-based sensors (like switches and cubes).
if (model in ["switch", "cube"]):
if (model in self.event_based_sensors):
retain = False
# fix for rgb format
if (key == "rgb" and self._is_int(value)):
value = self._color_xiaomi_to_rgb(value)
if self.json == True:
PATH_FMT = self.prefix + "/{model}/{sid}/json"
topic = PATH_FMT.format(model=model, sid=sid)
values = {}
values['sid'] = sid
for key, value in data.items():
values[key] = value
jsondata = json.dumps(values)
_LOGGER.info("Publishing message to topic " + topic + ": " + str(jsondata) + ".")
self._client.publish(topic, payload=jsondata, qos=0, retain=retain)
else:
for key, value in data.items():
PATH_FMT = self.prefix + "/{model}/{sid}/{prop}"
topic = PATH_FMT.format(model=model, sid=sid, prop=key)
_LOGGER.info("Publishing message to topic " + topic + ": " + str(value) + ".")
self._client.publish(topic, payload=value, qos=0, retain=retain)