Skip to content

Commit b844983

Browse files
ChristopheHDChristopheHD
authored
2.0.0
2 parents 6c5eba7 + 80c352d commit b844983

File tree

6 files changed

+56
-25
lines changed

6 files changed

+56
-25
lines changed

‎.github/workflows/builder.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: Check out repository
26-
uses: actions/checkout@v4.2.2
26+
uses: actions/checkout@v6.0.2
2727

2828
- name: Login to GitHub Container Registry
2929
uses: docker/[email protected]
@@ -33,7 +33,7 @@ jobs:
3333
password: ${{ secrets.GITHUB_TOKEN }}
3434

3535
- name: Build add-on
36-
uses: home-assistant/builder@2025.09.0
36+
uses: home-assistant/builder@2025.11.0
3737
with:
3838
args: |
3939
--${{ matrix.arch }} \

‎.github/workflows/lint.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Lint
33
on:
44
pull_request:
55
branches:
6-
- main
6+
- master
77

88
permissions:
99
contents: read
@@ -16,11 +16,11 @@ jobs:
1616
addons: ${{ steps.addons.outputs.addons_list }}
1717
steps:
1818
- name: ⤵️ Check out code from GitHub
19-
uses: actions/checkout@v4.2.2
19+
uses: actions/checkout@v6.0.2
2020

2121
- name: 🔍 Find add-on directories
2222
id: addons
23-
uses: home-assistant/actions/helpers/find-addons@1.0.0
23+
uses: home-assistant/actions/helpers/find-addons@master
2424

2525
lint:
2626
name: Lint add-on ${{ matrix.path }}
@@ -31,9 +31,9 @@ jobs:
3131
path: ${{ fromJson(needs.find.outputs.addons) }}
3232
steps:
3333
- name: ⤵️ Check out code from GitHub
34-
uses: actions/checkout@v4.2.2
34+
uses: actions/checkout@v6.0.1
3535

3636
- name: 🚀 Run Home Assistant Add-on Lint
37-
uses: frenck/action-addon-linter@v2.18.0
37+
uses: frenck/action-addon-linter@v2.21.0
3838
with:
3939
path: "./${{ matrix.path }}"

‎addon/CHANGELOG.md‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
## 2.0.0
2+
3+
### ✨ What's New
4+
5+
- MSC telegrams (Manufacturer Specific Communication) are now supported and can be added to custom mappings (https://github.com/ChristopheHD/enocean/pull/25)
6+
- Nodon repeater configuration ([Wiki page](https://github.com/ChristopheHD/HA_enoceanmqtt-addon/wiki/Nodon#repeater-mode)) (https://github.com/ChristopheHD/HA_enoceanmqtt-addon/discussions/78)
7+
8+
### 🚀 What's Improved
9+
10+
- [HA mapping yaml](https://github.com/ChristopheHD/HA_enoceanmqtt/blob/develop/enoceanmqtt/overlays/homeassistant/mapping.yaml) indentation corrected thanks to @H4rryK4ne (https://github.com/ChristopheHD/HA_enoceanmqtt/pull/31)
11+
12+
### 🔧 What's Fixed
13+
14+
- F6-02-01 RPS telegram decoding failure thanks to @Hugo-HoB (https://github.com/mak-gitdev/HA_enoceanmqtt/pull/173)
15+
- Broken link in the documentation tab (https://github.com/ChristopheHD/HA_enoceanmqtt-addon/issues/88)
16+
- Removed false error parsing value in the logs (https://github.com/ChristopheHD/HA_enoceanmqtt-addon/issues/57)
17+
18+
### 🛑 What's Removed
19+
20+
- MQTT password is not logged anymore for security reasons (https://github.com/ChristopheHD/HA_enoceanmqtt-addon/pull/87)
21+
22+
### 👏 New Contributors
23+
24+
- @H4rryK4ne made their first contribution
25+
- @Hugo-HoB made their first contribution
26+
127
## 1.0.1
228

329
### 🔧 What's Fixed

‎addon/DOCS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Configuration
22

3-
1. Create a configuration file enoceanmqtt.devices ([sample](https://github.com/ChristopheHD/HA_enoceanmqtt-addon/blob/master/addon-dev/enoceanmqtt.devices.sample)) in the configuration folder of Home Assistant
3+
1. Create a configuration file enoceanmqtt.devices ([sample](https://github.com/ChristopheHD/HA_enoceanmqtt-addon/blob/master/addon/enoceanmqtt.devices.sample)) in the configuration folder of Home Assistant
44
2. Select the enocean key in the list
55
3. Leave the MQTT broker configuration empty if you want to use your Home Assistant Mosquitto broker parameters.
66

‎addon/config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: "EnOcean MQTT"
33
description: "EnOcean to MQTT bridge"
44
url: "https://github.com/ChristopheHD/HA_enoceanmqtt-addon"
5-
version: "1.0.1"
5+
version: "2.0.0"
66
slug: "ha_enoceanmqtt_aseracorp"
77
homeassistant: "2024.2.0"
88
init: false

‎addon/run.sh‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ MAPPING_FILE="$(bashio::config 'mapping_files.mapping_file')"
1919
export MAPPING_FILE
2020
bashio::log.blue "Retrieved devices file: $DEVICE_FILE"
2121

22-
# Retrieve enOcean key connection parameters
22+
# Retrieve EnOcean key connection parameters
2323
ENOCEAN_PORT=""
2424
if ! bashio::config.is_empty 'enocean_tcp'; then
2525
ENOCEAN_PORT="$(bashio::config 'enocean_tcp')"
@@ -33,10 +33,10 @@ fi
3333
export ENOCEAN_PORT
3434

3535
# Retrieve MQTT connection parameters
36-
MQTT_HOST=
37-
MQTT_PORT=
38-
MQTT_USER=
39-
MQTT_PSWD=
36+
MQTT_HOST=""
37+
MQTT_PORT=""
38+
MQTT_USER=""
39+
MQTT_PSWD=""
4040
if ! bashio::config.is_empty 'mqtt.host'; then
4141
MQTT_HOST="$(bashio::config 'mqtt.host')"
4242
export MQTT_HOST
@@ -78,7 +78,11 @@ if [ -z "${MQTT_HOST}" ] || \
7878
bashio::log.blue "mqtt_host = $MQTT_HOST"
7979
bashio::log.blue "mqtt_port = $MQTT_PORT"
8080
bashio::log.blue "mqtt_user = $MQTT_USER"
81-
bashio::log.blue "mqtt_pwd = $MQTT_PSWD"
81+
if bashio::var.has_value "${MQTT_PSWD}"; then
82+
bashio::log.blue "mqtt_pwd = ******"
83+
else
84+
bashio::log.blue "mqtt_pwd = "
85+
fi
8286
bashio::exit.nok "MQTT broker connection not fully configured"
8387
fi
8488

@@ -97,23 +101,24 @@ MQTT_DISCOVERY_PREFIX="${MQTT_DISCOVERY_PREFIX%/}/"
97101

98102
{
99103
echo "[CONFIG]"
100-
echo "enocean_port = $ENOCEAN_PORT"
104+
echo "enocean_port = ${ENOCEAN_PORT}"
101105
echo "log_packets = $(bashio::config 'logging.log_packets')"
102106
echo "overlay = HA"
103-
echo "db_file = $DB_FILE"
104-
echo "mapping_file = $MAPPING_FILE"
105-
echo "mqtt_discovery_prefix = $MQTT_DISCOVERY_PREFIX"
106-
echo "mqtt_host = $MQTT_HOST"
107-
echo "mqtt_port = $MQTT_PORT"
107+
echo "db_file = ${DB_FILE}"
108+
echo "mapping_file = ${MAPPING_FILE}"
109+
echo "mqtt_discovery_prefix = ${MQTT_DISCOVERY_PREFIX}"
110+
echo "mqtt_host = ${MQTT_HOST}"
111+
echo "mqtt_port = ${MQTT_PORT}"
108112
echo "mqtt_client_id = $(bashio::config 'mqtt.client_id')"
109113
echo "mqtt_keepalive = $(bashio::config 'mqtt.keepalive')"
110-
echo "mqtt_prefix = $MQTT_PREFIX"
111-
echo "mqtt_user = $MQTT_USER"
112-
echo "mqtt_pwd = $MQTT_PSWD"
114+
echo "mqtt_prefix = ${MQTT_PREFIX}"
115+
echo "mqtt_user = ${MQTT_USER}"
116+
echo "mqtt_pwd = ${MQTT_PSWD}"
113117
echo "mqtt_debug = $(bashio::config 'debug')"
114118
echo ""
115119
cat "$DEVICE_FILE"
116-
} > $CONFIG_FILE
120+
} > "${CONFIG_FILE}"
121+
bashio::log.debug "Configuration written to ${CONFIG_FILE}"
117122

118123
# Delete previous session log
119124
rm -f "$LOG_FILE"

0 commit comments

Comments
 (0)