Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extend functions, correct time in object and use user defined object data #2

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
52749be
Update main.js
svenp Oct 25, 2018
78f1efa
Update main.js
svenp Oct 25, 2018
f000230
Update main.js
svenp Oct 25, 2018
169e3ef
Update package.json
svenp Oct 25, 2018
fba4678
Update README.md
svenp Oct 25, 2018
5736d96
Update io-package.json
svenp Oct 25, 2018
384b5e3
Update io-package.json
svenp Oct 25, 2018
ed0073c
Update main.js
svenp Oct 25, 2018
e4b9e14
Update main.js
svenp Oct 25, 2018
e2fcd8a
Update io-package.json
svenp Oct 25, 2018
fe26a7a
add adapter-core
Apollon77 Mar 3, 2019
6f8f644
remove utils.js
Apollon77 Mar 3, 2019
51c2c3b
update package.json
Apollon77 Mar 3, 2019
5fa0d26
update travis.yml
Apollon77 Mar 3, 2019
1ce4cf6
update appveyor.yml
Apollon77 Mar 3, 2019
f57390e
update testing setup.js
Apollon77 Mar 3, 2019
1b16137
update basic package-file testing
Apollon77 Mar 3, 2019
dade96f
update package.json
Apollon77 Mar 4, 2019
b564f90
add license
Apollon77 Mar 6, 2019
d9c2973
add ioBroker badges to README
Apollon77 Mar 10, 2019
b2ffe49
migrate testing to new iobroker/testing library
Apollon77 Mar 10, 2019
040c4af
fix io-package to fullfill current adapter requirements
Apollon77 Mar 11, 2019
7aa82e2
update testing lib
Apollon77 Mar 12, 2019
37e57cd
Merge pull request #1 from Apollon77/master
svenp Mar 15, 2019
2f1af22
Update README.md
svenp Mar 15, 2019
321d8d8
Update LICENSE
svenp Mar 15, 2019
2910695
Update package.json
svenp Mar 15, 2019
5288b56
Update .travis.yml
svenp May 10, 2019
b55af19
Update appveyor.yml
svenp May 10, 2019
26e3cae
add port to Website link
svenp Oct 2, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
os:
- linux
- osx
- windows
language: node_js
node_js:
- '4'
- '6'
- '8'
- '10'
before_script:
- export NPMVERSION=$(echo "$($(which npm) -v)"|cut -c1)
- 'if [[ $NPMVERSION == 5 ]]; then npm install -g npm@5; fi'
- npm -v
- npm install [email protected]
- 'npm install https://github.com/ioBroker/ioBroker.js-controller/tarball/master --production'
env:
- CXX=g++-4.8
- CXX=g++-6
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
- g++-6
script:
- 'npm run test:package'
- 'npm run test:unit'
- 'npm run test:integration'
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2018 Michael Voelker <[email protected]>
Copyright (c) 2019 Michael Voelker <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
![Logo](admin/poolcontroller.png)
# ioBroker.poolcontroller
=================
![Number of Installations](http://iobroker.live/badges/poolcontroller-installed.svg) ![Number of Installations](http://iobroker.live/badges/poolcontroller-stable.svg) =================

This adapter is for reading values ​​from the pool controller. This pool controller is from www.pooldigital.de.
A demo of the controller can be found at http://demo.poolcontroller.de/gui/phase2/

## Changelog
### 0.2.4
* (SvenPeitz) rework main, correct time, get user data objects
### 0.2.3
* (MichaelVoelker) adaption main
### 0.2.2
Expand All @@ -17,7 +19,7 @@ A demo of the controller can be found at http://demo.poolcontroller.de/gui/phase
## License
The MIT License (MIT)

Copyright (c) 2018 Michael Voelker <[email protected]>
Copyright (c) 2019 Michael Voelker <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
9 changes: 4 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
version: 'test-{build}'
environment:
matrix:
- nodejs_version: '4'
- nodejs_version: '6'
- nodejs_version: '8'
- nodejs_version: '10'
Expand All @@ -10,16 +9,16 @@ platform:
- x64
clone_folder: 'c:\projects\%APPVEYOR_PROJECT_NAME%'
install:
- ps: 'Install-Product node $env:nodejs_version $env:platform'
- ps: 'Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform'
- ps: '$NpmVersion = (npm -v).Substring(0,1)'
- ps: 'if($NpmVersion -eq 5) { npm install -g npm@5 }'
- ps: npm --version
- npm install
- npm install [email protected]
- 'npm install https://github.com/ioBroker/ioBroker.js-controller/tarball/master --production'
test_script:
- echo %cd%
- node --version
- npm --version
- npm test
- 'npm run test:package'
- 'npm run test:unit'
- 'npm run test:integration'
build: 'off'
21 changes: 13 additions & 8 deletions io-package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
{
"common": {
"name": "poolcontroller",
"version": "0.2.3",
"version": "0.2.4",
"news": {
"0.2.4": {
"en": "extend main",
"de": "Erweiterung main"
},
"0.2.3": {
"en": "adaption main",
"de": "Anpassungen main"
Expand All @@ -21,10 +25,10 @@
"de": "Initiale Version"
}
},
"title": "Poolcontroller Adapter",
"title": "Poolcontroller",
"titleLang": {
"en": "poolcontroller adapter",
"de": "Poolcontroller Adapter"
"en": "poolcontroller",
"de": "Poolcontroller"
},
"desc": {
"en": "ioBroker poolcontroller Adapter",
Expand All @@ -37,21 +41,22 @@
"en": "docs/en/template.md",
"de": "docs/de/template.md"
},
"localLink": "http://%host%/gui/phase2/index.htm",
"license": "MIT",
"localLink": "http://%host%:%port%/gui/phase2/index.htm",
"platform": "Javascript/Node.js",
"mode": "schedule",
"schedule": "* * * * *",
"icon": "poolcontroller.png",
"materialize": true,
"enabled": true,
"extIcon": "https://raw.githubusercontent.com/sucht3371/ioBroker.poolcontroller/master/admin/poolcontroller.png",
"extIcon": "https://raw.githubusercontent.com/svenp/ioBroker.poolcontroller/master/admin/poolcontroller.png",
"keywords": ["poolcontroller", "smarthome", "pool", "pooldaten"],
"readme": "https://github.com/sucht3371/ioBroker.poolcontroller/blob/master/README.md",
"readme": "https://github.com/svenp/ioBroker.poolcontroller/blob/master/README.md",
"loglevel": "info",
"type": "general"
},
"native": {
"host": "",
"host": "192.168.0.100",
"port": 80

},
Expand Down
83 changes: 0 additions & 83 deletions lib/utils.js

This file was deleted.

Loading