Skip to content

Commit

Permalink
Add Error Step 1
Browse files Browse the repository at this point in the history
  • Loading branch information
@PLCHome
PLCHome committed Aug 13, 2024
1 parent c6132d9 commit eb16e73
Show file tree
Hide file tree
Showing 4 changed files with 1,229 additions and 820 deletions.
260 changes: 111 additions & 149 deletions .github/workflows/test-and-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,154 +3,116 @@ name: Test and Release
# Run this job on all pushes and pull requests
# as well as tags with a semantic version
on:
push:
branches:
- "*"
tags:
# normal versions
- "v[0-9]+.[0-9]+.[0-9]+"
# pre-releases
- "v[0-9]+.[0-9]+.[0-9]+-**"
pull_request:
branches:
- '*'
push:
branches:
- '*'
tags:
# normal versions
- 'v[0-9]+.[0-9]+.[0-9]+'
# pre-releases
- 'v[0-9]+.[0-9]+.[0-9]+-**'

pull_request:
branches:
- '*'

jobs:
# Performs quick checks before the expensive test runs
check-and-lint:
if: contains(github.event.head_commit.message, '[skip ci]') == false

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x, 18.x, 20.x]

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

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

- name: Install Dependencies
run: npm install

- name: Lint source code
run: npm run lint
- name: Test package files
run: npm run test:package

# Runs adapter tests on all supported node versions and OSes
adapter-tests:
if: contains(github.event.head_commit.message, '[skip ci]') == false

needs: [check-and-lint]

runs-on: ${{ matrix.os }}
strategy:
matrix:
node-version: [16.x, 18.x, 20.x]
os: [ubuntu-latest, windows-latest, macos-latest]

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

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

- name: Install Dependencies
run: npm install

- name: Run unit tests
run: npm run test:unit

- name: Run integration tests (unix only)
if: startsWith(runner.OS, 'windows') == false
run: DEBUG=testing:* npm run test:integration

- name: Run integration tests (windows only)
if: startsWith(runner.OS, 'windows')
run: set DEBUG=testing:* & npm run test:integration
# TODO: To enable automatic npm releases, create a token on npmjs.org
# Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options
# Then uncomment the following block:

# # Deploys the final package to NPM
# deploy:
# needs: [adapter-tests]
#
# # Trigger this step only when a commit on any branch is tagged with a version number
# if: |
# contains(github.event.head_commit.message, '[skip ci]') == false &&
# github.event_name == 'push' &&
# startsWith(github.ref, 'refs/tags/v')
#
# runs-on: ubuntu-latest
# strategy:
# matrix:
# node-version: [14.x]
#
# steps:
# - name: Checkout code
# uses: actions/checkout@v2
#
# - name: Use Node.js ${{ matrix.node-version }}
# uses: actions/setup-node@v1
# with:
# node-version: ${{ matrix.node-version }}
#
# - name: Extract the version and commit body from the tag
# id: extract_release
# # The body may be multiline, therefore newlines and % need to be escaped
# run: |
# VERSION="${{ github.ref }}"
# VERSION=${VERSION##*/v}
# echo "::set-output name=VERSION::$VERSION"
# BODY=$(git show -s --format=%b)
# BODY="${BODY//'%'/'%25'}"
# BODY="${BODY//$'\n'/'%0A'}"
# BODY="${BODY//$'\r'/'%0D'}"
# echo "::set-output name=BODY::$BODY"
#
# - name: Publish package to npm
# run: |
# npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
# npm whoami
# npm publish
#
# - name: Create Github Release
# uses: actions/create-release@v1
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# tag_name: ${{ github.ref }}
# release_name: Release v${{ steps.extract_release.outputs.VERSION }}
# draft: false
# # Prerelease versions create prereleases on Github
# prerelease: ${{ contains(steps.extract_release.outputs.VERSION, '-') }}
# body: ${{ steps.extract_release.outputs.BODY }}
#
# # When using Sentry for error reporting, Sentry could be informed about new releases
# # To enable create a API-Token in Sentry (User settings, API keys)
# # Enter this token as a GitHub secret (with name SENTRY_AUTH_TOKEN) in the repository options
# # Then uncomment and customize the following block:
# #- name: Notify Sentry.io about the release
# # run: |
# # npm i -g @sentry/cli
# # export SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
# # export SENTRY_URL=https://sentry.iobroker.net
# # export SENTRY_ORG=iobroker
# # export SENTRY_PROJECT=iobroker-ford
# # export SENTRY_VERSION=iobroker.ford@${{ steps.extract_release.outputs.VERSION }}
# # sentry-cli releases new $SENTRY_VERSION
# # sentry-cli releases finalize $SENTRY_VERSION
# # # Add the following line BEFORE finalize if repositories are connected in Sentry
# # #sentry-cli releases set-commits $SENTRY_VERSION --auto
# # # Add the following line BEFORE finalize if sourcemap uploads are needed
# # #sentry-cli releases files $SENTRY_VERSION upload-sourcemaps build/
# Performs quick checks before the expensive test runs
check-and-lint:
if: contains(github.event.head_commit.message, '[skip ci]') == false

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x, 20.x, 22.x]

steps:
- name: Checkout source Code
uses: actions/checkout@v4

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

- name: Install Dependencies
uses: bahmutov/npm-install@v1

- name: Lint source code
run: npm run lint

- name: Test package files
run: npm run test:package

# Runs adapter tests on all supported node versions and OSes
adapter-tests:
needs: [check-and-lint]
if: contains(github.event.head_commit.message, '[skip ci]') == false

strategy:
matrix:
node-version: [18.x, 20.x, 22.x]
os: [ubuntu-latest, windows-latest, macos-latest]

runs-on: ${{ matrix.os }}

steps:
- name: Checkout source Code
uses: actions/checkout@v4

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

- name: Install Dependencies
uses: bahmutov/npm-install@v1

- name: Run integration tests (unix only)
if: startsWith(runner.OS, 'windows') == false
run: DEBUG=testing:* npm run test:integration

- name: Run integration tests (windows only)
if: startsWith(runner.OS, 'windows')
run: set DEBUG=testing:* & npm run test:integration

# Deploys the final package to NPM
deploy:
needs: [adapter-tests]
# Trigger this step only when a commit on master is tagged with a version number
if: |
contains(github.event.head_commit.message, '[skip ci]') == false &&
github.event_name == 'push' &&
github.event.base_ref == 'refs/heads/master' &&
startsWith(github.ref, 'refs/tags/v')
strategy:
matrix:
node-version: [18.x, 20.x, 22.x]
os: [ubuntu-latest, windows-latest, macos-latest]

runs-on: ${{ matrix.os }}
steps:
- name: Checkout source Code
uses: actions/checkout@v4

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

- name: Install Dependencies
uses: bahmutov/npm-install@v1

- name: Publish package to npm
uses: JS-DevTools/npm-publish@v1
with:
token: ${{ secrets.npm }}

# Dummy job for skipped builds - without this, github reports the build as failed
skip-ci:
if: contains(github.event.head_commit.message, '[skip ci]')
runs-on: ubuntu-latest
steps:
- name: Skip build
run: echo "Build skipped!"
28 changes: 23 additions & 5 deletions main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const typRefresh = 0x02;
const typTemp = 0x03;
const typCelsius = 0x04;
const typTime = 0x05;
const typError = 0x06;

const CONTROLLER_ON = 0x01;
const FILTER_ON = 0x02;
Expand Down Expand Up @@ -116,9 +117,10 @@ class Intex extends utils.Adapter {
"SanitizerOnOff" : {iobrokerId: 'Sanitizer', typ : typOnOff, subOperation : "SanitizerTime", byteIndex: BYTE_STATUS, boolBit: SANITIZER_ON},
"SanitizerTime" : {iobrokerId: 'SanitizerTime', typ : typTime, byteIndex: BYTE_TIME_SANITIZER, valueFunc: function(val,raw){let test = raw.readUInt8(BYTE_STATUS);return (!((test & SANITIZER_ON) == SANITIZER_ON))?0:(val & 0b1111)*0.5+1 }, readonly: true},
"Refresh" : {iobrokerId: 'Refresh', typ : typRefresh, testFunc: function(val){return true}},
"TempSet" : {iobrokerId: 'TargetTemperature', typ : typTemp, subOperation : "Temp", byteIndex: BYTE_TARGET_TEMPERATURE},
"Temp" : {iobrokerId: 'Temperature', typ : typTemp, subOperation : "Celsius" , byteIndex: BYTE_TEMPERATURE, readonly: true},
"Celsius" : {iobrokerId: 'Celsius', typ : typCelsius, byteIndex: BYTE_TARGET_TEMPERATURE, testFunc: function(val){return val <= 43 }},
"TempSet" : {iobrokerId: 'TargetTemperature', typ : typTemp, subOperation : "Temp", byteIndex: BYTE_TARGET_TEMPERATURE, testFunc: function(val){if (val>0 && val<181){ return val;} else return;}},
"Temp" : {iobrokerId: 'Temperature', typ : typTemp, subOperation : "Celsius" , byteIndex: BYTE_TEMPERATURE, readonly: true, testFunc: function(val){if (val>0 && val<181){ return val;} else return;}},
"Celsius" : {iobrokerId: 'Celsius', subOperation : "Error", typ : typCelsius, byteIndex: BYTE_TARGET_TEMPERATURE, testFunc: function(val){if (val>0 && val<181){ return val <= 43;} else return;}},
"Error" : {iobrokerId: 'Error', typ : typError, byteIndex: BYTE_TARGET_TEMPERATURE, testFunc: function(val){if (val<181) { return 0;} else { return val-100;}}, readonly: true},
}
this.control = {};

Expand Down Expand Up @@ -210,7 +212,23 @@ class Intex extends utils.Adapter {
co.type = "number";
co.role = "value.interval";
break;
}
case typError:
co.type = "number";
co.role = "value";
co.states = {
0: "OK",
81: "Control panel communication error",
90: "No flow",
91: "Alarm code (low salt level)",
92: "Alarm code (high salt level)",
94: "Water temperature too low",
95: "The water temperature is around 50°C (122°F)",
96: "System error",
97: "Dry fire protection",
99: "Defective water temperature sensor",
};
break;
}
if (co) {
co.name = operation.iobrokerId
let id=device.deviceId + "."+controlChannel+"." + operation.iobrokerId
Expand Down Expand Up @@ -373,7 +391,7 @@ class Intex extends utils.Adapter {
async updateLocalDevice(hostname, hostport, deviceId = "localtcp") {
return new Promise((resolve, reject) => {
this.log.debug("fetching info from hostname:" + hostname + ':' + hostport + 'for' + deviceId);

var to = setTimeout(()=>{resolve(false)},5000);
var client = new net.Socket();
const sid = Date.now();
Expand Down
Loading

0 comments on commit eb16e73

Please sign in to comment.