From f303708992a7cca910b3cf72a106c323d3fdf8de Mon Sep 17 00:00:00 2001 From: lolouk44 Date: Thu, 26 Nov 2020 09:53:54 +0000 Subject: [PATCH 1/7] 0.1.13b --- CHANGELOG.md | 4 ---- Dockerfile | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1294a95..ad884c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,3 @@ -## [0.1.13] - 2020-11-26 -### Changed -- Fixed MQTT Discovery Message - ## [0.1.12] - 2020-11-23 ### Changed - Updated workflow to automatically build docker images on new releases with version and latest tags diff --git a/Dockerfile b/Dockerfile index 7b02881..3c615a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM python:3.8-slim WORKDIR /opt/miscale COPY src /opt/miscale -RUN apt-get update && apt-get install no-install-recommends -y \ +RUN apt-get update && apt-get install --no-install-recommends -y \ bluez \ python-pip \ libglib2.0-dev && \ From c386f973718d38c0196bddd1099fb4ca429c4633 Mon Sep 17 00:00:00 2001 From: lolouk44 Date: Thu, 26 Nov 2020 11:42:31 +0000 Subject: [PATCH 2/7] 0.1.114c --- Dockerfile | 2 +- src/Xiaomi_Scale.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c615a4..4e33141 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM python:3.8-slim WORKDIR /opt/miscale COPY src /opt/miscale -RUN apt-get update && apt-get install --no-install-recommends -y \ +RUN apt-get update && apt-get install -y \ bluez \ python-pip \ libglib2.0-dev && \ diff --git a/src/Xiaomi_Scale.py b/src/Xiaomi_Scale.py index 398e512..58cf233 100644 --- a/src/Xiaomi_Scale.py +++ b/src/Xiaomi_Scale.py @@ -193,7 +193,7 @@ OLD_MEASURE = '' def discovery(): for MQTTUser in (USER1_NAME,USER2_NAME,USER3_NAME): message = '{"name": "' + MQTTUser + ' Weight",' - message+= '"state_topic": "' + MQTT_PREFIX + '/' + MQTTUser + '/weight","value_template": "{{ value_json['weight'] }}",' + message+= '"state_topic": "' + MQTT_PREFIX + '/' + MQTTUser + '/weight","value_template": "{{ value_json.weight }}",' message+= '"json_attributes_topic": "' + MQTT_PREFIX + '/' + MQTTUser + '/weight","icon": "mdi:scale-bathroom"}' publish.single( MQTT_DISCOVERY_PREFIX + '/sensor/' + MQTT_PREFIX + '/' + MQTTUser + '/config', From 589d4ceafc9e542834a2952fd077b77683e1b47e Mon Sep 17 00:00:00 2001 From: lolouk44 Date: Thu, 26 Nov 2020 12:28:34 +0000 Subject: [PATCH 3/7] 0.1.113 --- .github/workflows/main.yml | 1 + CHANGELOG.md | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 78c0368..4b06265 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,6 +28,7 @@ jobs: run: | docker buildx build --no-cache --push \ --tag lolouk44/xiaomi-mi-scale:${{ github.event.release.tag_name }} \ + --tag lolouk44/xiaomi-mi-scale:latest \ --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8 . - name: Image digest diff --git a/CHANGELOG.md b/CHANGELOG.md index ad884c0..1294a95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [0.1.13] - 2020-11-26 +### Changed +- Fixed MQTT Discovery Message + ## [0.1.12] - 2020-11-23 ### Changed - Updated workflow to automatically build docker images on new releases with version and latest tags From 441084f57475fac4c11fe2172a46695ed4c0607e Mon Sep 17 00:00:00 2001 From: lolouk44 Date: Thu, 26 Nov 2020 15:43:01 +0000 Subject: [PATCH 4/7] 0.1.14a --- .github/workflows/main.yml | 2 +- Dockerfile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4b06265..3cd069f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,7 @@ jobs: run: | docker buildx build --no-cache --push \ --tag lolouk44/xiaomi-mi-scale:${{ github.event.release.tag_name }} \ - --tag lolouk44/xiaomi-mi-scale:latest \ + --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8 . - name: Image digest diff --git a/Dockerfile b/Dockerfile index 4e33141..9e137cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,8 @@ FROM python:3.8-slim WORKDIR /opt/miscale COPY src /opt/miscale -RUN apt-get update && apt-get install -y \ +RUN apt-get update && apt-get install --no-install-recommends -y \ + build-essential \ bluez \ python-pip \ libglib2.0-dev && \ From dcaedf1cfd8b8fd7d55458e0b558346e2c53e792 Mon Sep 17 00:00:00 2001 From: lolouk44 Date: Thu, 26 Nov 2020 15:54:57 +0000 Subject: [PATCH 5/7] 0.1.14b --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3cd069f..78c0368 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,6 @@ jobs: run: | docker buildx build --no-cache --push \ --tag lolouk44/xiaomi-mi-scale:${{ github.event.release.tag_name }} \ - --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8 . - name: Image digest From 6542a02525b5f6b7c32e2c0cea97eb00b91be584 Mon Sep 17 00:00:00 2001 From: lolouk44 Date: Thu, 26 Nov 2020 16:11:46 +0000 Subject: [PATCH 6/7] 0.1.14 --- .github/workflows/main.yml | 1 + CHANGELOG.md | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 78c0368..4b06265 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,6 +28,7 @@ jobs: run: | docker buildx build --no-cache --push \ --tag lolouk44/xiaomi-mi-scale:${{ github.event.release.tag_name }} \ + --tag lolouk44/xiaomi-mi-scale:latest \ --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8 . - name: Image digest diff --git a/CHANGELOG.md b/CHANGELOG.md index 1294a95..abca157 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [0.1.14] - 2020-11-26 +### Changed +- Reduced docker image size + ## [0.1.13] - 2020-11-26 ### Changed - Fixed MQTT Discovery Message From a5ddd5d334fd1968baabd510ef93d47484d31fbb Mon Sep 17 00:00:00 2001 From: lolouk44 Date: Thu, 10 Dec 2020 11:36:55 +0000 Subject: [PATCH 7/7] Update wrapper.sh --- src/wrapper.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/wrapper.sh b/src/wrapper.sh index a0d2002..c8f556d 100644 --- a/src/wrapper.sh +++ b/src/wrapper.sh @@ -2,7 +2,15 @@ sleep 60 # Give the system time after a reboot to connect to WiFi before continuing export MISCALE_MAC=00:00:00:00:00:00 # Mac address of your scale -export MQTT_PREFIX=miScale +export HCI_DEV=hci0 # Bluetooth hci device to use +export MQTT_HOST=127.0.0.1 # MQTT Server (defaults to 127.0.0.1) +export MQTT_PREFIX=miscale # MQTT Topic Prefix. Defaults to miscale +export MQTT_USERNAME= # Username for MQTT server (comment out if not required) +export MQTT_PASSWORD= # Password for MQTT (comment out if not required) +export MQTT_PORT=1883 # Defaults to 1883 +export TIME_INTERVAL=30 # Time in sec between each query to the scale, to allow other applications to use the Bluetooth module. Defaults to 30 +export MQTT_DISCOVERY=true # Home Assistant Discovery (true/false), defaults to true +export MQTT_DISCOVERY_PREFIX= # Home Assistant Discovery Prefix, defaults to homeassistant export USER1_GT=70 # If the weight is greater than this number, we'll assume that we're weighing User #1 export USER1_SEX=male