Skip to content

Commit

Permalink
Merge pull request #219 from git-kick/0x100003e
Browse files Browse the repository at this point in the history
0x100003e
  • Loading branch information
git-kick authored May 24, 2024
2 parents 1533840 + 582e64d commit 4abe1fd
Show file tree
Hide file tree
Showing 7 changed files with 3,654 additions and 3,261 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

Expand All @@ -50,15 +50,15 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
node-version: [16.x, 18.x, 20.x]
node-version: [18.x, 20.x]
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

Expand Down Expand Up @@ -97,10 +97,10 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,12 @@ Here is a sample script for charge limit control - it is not meant for as-is usa
<a name="log"></a>

## Changelog
### 1.2.6

(git-kick)
* Fixed [Issue #211](https://github.com/git-kick/ioBroker.e3dc-rscp/issues/211) - added tag 0x0100003E to RscpTags.json and to ignoreIds, now adapter does not warn about it anymore.
* In consequence of [Issue #211](https://github.com/git-kick/ioBroker.e3dc-rscp/issues/211), degraded "unknown tag" from warning to debug level. Message does not make sense to most of end users.

### 1.2.5

(git-kick)
Expand All @@ -471,7 +477,6 @@ Here is a sample script for charge limit control - it is not meant for as-is usa

* Removed "dangerous" setter tags introduced with v1.2.4 , instead of just switching them off - [Issue #196](https://github.com/git-kick/ioBroker.e3dc-rscp/issues/196)


### 1.2.4
__MODIFIED ADAPTER SETTINGS - do not re-use settings stored in *.json__

Expand Down
20 changes: 19 additions & 1 deletion io-package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
{
"common": {
"name": "e3dc-rscp",
"version": "1.2.5",
"version": "1.2.6",
"news": {
"1.2.6": {
"en": "No more warnings about unknown tags like 0x100003e",
"de": "Keine Warnung mehr bei unbekannten Tags wie 0x100003e",
"ru": "Больше никаких предупреждений о неизвестных тегах, таких как 0x100003e.",
"pt": "Chega de avisos sobre tags desconhecidas como 0x100003e",
"nl": "Geen waarschuwingen meer over onbekende tags zoals 0x100003e",
"fr": "Plus d'avertissements concernant les balises inconnues comme 0x100003e",
"it": "Niente più avvisi su tag sconosciuti come 0x100003e",
"es": "No más advertencias sobre etiquetas desconocidas como 0x100003e",
"pl": "Koniec z ostrzeżeniami o nieznanych tagach, takich jak 0x100003e",
"uk": "Більше немає попереджень про невідомі теги, такі як 0x100003e",
"zh-cn": "不再出现有关 0x100003e 等未知标签的警告"
},
"1.2.5": {
"en": "Added some EP setter tags",
"de": "Einige neue EP Steuer-Tags",
Expand Down Expand Up @@ -274,6 +287,11 @@
"RSCP"
],
"license": "GPL-3.0-only",
"licenseInformation": {
"license": "GPL-3.0-only",
"type": "free"
},
"tier": 3,
"platform": "Javascript/Node.js",
"main": "main.js",
"icon": "e3dc-rscp.png",
Expand Down
13 changes: 13 additions & 0 deletions lib/RscpTags.json
Original file line number Diff line number Diff line change
Expand Up @@ -2313,6 +2313,19 @@
"Unit": "W",
"Description": ""
},
"16777278": {
"TagHex": "0x0100003E",
"TagName": "UNDEFINED_POWER_VALUE",
"TagNameGlobal": "TAG_EMS_UNDEFINED_POWER_VALUE",
"DataTagHex": "0x00003E",
"NameSpace": "EMS",
"NameSpaceHex": "0x01",
"DataType": "UInt32",
"DataTypeHex": "0x07",
"UserLevel": "USER",
"Unit": "",
"Description": "E3/DC S10 returns this tag since ~March 2024, but it isn't documented"
},
"16777280": {
"TagHex": "0x01000040",
"TagName": "REQ_STATUS",
Expand Down
3 changes: 2 additions & 1 deletion main.js
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ const stringIds = [
// "INDEX" and "..._INDEX" tags are automatically treated as subchannels, no need to list them here.
const ignoreIds = [
"RSCP.UNDEFINED",
"EMS.UNDEFINED_POWER_VALUE",
"EMS.UNDEFINED_POWER_SETTING",
"EMS.MANUAL_CHARGE_START_COUNTER", // returns Int64, seems to be the same timestamp as in MANUAL_CHARGE_LAST_START
"EMS.PARAM_INDEX", // always 0, occurs in container EMERGENCY_POWER_OVERLOAD_STATUS
Expand Down Expand Up @@ -1257,7 +1258,7 @@ class E3dcRscp extends utils.Adapter {
const len = buffer.readUInt16LE( start+5 );
const typeName = rscpType[typeCode];
if( !rscpTag[tagCode] ) {
this.log.warn( `Unknown tag: tagCode=0x${tagCode.toString( 16 )}, len=${len}, typeCode=0x${typeCode.toString( 16 )}` );
this.log.debug( `Unknown tag: tagCode=0x${tagCode.toString( 16 )}, len=${len}, typeCode=0x${typeCode.toString( 16 )}` );
} else if( typeName == "Container" ) {
tree.push( { "tag": tagCode, "type": typeCode, "content": this.parseTlv( buffer, start+7, start+7+len ) } );
} else {
Expand Down
Loading

0 comments on commit 4abe1fd

Please sign in to comment.