Skip to content

Commit d67bc48

Browse files
authored
Merge branch 'syssi:main' into overshoot_compensation
2 parents 13dfe4a + afb4332 commit d67bc48

19 files changed

+48
-14
lines changed

.github/workflows/ci.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ jobs:
2727
- name: Set up Python
2828
uses: actions/setup-python@v2
2929
with:
30-
python-version: '3.9'
30+
python-version: '3.12'
3131
- name: Cache pip modules
3232
uses: actions/cache@v1
3333
with:
3434
path: ~/.cache/pip
35-
key: esphome-pip-3.9-${{ hashFiles('setup.py') }}
35+
key: esphome-pip-3.12-${{ hashFiles('setup.py') }}
3636
restore-keys: |
37-
esphome-pip-3.9-
37+
esphome-pip-3.12-
3838
3939
- name: 💣 Clone esphome project
4040
run: git clone https://github.com/esphome/esphome.git
@@ -76,14 +76,14 @@ jobs:
7676
- name: Set up Python
7777
uses: actions/setup-python@v2
7878
with:
79-
python-version: '3.9'
79+
python-version: '3.12'
8080
- name: Cache pip modules
8181
uses: actions/cache@v1
8282
with:
8383
path: ~/.cache/pip
84-
key: esphome-pip-3.9-${{ hashFiles('setup.py') }}
84+
key: esphome-pip-3.12-${{ hashFiles('setup.py') }}
8585
restore-keys: |
86-
esphome-pip-3.9-
86+
esphome-pip-3.12-
8787
8888
- name: 💣Clone esphome project
8989
run: git clone https://github.com/esphome/esphome.git
@@ -130,14 +130,14 @@ jobs:
130130
- name: Set up Python
131131
uses: actions/setup-python@v2
132132
with:
133-
python-version: '3.9'
133+
python-version: '3.12'
134134
- name: Cache pip modules
135135
uses: actions/cache@v1
136136
with:
137137
path: ~/.cache/pip
138-
key: esphome-pip-3.9-${{ hashFiles('setup.py') }}
138+
key: esphome-pip-3.12-${{ hashFiles('setup.py') }}
139139
restore-keys: |
140-
esphome-pip-3.9-
140+
esphome-pip-3.12-
141141
142142
- name: 💣Clone esphome project
143143
run: git clone https://github.com/esphome/esphome.git
@@ -180,10 +180,10 @@ jobs:
180180
steps:
181181
- name: ⤵️ Check out configuration from GitHub
182182
uses: actions/checkout@v2
183-
- name: Setup Python 3.9
183+
- name: Setup Python 3.12
184184
uses: actions/setup-python@v1
185185
with:
186-
python-version: 3.9
186+
python-version: 3.12
187187
- name: Install dependencies
188188
run: |
189189
python -m pip install --upgrade pip setuptools wheel
@@ -238,10 +238,10 @@ jobs:
238238
path: .pioenvs
239239
key: esphome-compile-pioenvs-${{ hashFiles('*.yaml') }}
240240
restore-keys: esphome-compile-pioenvs-
241-
- name: Set up Python 3.9
241+
- name: Set up Python 3.12
242242
uses: actions/setup-python@v1
243243
with:
244-
python-version: 3.9
244+
python-version: 3.12
245245
- name: Install dependencies
246246
run: |
247247
python -m pip install --upgrade pip setuptools wheel

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ It looks like there is no GTW (waterproof) version of the device with limiter /
3939

4040
## Requirements
4141

42-
* [ESPHome 2024.5.0 or higher](https://github.com/esphome/esphome/releases).
42+
* [ESPHome 2024.6.0 or higher](https://github.com/esphome/esphome/releases).
4343
* RS485-to-TTL module (`HW-0519` f.e.)
4444
* Generic ESP32 or ESP8266 board
4545
* Required [Soyosource inverter settings](docs/soyosource-settings.jpg "Soyosource config panel")

esp32-example.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ substitutions:
88
esphome:
99
name: ${name}
1010
comment: ${device_description}
11+
min_version: 2024.6.0
1112
project:
1213
name: "syssi.esphome-soyosource-gtn-virtual-meter"
1314
version: 2.1.0
@@ -24,6 +25,7 @@ wifi:
2425
password: !secret wifi_password
2526

2627
ota:
28+
platform: esphome
2729

2830
logger:
2931
baud_rate: 0

esp32-limiter-example.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ substitutions:
88
esphome:
99
name: ${name}
1010
comment: ${device_description}
11+
min_version: 2024.6.0
1112
project:
1213
name: "syssi.esphome-soyosource-gtn-virtual-meter"
1314
version: 2.1.0
@@ -24,6 +25,7 @@ wifi:
2425
password: !secret wifi_password
2526

2627
ota:
28+
platform: esphome
2729

2830
logger:
2931
baud_rate: 0

esp32-multiple-uarts-example.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ substitutions:
1212
esphome:
1313
name: ${name}
1414
comment: ${device_description}
15+
min_version: 2024.6.0
1516
project:
1617
name: "syssi.esphome-soyosource-gtn-virtual-meter"
1718
version: 2.1.0
@@ -31,6 +32,7 @@ ethernet:
3132
phy_addr: 0
3233

3334
ota:
35+
platform: esphome
3436

3537
logger:
3638
baud_rate: 0

esp8266-display-display-version-example.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ substitutions:
1010
esphome:
1111
name: ${name}
1212
comment: ${device_description}
13+
min_version: 2024.6.0
1314
project:
1415
name: "syssi.esphome-soyosource-gtn-virtual-meter"
1516
version: 2.1.0
@@ -26,6 +27,7 @@ wifi:
2627
password: !secret wifi_password
2728

2829
ota:
30+
platform: esphome
2931

3032
logger:
3133
level: INFO

esp8266-display-display-version-limiter-example.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ substitutions:
1212
esphome:
1313
name: ${name}
1414
comment: ${device_description}
15+
min_version: 2024.6.0
1516
project:
1617
name: "syssi.esphome-soyosource-gtn-virtual-meter"
1718
version: 2.1.0
@@ -28,6 +29,7 @@ wifi:
2829
password: !secret wifi_password
2930

3031
ota:
32+
platform: esphome
3133

3234
logger:
3335
level: INFO

esp8266-display-wifi-version-example.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ substitutions:
1010
esphome:
1111
name: ${name}
1212
comment: ${device_description}
13+
min_version: 2024.6.0
1314
project:
1415
name: "syssi.esphome-soyosource-gtn-virtual-meter"
1516
version: 2.1.0
@@ -26,6 +27,7 @@ wifi:
2627
password: !secret wifi_password
2728

2829
ota:
30+
platform: esphome
2931

3032
logger:
3133
level: INFO

esp8266-display-wifi-version-limiter-example.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ substitutions:
1212
esphome:
1313
name: ${name}
1414
comment: ${device_description}
15+
min_version: 2024.6.0
1516
project:
1617
name: "syssi.esphome-soyosource-gtn-virtual-meter"
1718
version: 2.1.0
@@ -28,6 +29,7 @@ wifi:
2829
password: !secret wifi_password
2930

3031
ota:
32+
platform: esphome
3133

3234
logger:
3335
level: INFO

esp8266-example.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ substitutions:
88
esphome:
99
name: ${name}
1010
comment: ${device_description}
11+
min_version: 2024.6.0
1112
project:
1213
name: "syssi.esphome-soyosource-gtn-virtual-meter"
1314
version: 2.1.0
@@ -24,6 +25,7 @@ wifi:
2425
password: !secret wifi_password
2526

2627
ota:
28+
platform: esphome
2729

2830
logger:
2931
baud_rate: 0

0 commit comments

Comments
 (0)