Skip to content

Commit

Permalink
Merge branch 'release/0.0.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
killroyboy committed Jun 3, 2018
2 parents dd6f090 + adf9819 commit 2e0dc2c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ bower_components

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release
build

# Dependency directories
node_modules/
Expand Down
8 changes: 5 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ const got = require('got'),
logger.info('------- ambient2weather v' + pkg.version, '--------');
logger.debug('Ambient Application Key:', appKey);
logger.debug('Ambient API Key:', apiKey);
logger.debug('PWD Station ID:', pwsStation);
logger.debug('PWD Password:', pwsPassword);
logger.debug('PWS Station ID:', pwsStation);
logger.debug('PWS Password:', pwsPassword);

if (!appKey || !apiKey || !pwsStation || !pwsPassword) {
logger.error('Insufficient configuration data. Missing API Key, App Key, Station ID or PWS Password.');
Expand Down Expand Up @@ -68,7 +68,7 @@ api.on('data', data => {
baromin : data.baromrelin,
dewptf : data.dewPoint,
humidity : data.humidityin,
rainin : data.totalrainin,
rainin : data.hourlyrainin,
UV : data.uv,
softwaretype: 'ambient2pwsweather-' + pkg.version,
action : 'updateraw'
Expand All @@ -81,6 +81,8 @@ api.on('data', data => {
delete params.baromabsin;
delete params.feelslike;
delete params.maxdailygust;
delete params.totalrainin;
delete params.hourlyrainin;

// logger.debug('params', params);

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "ambient2pwsweather",
"version": "0.0.5",
"version": "0.0.6",
"description": "Pull weather data from AmbientWeather.net and push to PWSWeather",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"start": "node index.js",
"start dev": "nodemon index.js",
"build": "zip -x 'node_modules/*' -x 'config/development.json' -r /tmp/ambient2pwsweather-$(npm run version).zip *",
"build": "mkdir -p build && zip -x 'node_modules/*' -x 'build/*' -x '.git/*' -x '.idea/*' -x 'config/development.json' -r build/ambient2pwsweather-$(npm run version --silent).zip *",
"version": "echo $npm_package_version"
},
"repository": {
Expand Down

0 comments on commit 2e0dc2c

Please sign in to comment.