Merge remote-tracking branch 'origin/master'

# Conflicts: # index.js
joabakk · Sep 27, 2017 · c51e82e · c51e82e
2 parents fa301e9 + d624823
commit c51e82e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 31 deletions.
diff --git a/index.js b/index.js
@@ -301,7 +301,6 @@ module.exports = function(app, options) {
               FROM polar
               WHERE environmentWindSpeedTrue < ?
               AND  environmentWindSpeedTrue > ?
-              GROUP BY environmentWindAngleTrueGround
               ORDER BY environmentWindAngleTrueGround`, windspeed, windspeed - interval, function(err, rows){
 
                 // error will be an Error if one occurred during the query
@@ -321,6 +320,7 @@ module.exports = function(app, options) {
         engineSKPath = "";
         //db.close();
 
+
         clearInterval(pushInterval);
 
         app.signalk.removeListener('delta', handleDelta);

diff --git a/package b/package