mirror of
https://github.com/bourquep/mysa2mqtt.git
synced 2025-11-01 20:29:41 +00:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4069f24880 | ||
|
|
a47cdbb45e | ||
|
|
2e075cd40d | ||
|
|
f2d35a1ca5 | ||
|
|
122ffde2f1 | ||
|
|
c259557da0 | ||
|
|
57bd430c98 | ||
|
|
8ca80acb49 | ||
|
|
3b5dafeda9 |
22
.all-contributorsrc
Normal file
22
.all-contributorsrc
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
{
|
||||||
|
"files": ["README.md"],
|
||||||
|
"imageSize": 100,
|
||||||
|
"commit": false,
|
||||||
|
"commitType": "docs",
|
||||||
|
"commitConvention": "angular",
|
||||||
|
"contributors": [
|
||||||
|
{
|
||||||
|
"login": "remiolivier",
|
||||||
|
"name": "remiolivier",
|
||||||
|
"avatar_url": "https://avatars.githubusercontent.com/u/1379047?v=4",
|
||||||
|
"profile": "https://github.com/remiolivier",
|
||||||
|
"contributions": ["code"]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"contributorsPerLine": 7,
|
||||||
|
"skipCi": true,
|
||||||
|
"repoType": "github",
|
||||||
|
"repoHost": "https://github.com",
|
||||||
|
"projectName": "mysa2mqtt",
|
||||||
|
"projectOwner": "bourquep"
|
||||||
|
}
|
||||||
29
README.md
29
README.md
@@ -1,5 +1,11 @@
|
|||||||
# mysa2mqtt
|
# mysa2mqtt
|
||||||
|
|
||||||
|
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
|
||||||
|
|
||||||
|
[](#contributors-)
|
||||||
|
|
||||||
|
<!-- ALL-CONTRIBUTORS-BADGE:END -->
|
||||||
|
|
||||||
[](https://www.npmjs.com/package/mysa2mqtt)
|
[](https://www.npmjs.com/package/mysa2mqtt)
|
||||||
[](https://hub.docker.com/r/bourquep/mysa2mqtt)
|
[](https://hub.docker.com/r/bourquep/mysa2mqtt)
|
||||||
[](https://github.com/bourquep/mysa2mqtt/actions/workflows/github-code-scanning/codeql)
|
[](https://github.com/bourquep/mysa2mqtt/actions/workflows/github-code-scanning/codeql)
|
||||||
@@ -369,3 +375,26 @@ copyright notice and license text in any copy of the software or substantial por
|
|||||||
- [mqtt2ha](https://github.com/bourquep/mqtt2ha) - MQTT to Home Assistant bridge library
|
- [mqtt2ha](https://github.com/bourquep/mqtt2ha) - MQTT to Home Assistant bridge library
|
||||||
- [Commander.js](https://github.com/tj/commander.js) - Command-line argument parsing
|
- [Commander.js](https://github.com/tj/commander.js) - Command-line argument parsing
|
||||||
- [Pino](https://github.com/pinojs/pino) - Fast JSON logger
|
- [Pino](https://github.com/pinojs/pino) - Fast JSON logger
|
||||||
|
|
||||||
|
## Contributors ✨
|
||||||
|
|
||||||
|
Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
|
||||||
|
|
||||||
|
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
|
||||||
|
<!-- prettier-ignore-start -->
|
||||||
|
<!-- markdownlint-disable -->
|
||||||
|
<table>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top" width="14.28%"><a href="https://github.com/remiolivier"><img src="https://avatars.githubusercontent.com/u/1379047?v=4?s=100" width="100px;" alt="remiolivier"/><br /><sub><b>remiolivier</b></sub></a><br /><a href="https://github.com/bourquep/mysa2mqtt/commits?author=remiolivier" title="Code">💻</a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<!-- markdownlint-restore -->
|
||||||
|
<!-- prettier-ignore-end -->
|
||||||
|
|
||||||
|
<!-- ALL-CONTRIBUTORS-LIST:END -->
|
||||||
|
|
||||||
|
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification.
|
||||||
|
Contributions of any kind welcome!
|
||||||
|
|||||||
2884
package-lock.json
generated
2884
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
22
package.json
22
package.json
@@ -49,26 +49,26 @@
|
|||||||
"commander": "14.0.1",
|
"commander": "14.0.1",
|
||||||
"dotenv": "17.2.3",
|
"dotenv": "17.2.3",
|
||||||
"mqtt2ha": "4.1.2",
|
"mqtt2ha": "4.1.2",
|
||||||
"mysa-js-sdk": "1.3.2",
|
"mysa-js-sdk": "2.0.0",
|
||||||
"pino": "10.0.0",
|
"pino": "10.1.0",
|
||||||
"pino-pretty": "13.1.1"
|
"pino-pretty": "13.1.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@commander-js/extra-typings": "14.0.0",
|
"@commander-js/extra-typings": "14.0.0",
|
||||||
"@eslint/js": "9.37.0",
|
"@eslint/js": "9.38.0",
|
||||||
"@semantic-release/npm": "12.0.2",
|
"@semantic-release/npm": "13.1.1",
|
||||||
"@types/node": "24.6.2",
|
"@types/node": "24.9.2",
|
||||||
"conventional-changelog-conventionalcommits": "9.1.0",
|
"conventional-changelog-conventionalcommits": "9.1.0",
|
||||||
"eslint": "9.37.0",
|
"eslint": "9.39.0",
|
||||||
"eslint-plugin-jsdoc": "60.8.1",
|
"eslint-plugin-jsdoc": "61.1.11",
|
||||||
"eslint-plugin-tsdoc": "0.4.0",
|
"eslint-plugin-tsdoc": "0.4.0",
|
||||||
"prettier": "3.6.2",
|
"prettier": "3.6.2",
|
||||||
"prettier-plugin-jsdoc": "1.3.3",
|
"prettier-plugin-jsdoc": "1.5.0",
|
||||||
"prettier-plugin-organize-imports": "4.3.0",
|
"prettier-plugin-organize-imports": "4.3.0",
|
||||||
"semantic-release": "24.2.9",
|
"semantic-release": "25.0.1",
|
||||||
"tsup": "8.5.0",
|
"tsup": "8.5.0",
|
||||||
"tsx": "4.20.6",
|
"tsx": "4.20.6",
|
||||||
"typescript": "5.9.3",
|
"typescript": "5.9.3",
|
||||||
"typescript-eslint": "8.45.0"
|
"typescript-eslint": "8.46.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -187,18 +187,22 @@ export class Thermostat {
|
|||||||
try {
|
try {
|
||||||
const deviceStates = await this.mysaApiClient.getDeviceStates();
|
const deviceStates = await this.mysaApiClient.getDeviceStates();
|
||||||
const state = deviceStates.DeviceStatesObj[this.mysaDevice.Id];
|
const state = deviceStates.DeviceStatesObj[this.mysaDevice.Id];
|
||||||
|
const tstatMode = state.TstatMode?.v;
|
||||||
|
|
||||||
this.mqttClimate.currentTemperature = state.CorrectedTemp.v;
|
this.mqttClimate.currentTemperature = state.CorrectedTemp?.v;
|
||||||
this.mqttClimate.currentHumidity = state.Humidity.v;
|
this.mqttClimate.currentHumidity = state.Humidity?.v;
|
||||||
this.mqttClimate.currentMode = state.TstatMode.v === 1 ? 'off' : state.TstatMode.v === 3 ? 'heat' : undefined;
|
this.mqttClimate.currentMode = tstatMode === 1 ? 'off' : tstatMode === 3 ? 'heat' : undefined;
|
||||||
this.mqttClimate.currentAction = this.computeCurrentAction(undefined, state.Duty.v);
|
this.mqttClimate.currentAction = this.computeCurrentAction(undefined, state.Duty?.v);
|
||||||
this.mqttClimate.targetTemperature = this.mqttClimate.currentMode !== 'off' ? state.SetPoint.v : undefined;
|
this.mqttClimate.targetTemperature = this.mqttClimate.currentMode !== 'off' ? state.SetPoint?.v : undefined;
|
||||||
await this.mqttClimate.writeConfig();
|
await this.mqttClimate.writeConfig();
|
||||||
|
|
||||||
await this.mqttTemperature.setState('state_topic', state.CorrectedTemp.v.toFixed(2));
|
await this.mqttTemperature.setState(
|
||||||
|
'state_topic',
|
||||||
|
state.CorrectedTemp != null ? state.CorrectedTemp.v.toFixed(2) : 'None'
|
||||||
|
);
|
||||||
await this.mqttTemperature.writeConfig();
|
await this.mqttTemperature.writeConfig();
|
||||||
|
|
||||||
await this.mqttHumidity.setState('state_topic', state.Humidity.v.toFixed(2));
|
await this.mqttHumidity.setState('state_topic', state.Humidity != null ? state.Humidity.v.toFixed(2) : 'None');
|
||||||
await this.mqttHumidity.writeConfig();
|
await this.mqttHumidity.writeConfig();
|
||||||
|
|
||||||
// `state.Current.v` always has a non-zero value, even for thermostats that are off, so we can't use it to determine initial power state.
|
// `state.Current.v` always has a non-zero value, even for thermostats that are off, so we can't use it to determine initial power state.
|
||||||
@@ -242,7 +246,7 @@ export class Thermostat {
|
|||||||
this.mqttClimate.currentHumidity = status.humidity;
|
this.mqttClimate.currentHumidity = status.humidity;
|
||||||
this.mqttClimate.targetTemperature = this.mqttClimate.currentMode !== 'off' ? status.setPoint : undefined;
|
this.mqttClimate.targetTemperature = this.mqttClimate.currentMode !== 'off' ? status.setPoint : undefined;
|
||||||
|
|
||||||
if (status.current != null) {
|
if (this.mysaDevice.Voltage != null && status.current != null) {
|
||||||
const watts = this.mysaDevice.Voltage * status.current;
|
const watts = this.mysaDevice.Voltage * status.current;
|
||||||
await this.mqttPower.setState('state_topic', watts.toFixed(2));
|
await this.mqttPower.setState('state_topic', watts.toFixed(2));
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user