-
![]()
@@ -123,38 +140,45 @@
![]()
-
-
{{greeting}}
-{{user.name}}
- +
-
+
![]()
![]()
-
{{scTrack}}
+{{scTrack}}
{{dilbert.title}}
+
- - {{reminder}} +
+
-
{{timer.countdown | secondsToDateTime | date:"mm:ss"}}
- {{timer.duration | secondsToDateTime | date:"mm:ss"}}
+
+
-
-
{{ 'commands.title' | translate }}
+
+
+
+ -
-
- {{command['text']}} -
- {{command['description']}} + +
- Show my walking
- Refreshes fitbit data.
+
+
+
+ Source: , Last Updated:
+
+
+
+
+
@@ -172,16 +196,29 @@
- {{ 'commands.title' | translate }}
-
-
-
- Fitbit stats for {{fbDailyAverage.fullName}}
- Your daily average steps: {{fbDailyAverage.averageDailySteps}}
- Today's steps: {{fbToday.summary.steps}}
- Today's distance: {{fbToday.summary.distances[0].distance}} KM
- Today's active minutes: {{(fbToday.summary.veryActiveMinutes) + (fbToday.summary.fairlyActiveMinutes)}}
- Calories burned: {{fbToday.summary.caloriesOut}}
+
+
+
+
![]()
@@ -189,33 +226,21 @@
+ {{'fitbit.statsFor' | translate}} {{fbDailyAverage.fullName}}
+ {{'fitbit.averageSteps' | translate}}: {{fbDailyAverage.averageDailySteps}}
+ {{'fitbit.todaysSteps' | translate}}: {{fbToday.summary.steps}}
+ {{'fitbit.todaysDistance' | translate}}: {{fbToday.summary.distances[0].distance}} km
+ {{'fitbit.todaysActiveMinutes' | translate}}: {{(fbToday.summary.veryActiveMinutes) + (fbToday.summary.fairlyActiveMinutes)}} min
+ {{'fitbit.caloriesBurned' | translate}}: {{fbToday.summary.caloriesOut}} kcal
- Latest badges
+ {{'fitbit.sleepLastNight' | translate}}
+ {{(fbSleep.sleep[0].minutesAsleep/60 | number:2 )}} {{'fitbit.hours' | translate}} / {{fbSleep.sleep[0].minutesAwake }} min {{'fitbit.awake' | translate}} // {{(fbSleep.sleep[0].efficiency)}} % {{'fitbit.efficient' | translate}}
+ {{'fitbit.awake' | translate}}/{{'fitbit.restless' | translate}}: {{fbSleep.sleep[0].awakeCount}} / {{fbSleep.sleep[0].restlessCount}}
+
+ {{'fitbit.deviceStatus' | translate}}
+
+
+
+
+ {{device.deviceVersion}}
+ {{'fitbit.battery' | translate}}: {{device.battery}}
+ {{'fitbit.synched' | translate}}: {{device.lastSyncTime | date: 'dd.MM.yyyy HH:mm:ss'}} +
+ + {{'fitbit.battery' | translate}}: {{device.battery}}
+ {{'fitbit.synched' | translate}}: {{device.lastSyncTime | date: 'dd.MM.yyyy HH:mm:ss'}} +
{{'fitbit.latestBadges' | translate}}
{{ 'commands.title' | translate }}
+ ![]()
+
+ {{track.artist}}
+ {{track.title}}
+ {{track.album}}
+
+
+
-
-
-
-
-
-
-
-
-
-
diff --git a/js/controller.js b/js/controller.js
index 28e46d614..3d0e64ac1 100644
--- a/js/controller.js
+++ b/js/controller.js
@@ -3,11 +3,12 @@
function MirrorCtrl(
SpeechService,
+ AutoSleepService,
GeolocationService,
WeatherService,
FitbitService,
MapService,
- HueService,
+ LightService,
CalendarService,
ComicService,
GiphyService,
@@ -17,7 +18,11 @@
SearchService,
SoundCloudService,
RssService,
+ StockService,
+ ScrobblerService,
$rootScope, $scope, $timeout, $interval, tmhDynamicLocale, $translate) {
+
+ // Local Scope Vars
var _this = this;
$scope.listening = false;
$scope.debug = false;
@@ -25,24 +30,43 @@
$scope.user = {};
$scope.shownews = true;
$scope.commands = [];
- /*$translate('home.commands').then(function (translation) {
- $scope.interimResult = translation;
- });*/
$scope.interimResult = $translate.instant('home.commands');
$scope.layoutName = 'main';
-
$scope.fitbitEnabled = false;
- if (typeof config.fitbit != 'undefined') {
+ $scope.config = config;
+
+ if (typeof config.fitbit !== 'undefined') {
$scope.fitbitEnabled = true;
}
//set lang
- moment.locale((typeof config.language != 'undefined')?config.language.substring(0, 2).toLowerCase(): 'en');
+ moment.locale(
+ (typeof config.language !== 'undefined')?config.language.substring(0, 2).toLowerCase(): 'en',
+ {
+ calendar : {
+ lastWeek : '[Last] dddd',
+ lastDay : '[Yesterday]',
+ sameDay : '[Today]',
+ nextDay : '[Tomorrow]',
+ nextWeek : 'dddd',
+ sameElse : 'L'
+ }
+ }
+ );
+
console.log('moment local', moment.locale());
//Update the time
function updateTime(){
$scope.date = new moment();
+
+ // Auto wake at a specific time
+ if (typeof config.autoTimer !== 'undefined' && typeof config.autoTimer.auto_wake !== 'undefined' && config.autoTimer.auto_wake == moment().format('HH:mm:ss')) {
+ console.debug('Auto-wake', config.autoTimer.auto_wake);
+ $scope.focus = "default";
+ AutoSleepService.wake();
+ AutoSleepService.startAutoSleepTimer();
+ }
}
// Reset the command text
@@ -52,7 +76,20 @@
});
};
+ /**
+ * Register a refresh callback for a given interval (in minutes)
+ */
+ var registerRefreshInterval = function(callback, interval){
+ //Load the data initially
+ callback();
+ if(typeof interval !== 'undefined'){
+ $interval(callback, interval * 60000);
+ }
+ }
+
_this.init = function() {
+ AutoSleepService.startAutoSleepTimer();
+
var tick = $interval(updateTime, 1000);
updateTime();
GeolocationService.getLocation({enableHighAccuracy: true}).then(function(geoposition){
@@ -65,7 +102,40 @@
var playing = false, sound;
SoundCloudService.init();
- var refreshMirrorData = function() {
+ var refreshCalendar = function() {
+ CalendarService.getCalendarEvents().then(function(response) {
+ $scope.calendar = CalendarService.getFutureEvents();
+ }, function(error) {
+ console.log(error);
+ });
+ };
+
+ registerRefreshInterval(refreshCalendar, 25);
+
+ var refreshFitbitData = function() {
+ console.log('refreshing fitbit data');
+ FitbitService.profileSummary(function(response){
+ $scope.fbDailyAverage = response;
+ });
+
+ FitbitService.todaySummary(function(response){
+ $scope.fbToday = response;
+ });
+
+ FitbitService.sleepSummary(function(response){
+ $scope.fbSleep = response;
+ });
+
+ FitbitService.deviceSummary(function(response){
+ $scope.fbDevices = response;
+ });
+ };
+
+ if($scope.fitbitEnabled){
+ registerRefreshInterval(refreshFitbitData, 60);
+ }
+
+ var refreshWeatherData = function() {
//Get our location and then get the weather for our location
GeolocationService.getLocation({enableHighAccuracy: true}).then(function(geoposition){
console.log("Geoposition", geoposition);
@@ -73,9 +143,11 @@
$scope.currentForecast = WeatherService.currentForecast();
$scope.weeklyForecast = WeatherService.weeklyForecast();
$scope.hourlyForecast = WeatherService.hourlyForecast();
+ $scope.minutelyForecast = WeatherService.minutelyForecast();
console.log("Current", $scope.currentForecast);
console.log("Weekly", $scope.weeklyForecast);
console.log("Hourly", $scope.hourlyForecast);
+ console.log("Minutely", $scope.minutelyForecast);
var skycons = new Skycons({"color": "#aaa"});
skycons.add("icon_weather_current", $scope.currentForecast.iconAnimation);
@@ -91,34 +163,14 @@
}, function(error){
console.log(error);
});
-
- CalendarService.getCalendarEvents().then(function(response) {
- $scope.calendar = CalendarService.getFutureEvents();
- }, function(error) {
- console.log(error);
- });
-
- if ($scope.fitbitEnabled) {
- setTimeout(function() { refreshFitbitData(); }, 5000);
- }
};
- var refreshFitbitData = function() {
- console.log('refreshing fitbit data');
- FitbitService.profileSummary(function(response){
- $scope.fbDailyAverage = response;
- });
-
- FitbitService.todaySummary(function(response){
- $scope.fbToday = response;
- });
- };
-
- refreshMirrorData();
- $interval(refreshMirrorData, 1500000);
+ if(typeof config.forecast !== 'undefined'){
+ registerRefreshInterval(refreshWeatherData, config.forecast.refreshInterval || 2);
+ }
var greetingUpdater = function () {
- if(typeof config.greeting != 'undefined' && !Array.isArray(config.greeting) && typeof config.greeting.midday != 'undefined') {
+ if(typeof config.greeting !== 'undefined' && !Array.isArray(config.greeting) && typeof config.greeting.midday !== 'undefined') {
var hour = moment().hour();
var greetingTime = "midday";
@@ -136,8 +188,10 @@
$scope.greeting = config.greeting[Math.floor(Math.random() * config.greeting.length)];
}
};
- greetingUpdater();
- $interval(greetingUpdater, 120000);
+
+ if(typeof config.greeting !== 'undefined'){
+ registerRefreshInterval(greetingUpdater, 60);
+ }
var refreshTrafficData = function() {
TrafficService.getDurationForTrips().then(function(tripsWithTraffic) {
@@ -149,9 +203,8 @@
});
};
- if(typeof config.traffic != 'undefined'){
- refreshTrafficData();
- $interval(refreshTrafficData, config.traffic.reload_interval * 60000);
+ if(typeof config.traffic !== 'undefined'){
+ registerRefreshInterval(refreshTrafficData, config.traffic.refreshInterval || 5);
}
var refreshComic = function () {
@@ -163,13 +216,58 @@
});
};
- refreshComic();
+ registerRefreshInterval(refreshComic, 12*60); // 12 hours
+
var defaultView = function() {
console.debug("Ok, going to default view...");
$scope.focus = "default";
}
- $interval(refreshComic, 12*60*60000); // 12 hours
+ var refreshRss = function () {
+ console.log ("Refreshing RSS");
+ $scope.news = null;
+ RssService.refreshRssList().then(function() {
+ $scope.news = RssService.getNews();
+ });
+
+ };
+
+ var updateNews = function() {
+ $scope.news = RssService.getNews();
+ };
+
+ var getStock = function() {
+ StockService.getStockQuotes().then(function(result) {
+ var stock = [];
+ if (result.query.results.quote instanceof Array) {
+ stock = stock.concat(result.query.results.quote);
+ } else {
+ stock.push(result.query.results.quote);
+ }
+ $scope.stock = stock;
+ }, function(error) {
+ console.log(error);
+ });
+ }
+
+ if (typeof config.stock !== 'undefined' && config.stock.names.length) {
+ registerRefreshInterval(getStock, 30);
+ }
+
+ if(typeof config.rss !== 'undefined'){
+ registerRefreshInterval(refreshRss, config.rss.refreshInterval || 30);
+ registerRefreshInterval(updateNews, 2);
+ }
+
+ var getScrobblingTrack = function(){
+ ScrobblerService.getCurrentTrack().then(function(track) {
+ $scope.track = track;
+ });
+ }
+
+ if(typeof config.lastfm !== 'undefined' && typeof config.lastfm.key !== 'undefined' && config.lastfm.user !== 'undefined'){
+ registerRefreshInterval(getScrobblingTrack, config.lastfm.refreshInterval || 0.6)
+ }
var refreshRss = function () {
console.log ("Refreshing RSS");
@@ -194,7 +292,7 @@
var descId = 'commands.'+commandId+'.description';
$translate([voiceId, textId, descId]).then(function (translations) {
SpeechService.addCommand(translations[voiceId], commandFunction);
- if (translations[textId] != '') {
+ if (translations[textId] !== '') {
var command = {"text": translations[textId], "description": translations[descId]};
$scope.commands.push(command);
}
@@ -221,6 +319,19 @@
// Go back to default view
addCommand('wake_up', defaultView);
+ // Turn off HDMI output
+ addCommand('screen off', function() {
+ console.debug('turning screen off');
+ AutoSleepService.sleep();
+ });
+
+ // Turn on HDMI output
+ addCommand('screen on', function() {
+ console.debug('turning screen on');
+ AutoSleepService.wake();
+ $scope.focus = "default"
+ });
+
// Hide everything and "sleep"
addCommand('debug', function() {
console.debug("Boop Boop. Showing debug info...");
@@ -338,9 +449,9 @@
console.debug("It is", moment().format('h:mm:ss a'));
});
- // Turn lights off
+ // Control light
addCommand('light_action', function(state, action) {
- HueService.performUpdate(state + " " + action);
+ LightService.performUpdate(state + " " + action);
});
//Show giphy image
@@ -353,7 +464,7 @@
//Show fitbit stats (registered only if fitbit is configured in the main config)
if ($scope.fitbitEnabled) {
- SpeechService.addCommand('show my walking', function() {
+ addCommand('show_my_walking', function() {
refreshFitbitData();
});
}
@@ -430,7 +541,7 @@
$timeout.cancel(resetCommandTimeout);
},
result : function(result){
- if(typeof result != 'undefined'){
+ if(typeof result !== 'undefined'){
$scope.interimResult = result[0];
resetCommandTimeout = $timeout(restCommand, 5000);
}
@@ -455,7 +566,7 @@
.controller('MirrorCtrl', MirrorCtrl);
function themeController($scope) {
- $scope.layoutName = (typeof config.layout != 'undefined' && config.layout)?config.layout:'main';
+ $scope.layoutName = (typeof config.layout !== 'undefined' && config.layout)?config.layout:'main';
}
angular.module('SmartMirror')
diff --git a/js/services/autosleep.js b/js/services/autosleep.js
new file mode 100644
index 000000000..73b877f60
--- /dev/null
+++ b/js/services/autosleep.js
@@ -0,0 +1,45 @@
+(function() {
+ 'use strict';
+
+ function AutoSleepService($interval) {
+ var service = {};
+ var autoSleepTimer;
+
+ service.exec = require('child_process').exec;
+
+ service.startAutoSleepTimer = function() {
+ if (typeof config.autoTimer !== 'undefined' && typeof config.autoTimer.autoSleep !== 'undefined' && typeof config.autoTimer.auto_wake !== 'undefined') {
+ service.stopAutoSleepTimer();
+ autoSleepTimer = $interval(service.sleep, config.autoTimer.autoSleep);
+ console.debug('Starting auto-sleep timer', config.autoTimer.autoSleep);
+ }
+ };
+
+ service.stopAutoSleepTimer = function() {
+ console.debug('Stopping auto-sleep timer');
+ $interval.cancel(autoSleepTimer);
+ };
+
+ service.wake = function() {
+ service.exec(config.autoTimer.wake_cmd, service.puts);
+ };
+
+ service.sleep = function() {
+ service.exec(config.autoTimer.sleep_cmd, service.puts);
+ };
+
+ service.puts = function (error, stdout, stderr) {
+ if (error) {
+ console.debug('auto-sleep error', error);
+ }
+
+ console.debug('autosleep stdout:', stdout)
+ };
+
+ return service;
+ }
+
+ angular.module('SmartMirror')
+ .factory('AutoSleepService', AutoSleepService);
+
+}());
\ No newline at end of file
diff --git a/js/services/calendar.js b/js/services/calendar.js
index 8e9186f21..80d6035ca 100644
--- a/js/services/calendar.js
+++ b/js/services/calendar.js
@@ -60,6 +60,12 @@
var cur_event = null;
for (var i = 0; i < cal_array.length; i++) {
var ln = cal_array[i];
+
+ // Extract calendar name
+ if (ln.startsWith('X-WR-CALNAME')) {
+ var calendarName = ln.split(':')[1];
+ }
+
//If we encounted a new Event, create a blank event object + set in event options.
if (!in_event && ln == 'BEGIN:VEVENT') {
var in_event = true;
@@ -68,6 +74,7 @@
//If we encounter end event, complete the object and add it to our events array then clear it for reuse.
if (in_event && ln == 'END:VEVENT') {
in_event = false;
+ cur_event.calendarName = calendarName;
if(!contains(events, cur_event)) {
events.push(cur_event);
}
@@ -89,12 +96,21 @@
//If the type is a start date, proccess it and store details
if (type.startsWith('DTSTART')) {
cur_event.start = makeDate(type, val);
+ cur_event.startName = makeDate(type, val).calendar().toUpperCase();
}
//If the type is an end date, do the same as above
else if (type.startsWith('DTEND')) {
cur_event.end = makeDate(type, val);
+
+ // Subtract one second so that single-day events endon the same day
+ cur_event.endName = makeDate(type, val).subtract(1, 'seconds').calendar().toUpperCase();
+ }
+
+ if (cur_event.startName && cur_event.endName) {
+ cur_event.label = cur_event.startName + " - " + cur_event.endName;
}
+
//Convert timestamp
else if (type == 'DTSTAMP') {
//val = makeDate(type, val);
@@ -127,8 +143,11 @@
var startDate = moment(dt);
var endDate = moment(dt);
endDate.add(event_duration, 'minutes');
+ recuring_event.calendarName = calendarName;
recuring_event.start = startDate;
+ recuring_event.startName = startDate.calendar().toUpperCase();
recuring_event.end = endDate;
+ recuring_event.endName = endDate.subtract(1, 'seconds').calendar().toUpperCase();
if(!contains(events, recuring_event)) {
events.push(recuring_event);
}
diff --git a/js/services/fitbit.js b/js/services/fitbit.js
index 583db1286..2c7f34c5b 100644
--- a/js/services/fitbit.js
+++ b/js/services/fitbit.js
@@ -1,10 +1,5 @@
(function() {
'use strict';
-
- var express = require('express');
- var app = express();
- var fs = require( 'fs' );
- var Fitbit = require( 'fitbit-oauth2' );
function FitbitService($http) {
@@ -33,58 +28,81 @@
}
};
+ service.getToday = function(){
+ var today = new Date();
+ var dd = today.getDate();
+ var mm = today.getMonth()+1; //January is 0!
+ var yyyy = today.getFullYear();
+
+ // Add padding for the date, (we want 0x where x is the day or month number if its less than 10)
+ if(dd<10) {
+ dd='0'+dd;
+ }
+
+ if(mm<10) {
+ mm='0'+mm
+ }
+
+ return yyyy+'-'+mm+'-'+dd;
+ }
+
// Instantiate a fitbit client.
//
var fitbit = {};
if (typeof config.fitbit != 'undefined') {
fitbit = new Fitbit(config.fitbit);
- }
- // In a browser, http://localhost:4000/fitbit to authorize a user for the first time.
- //
- app.get('/fitbit', function (req, res) {
- res.redirect(fitbit.authorizeURL());
- });
+ var express = require('express');
+ var app = express();
+ var fs = require( 'fs' );
+ var Fitbit = require( 'fitbit-oauth2' );
- // Callback service parsing the authorization token and asking for the access token. This
- // endpoint is refered to in config.fitbit.authorization_uri.redirect_uri. See example
- // config below.
- //
- app.get('/fitbit_auth_callback', function (req, res, next) {
- var code = req.query.code;
- fitbit.fetchToken( code, function(err, token) {
- if (err) return next(err);
+ // In a browser, http://localhost:4000/fitbit to authorize a user for the first time.
+ //
+ app.get('/fitbit', function (req, res) {
+ res.redirect(fitbit.authorizeURL());
+ });
- // persist the token
- persist.write(tfile, token, function(err) {
+ // Callback service parsing the authorization token and asking for the access token. This
+ // endpoint is refered to in config.fitbit.authorization_uri.redirect_uri. See example
+ // config below.
+ //
+ app.get('/fitbit_auth_callback', function (req, res, next) {
+ var code = req.query.code;
+ fitbit.fetchToken( code, function(err, token) {
if (err) return next(err);
- res.redirect('/fb-profile');
- });
- });
- });
- // Call an API. fitbit.request() mimics nodejs request() library, automatically
- // adding the required oauth2 headers. The callback is a bit different, called
- // with ( err, body, token ). If token is non-null, this means a refresh has happened
- // and you should persist the new token.
- //
- app.get( '/fb-profile', function(req, res, next) {
- fitbit.request({
- uri: "https://api.fitbit.com/1/user/-/profile.json",
- method: 'GET',
- }, function(err, body, token) {
- if (err) return next(err);
- var profile = JSON.parse(body);
- // if token is not null, a refesh has happened and we need to persist the new token
- if (token)
+ // persist the token
persist.write(tfile, token, function(err) {
if (err) return next(err);
- res.send('
-
-
-
- -
-
-
- - {{ result.date | date : 'EEE MMM, yyyy hh:mm:ss a' }} - {{ result.content }} - -
' + JSON.stringify(profile, null, 2) + ''); + res.redirect('/fb-profile'); }); - else - res.send('
' + JSON.stringify(profile, null, 2) + ''); + }); + }); + + // Call an API. fitbit.request() mimics nodejs request() library, automatically + // adding the required oauth2 headers. The callback is a bit different, called + // with ( err, body, token ). If token is non-null, this means a refresh has happened + // and you should persist the new token. + // + app.get( '/fb-profile', function(req, res, next) { + fitbit.request({ + uri: "https://api.fitbit.com/1/user/-/profile.json", + method: 'GET', + }, function(err, body, token) { + if (err) return next(err); + var profile = JSON.parse(body); + // if token is not null, a refesh has happened and we need to persist the new token + if (token) + persist.write(tfile, token, function(err) { + if (err) return next(err); + res.send('
' + JSON.stringify(profile, null, 2) + ''); + }); + else + res.send('
' + JSON.stringify(profile, null, 2) + ''); + }); }); - }); + } // Only start up express and enable the fitbit service to start making API calls if the fitbit config is present in config.js. if (typeof config.fitbit != 'undefined') { @@ -146,21 +164,7 @@ return null; } - var today = new Date(); - var dd = today.getDate(); - var mm = today.getMonth()+1; //January is 0! - var yyyy = today.getFullYear(); - - // Add padding for the date, (we want 0x where x is the day or month number if its less than 10) - if(dd<10) { - dd='0'+dd - } - - if(mm<10) { - mm='0'+mm - } - - today = yyyy+'-'+mm+'-'+dd; + today = service.getToday(); // Make an API call to get the users activities for today fitbit.request({ @@ -171,7 +175,37 @@ console.log(err); } var result = JSON.parse(body); + console.log(result); + // If the token arg is not null, then a refresh has occured and + // we must persist the new token. + if (token) { + persist.write(tfile, token, function(err) { + if (err) console.log(err); + }); + } + return callback(result); + }); + + + } + + service.sleepSummary = function(callback) { + if(service.today === null){ + return null; + } + + today = service.getToday(); + // Make an API call to get the users sleep summary for today + fitbit.request({ + uri: "https://api.fitbit.com/1/user/-/sleep/date/" + today + ".json", + method: 'GET', + }, function(err, body, token) { + if (err) { + console.log(err); + } + var result = JSON.parse(body); + console.log(result); // If the token arg is not null, then a refresh has occured and // we must persist the new token. if (token) { @@ -181,8 +215,38 @@ } return callback(result); }); + + } + service.deviceSummary = function(callback) { + if(service.today === null){ + return null; + } + + // Make an API call to get the users device status + fitbit.request({ + uri: "https://api.fitbit.com/1/user/-/devices.json", + method: 'GET', + }, function(err, body, token) { + if (err) { + console.log(err); + } + var result = JSON.parse(body); + console.log(result); + // If the token arg is not null, then a refresh has occured and + // we must persist the new token. + if (token) { + persist.write(tfile, token, function(err) { + if (err) console.log(err); + }); + } + return callback(result); + }); + + + } + return service; } diff --git a/js/services/geolocation.js b/js/services/geolocation.js index bdae63aba..60572f7bd 100644 --- a/js/services/geolocation.js +++ b/js/services/geolocation.js @@ -23,14 +23,14 @@ var deferred = $q.defer(); // Use geo postion from config file if it is defined - if(typeof config.geo_position != 'undefined' - && typeof config.geo_position.latitude != 'undefined' - && typeof config.geo_position.longitude != 'undefined'){ + if(typeof config.geoPosition != 'undefined' + && typeof config.geoPosition.latitude != 'undefined' + && typeof config.geoPosition.longitude != 'undefined'){ deferred.resolve({ coords: { - latitude: config.geo_position.latitude, - longitude: config.geo_position.longitude, + latitude: config.geoPosition.latitude, + longitude: config.geoPosition.longitude, }, }); diff --git a/js/services/hue.js b/js/services/hue.js deleted file mode 100644 index 96ab095a9..000000000 --- a/js/services/hue.js +++ /dev/null @@ -1,125 +0,0 @@ -(function() { - 'use strict'; - - function HueService($http, $translate) { - var service = {}; - //Updates a group of Hue lights (Assumes that one group is configured) - //You can change the group to 0 to perform the updates to all lights - service.performUpdate = function(spokenWords) { - var spokenWordsArray = spokenWords.toLowerCase().split(" "); - //deturmine the updates that we need to perform to the lights - var update = deturmineUpdates(spokenWordsArray); - // Deturmine which light to swith on/off - var light = deturmineLight(spokenWordsArray); - //Parse the update string and see what actions we need to perform - console.log("Updating hue group [" + light + "]:", update); - - $http.put('http://' + config.hue.ip + '/api/' + config.hue.uername + "/groups/" + light + "/action", update) - .success(function (data, status, headers) { - console.log(data); - }) - } - - //Detect any kind of target color - function deturmineUpdates(spokenWords){ - var update = {}; - - update["transitiontime"] = 10; - - for(var i = 0; i < spokenWords.length; i++){ - - //Check for color updates - if($translate.instant('lights.colors.red') == spokenWords[i]){ - update["xy"] = [0.674,0.322]; - } else if($translate.instant('lights.colors.dark_green') == spokenWords[i]){ - update["xy"] = [0.408,0.517]; - } else if($translate.instant('lights.colors.green') == spokenWords[i]){ - update["xy"] = [0.408,0.517]; - } else if($translate.instant('lights.colors.blue') == spokenWords[i]){ - update["xy"] = [0.168,0.041]; - } else if($translate.instant('lights.colors.yellow') == spokenWords[i]){ - update["xy"] = [0.4317,0.4996]; - } else if($translate.instant('lights.colors.orange') == spokenWords[i]){ - update["xy"] = [0.5562,0.4084]; - } else if($translate.instant('lights.colors.pink') == spokenWords[i]){ - update["xy"] = [0.3824,0.1601]; - } else if($translate.instant('lights.colors.purple') == spokenWords[i]){ - update["xy"] = [0.2725,0.1096]; - } else if($translate.instant('lights.colors.white') == spokenWords[i]){ - update["xy"] = [0.3227,0.329]; - } else if($translate.instant('lights.colors.movie') == spokenWords[i]){ - update["xy"] = [0.3227,0.329]; - update["sat"] = 0; - update["bri"] = 15; - } else if($translate.instant('lights.colors.colorloop') == spokenWords[i]){ - update["effect"] = "colorloop"; - } else if($translate.instant('lights.colors.stop') == spokenWords[i]){ - update["effect"] = "none"; - update["xy"] = [0.3227,0.329]; - update["sat"] = 0; - update["bri"] = 255; - } - - //check for a brightness adjustment - if(spokenWords[i] == '10'){ - update["bri"] = 26; - } else if(spokenWords[i] == '20'){ - update["bri"] = 51; - } else if(spokenWords[i] == '25'){ - update["bri"] = 64; - } else if(spokenWords[i] == '30'){ - update["bri"] = 77; - } else if(spokenWords[i] == '40'){ - update["bri"] = 102; - } else if(spokenWords[i] == '50'){ - update["bri"] = 128; - } else if(spokenWords[i] == '60'){ - update["bri"] = 153; - } else if(spokenWords[i] == '70'){ - update["bri"] = 179; - } else if(spokenWords[i] == '75'){ - update["bri"] = 191; - } else if(spokenWords[i] == '80'){ - update["bri"] = 204; - } else if(spokenWords[i] == '90'){ - update["bri"] = 230; - } else if(spokenWords[i] == '100'){ - update["bri"] = 255; - } else if($translate.instant('lights.intensity.increase') == spokenWords[i]){ - update["bri_inc"] = 51; // 20% - } else if($translate.instant('lights.intensity.decrease') == spokenWords[i]){ - update["bri_inc"] = -51; // 20% - } else if($translate.instant('lights.intensity.max') == spokenWords[i]){ - update["bri"] = 254; - } - - //are we turning the lights on or off? - if($translate.instant('lights.action.on') == spokenWords[i]){ - update["on"] = true; - update["bri"] = 250; - } else if($translate.instant('lights.action.off') == spokenWords[i]){ - update["on"] = false; - } - } - return update; - } - - // Detect light - // TODO make this return an array of groups to update - function deturmineLight(spokenWords){ - for(var i = 0; i < spokenWords.length; i++){ - for (var j = 0; j < config.hue.groups.length; j++){ - if (spokenWords[i] == config.hue.groups[j].name){ - return j; - } - } - } - return 0; - } - return service; - } - - angular.module('SmartMirror') - .factory('HueService', HueService); - -}()); diff --git a/js/services/light.js b/js/services/light.js new file mode 100644 index 000000000..860c88559 --- /dev/null +++ b/js/services/light.js @@ -0,0 +1,202 @@ +(function() { + 'use strict'; + + var Hyperion = require('hyperion-client'); + + function LightService($http, $translate) { + var service = {}; + + // update lights + service.performUpdate = function(spokenWords){ + // split string into separate words and remove empty ones + var spokenWords = spokenWords.toLowerCase().split(" ").filter(Boolean); + + // what locations are defined in the config + var definedLocations = []; + for(var i = 0; i < config.light.setup.length; i++){ + definedLocations.push(config.light.setup[i].name.toLowerCase()); + } + + var SaidParameter = {}; + SaidParameter['locations'] = []; + SaidParameter['on'] = true; + + // what has been said + for(var i = 0; i < spokenWords.length; i++){ + var index = definedLocations.indexOf(spokenWords[i]); + if(index > -1){ + SaidParameter['locations'].push(index); + } + + // turn lights on or off? + if($translate.instant('lights.action.off') == spokenWords[i]){ + SaidParameter['on'] = false; + } + + // Choose Color + if($translate.instant('lights.colors.red') == spokenWords[i]){ + SaidParameter['colorRGB'] = [255, 0, 0]; + SaidParameter['colorHSV'] = [0, 255, 254]; + } else if($translate.instant('lights.colors.green') == spokenWords[i]){ + SaidParameter['colorRGB'] = [0, 255, 0]; + SaidParameter['colorHSV'] = [25500, 255, 254]; + } else if($translate.instant('lights.colors.blue') == spokenWords[i]){ + SaidParameter['colorRGB'] = [0, 0, 255]; + SaidParameter['colorHSV'] = [46920, 255, 254]; + } else if($translate.instant('lights.colors.yellow') == spokenWords[i]){ + SaidParameter['colorRGB'] = [255, 255, 0]; + SaidParameter['colorHSV'] = [10920, 255, 254]; + } else if($translate.instant('lights.colors.orange') == spokenWords[i]){ + SaidParameter['colorRGB'] = [255, 127, 0]; + SaidParameter['colorHSV'] = [5460, 255, 254]; + } else if($translate.instant('lights.colors.pink') == spokenWords[i]){ + SaidParameter['colorRGB'] = [255, 0, 255]; + SaidParameter['colorHSV'] = [54610, 255, 254]; + } else if($translate.instant('lights.colors.purple') == spokenWords[i]){ + SaidParameter['colorRGB'] = [127, 0, 127]; + SaidParameter['colorHSV'] = [54610, 255, 127]; + } else if($translate.instant('lights.colors.white') == spokenWords[i]){ + SaidParameter['colorRGB'] = [255, 255, 255]; + SaidParameter['colorHSV'] = [0, 0, 254]; + } + + // Adjust brightness + if(spokenWords[i] == '100%' || $translate.instant('lights.intensity.max').includes(spokenWords[i])){ + SaidParameter['brightness'] = 1.0; + } else if(spokenWords[i] == '10%'){ + SaidParameter['brightness'] = 0.1; + } else if(spokenWords[i] == '20%'){ + SaidParameter['brightness'] = 0.2; + } else if(spokenWords[i] == '25%' || $translate.instant('lights.intensity.quarter').includes(spokenWords[i])){ + SaidParameter['brightness'] = 0.25; + } else if(spokenWords[i] == '30%'){ + SaidParameter['brightness'] = 0.3; + } else if(spokenWords[i] == '40%'){ + SaidParameter['brightness'] = 0.3; + } else if(spokenWords[i] == '50%' || $translate.instant('lights.intensity.half').includes(spokenWords[i])){ + SaidParameter['brightness'] = 0.5; + } else if(spokenWords[i] == '60%'){ + SaidParameter['brightness'] = 0.6; + } else if(spokenWords[i] == '70%'){ + SaidParameter['brightness'] = 0.7; + } else if(spokenWords[i] == '75%' || $translate.instant('lights.intensity.threequarter').includes(spokenWords[i])){ + SaidParameter['brightness'] = 0.75; + } else if(spokenWords[i] == '80%'){ + SaidParameter['brightness'] = 0.8; + } else if(spokenWords[i] == '90%'){ + SaidParameter['brightness'] = 0.9; + } + + // special mode + if($translate.instant('lights.action.nightmode').includes(spokenWords[i])){ + SaidParameter['colorRGB'] = [255, 0, 0]; + SaidParameter['colorHSV'] = [0, 255, 254]; + SaidParameter['brightness'] = 0.1 + } + + // reset all LED + if($translate.instant('lights.action.reset').includes(spokenWords[i])){ + localStorage.clear() + } + + } + + // if spoken words contain no location, use all defined locations + if(SaidParameter['locations'].length == 0){ + for(var i = 0; i < definedLocations.length; i++){ + SaidParameter['locations'].push(i); + } + } + + var SavedSettings = []; + + // get remaining info from local storage + for(var j = 0 ; j < SaidParameter['locations'].length; j++){ + var i = SaidParameter['locations'][j]; + var SavedSetting = {}; + // read settings from storage or use default + if(localStorage.getItem('Light_Setup_' + i) == null){ + SavedSetting['colorRGB'] = [255, 255, 255]; + SavedSetting['colorHSV'] = [0, 0, 254]; + SavedSetting['brightness'] = 0.4 + } + else{ + SavedSetting = JSON.parse(localStorage.getItem('Light_Setup_' + i)); + } + + // overwrite settings with spoken info + for(var key in SaidParameter){ + if(SaidParameter.hasOwnProperty(key)) { + SavedSetting[key] = SaidParameter[key]; + } + } + + // save new values in local storage + localStorage.setItem('Light_Setup_' + i, JSON.stringify(SavedSetting)); + + SavedSetting['location'] = i; + + SavedSettings.push(SavedSetting); + } + + SavedSettings.map(updateLights); + } + + function updateLights(setting){ + var index = setting['location']; + for(var i = 0; i < config.light.setup[index].targets.length; i++){ + if(config.light.setup[index].targets[i].type == "hyperion"){ + updateHyperion(i, index, setting); + } + else if(config.light.setup[index].targets[i].type == "hue"){ + updateHue(i, index, setting); + } + } + } + + function updateHyperion(i, index, setting){ + // Convert color and brightness + for(var j = 0; j < setting['colorRGB'].length; j++){ + setting['colorRGB'][j] = Math.round(setting['colorRGB'][j] * setting['brightness']); + } + // Connect to the configured Hyperion client + var hyperion = new Hyperion(config.light.setup[index].targets[i].ip, config.light.setup[index].targets[i].port); + + hyperion.on('connect', function(){ + if(setting['on']){ + hyperion.setColor(setting['colorRGB']); + } + else{ + hyperion.clearall(); + } + }); + + hyperion.on('error', function(error){ + console.error('error:', error); + }); + } + + function updateHue(i, index, setting){ + var update = {}; + update["transitiontime"] = 10; + + update['on'] = setting['on']; + if(setting['on']){ + update['hue'] = setting['colorHSV'][0]; + update['sat'] = setting['colorHSV'][1]; + update['bri'] = Math.round(setting['colorHSV'][2] * setting['brightness']); + } + + $http.put('http://' + config.light.settings.hueIp + '/api/' + config.light.settings.hueUsername + "/groups/" + config.light.setup[index].targets[i].id + "/action", update) + .success(function (data, status, headers) { + console.log(data); + }) + } + + return service; + } + + angular.module('SmartMirror') + .factory('LightService', LightService); + +}()); diff --git a/js/services/rss.js b/js/services/rss.js index bb2e9d9b6..3e140c976 100644 --- a/js/services/rss.js +++ b/js/services/rss.js @@ -1,7 +1,7 @@ (function(annyang) { 'use strict'; - function RssService($http) { + function RssService($http, $q) { var service = {}; service.feed = []; service.currentFeed = 0; @@ -11,24 +11,29 @@ service.currentFeed = 0; var currentTime = new moment(); - angular.forEach(config.rss.feeds, function(url) { - $http.jsonp('http://ajax.googleapis.com/ajax/services/feed/load?v=1.0&num=50&callback=JSON_CALLBACK&q=' + encodeURIComponent(url)).then(function(response) { - for (var i=0; i < response.data.responseData.feed.entries.length; i++){ - var feedEntry = { - title : response.data.responseData.feed.title, - content: response.data.responseData.feed.entries[i].title, - lastUpdated : currentTime, - }; - //console.log(feedEntry); - service.feed.push(feedEntry); - } + if (typeof config.rss != 'undefined'){ + var promises = []; + angular.forEach(config.rss.feeds, function(url) { + promises.push($http.jsonp('https://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20xml%20where%20url%20%3D%20\'' + encodeURIComponent(url) + '\'&format=json&env=store%3A%2F%2Fdatatables.org%2Falltableswithkeys&callback=JSON_CALLBACK')); }); - }); - return service.feed; + + return $q.all(promises).then(function(response) { + for (var i=0; i < response['0'].data.query.results.rss.channel.item.length; i++){ + var feedEntry = { + title : response['0'].data.query.results.rss.channel.title, + content: response['0'].data.query.results.rss.channel.item[i].title, + lastUpdated : currentTime, + }; + service.feed.push(feedEntry); + } + }); + } }; service.refreshRssList = function() { - return service.init(); + return service.init().then(function(entries) { + return entries; + }); }; service.getNews = function() { diff --git a/js/services/scrobbler.js b/js/services/scrobbler.js new file mode 100644 index 000000000..8d4a7a39f --- /dev/null +++ b/js/services/scrobbler.js @@ -0,0 +1,40 @@ +(function(annyang) { + 'use strict'; + + function ScrobblerService($http, $q) { + var service = {}; + + service.getCurrentTrack = function () { + var deferred = $q.defer(); + if (config.lastfm.user && config.lastfm.key) { + var url = "http://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user="+config.lastfm.user+"&api_key="+config.lastfm.key+"&limit=1&format=json"; + + $http.get(url).then(function(response) { + if (response.data.error){ + // If there is an error with the request (excluding network errors) + console.log("Scrobbler Error: ", response.data.message); + deferred.reject(response); + } else if (typeof response.data.recenttracks.track[0]["@attr"] == "object"){ + // If there is a track currently playing + var track = response.data.recenttracks.track[0]; + deferred.resolve({ + title: track.name, + artist: track.artist["#text"] || "Unknown", + album: track.album["#text"] || "", + cover: track.image[1]["#text"], + }); + } else { + // Either there was a network error or there is no song currently playing + deferred.reject(response); + } + }); + } + return deferred.promise; + } + + return service; + } + + angular.module('SmartMirror') + .factory('ScrobblerService', ScrobblerService); +}(window.annyang)); diff --git a/js/services/soundcloud.js b/js/services/soundcloud.js index 73067094b..e313029e7 100644 --- a/js/services/soundcloud.js +++ b/js/services/soundcloud.js @@ -76,7 +76,7 @@ var canvas = document.getElementById('visualizer'); var canvasCtx = canvas.getContext("2d"); - var WIDTH = 150; + var WIDTH = 300; var HEIGHT = 150; canvasCtx.fillStyle = 'rgb(0, 0, 0)'; diff --git a/js/services/stock.js b/js/services/stock.js new file mode 100644 index 000000000..7eb4cf2e3 --- /dev/null +++ b/js/services/stock.js @@ -0,0 +1,27 @@ +(function(annyang) { + 'use strict'; + + function StockService($window, $http, $q) { + var service = {}; + + service.getStockQuotes = function() { + var deferred = $q.defer(); + if (config.stock.names.length) { + var url = 'https://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20yahoo.finance.quote%20where%20symbol%20in%20('+"'" + config.stock.names.join("','") + "'"+')&env=store%3A%2F%2Fdatatables.org%2Falltableswithkeys&format=json'; + + $http.get(url).then(function(response) { + deferred.resolve(response.data); + }, function(error) { + deferred.reject('Unknown error'); + }); + } + + return deferred.promise; + } + + return service; + } + + angular.module('SmartMirror') + .factory('StockService', StockService); +}(window.annyang)); diff --git a/js/services/traffic.js b/js/services/traffic.js index 6420ef87e..f601d0f1c 100644 --- a/js/services/traffic.js +++ b/js/services/traffic.js @@ -37,6 +37,7 @@ } else { trip.duration = moment.duration(response.data.resourceSets[0].resources[0].travelDurationTraffic, 'seconds') } + deferred.resolve(trip); }, function(error) { // Most of the time this is because an address can't be found @@ -54,7 +55,13 @@ // Depending on the mode of transport different paramaters are required. function getEndpoint(trip){ - var endpoint = BING_MAPS + trip.mode + "?wp.0=" + trip.origin + "&wp.1="+trip.destination; + var waypoints = 1; + var intermediateGoal = ""; + if (typeof trip.via !== 'undefined' && trip.via != "") { + waypoints = 2; + intermediateGoal = "&wp.1=" + trip.via; + } + var endpoint = BING_MAPS + trip.mode + "?wp.0=" + trip.origin + intermediateGoal + "&wp."+ waypoints + "="+trip.destination; if(trip.mode == "Driving"){ endpoint += "&avoid=minimizeTolls"; } else if(trip.mode == "Transit"){ diff --git a/js/services/weather.js b/js/services/weather.js index ee37f4a1e..35b2ba737 100644 --- a/js/services/weather.js +++ b/js/services/weather.js @@ -8,15 +8,23 @@ service.init = function(geoposition) { geoloc = geoposition; + var language = (typeof config.language !== 'undefined')?config.language.substr(0, 2) : "en" return $http.jsonp('https://api.forecast.io/forecast/'+config.forecast.key+'/'+ geoposition.coords.latitude+','+geoposition.coords.longitude+'?units=' + - config.forecast.units + "&lang="+ config.language.substr(0, 2) + "&callback=JSON_CALLBACK") + config.forecast.units + "&lang=" + language + "&callback=JSON_CALLBACK") .then(function(response) { return service.forecast = response; }); }; - //Returns the current forecast along with high and low tempratures for the current day + service.minutelyForecast = function(){ + if(service.forecast === null){ + return null; + } + return service.forecast.data.minutely; + } + + //Returns the current forecast along with high and low tempratures for the current day service.currentForecast = function() { if(service.forecast === null){ return null; diff --git a/locales/de.json b/locales/de.json index 4d7f7ff17..45d5c3d5f 100644 --- a/locales/de.json +++ b/locales/de.json @@ -6,7 +6,7 @@ "time_to" : "Zeit bis {{name}}: " }, "reminders": { - "empty": "Keine Erinnerungen" + "empty": "Keine Erinnerungen." }, "timer": { "one": "Eine", @@ -31,11 +31,16 @@ "intensity": { "increase": "heller", "decrease": "dunkler", - "max": "maximal" + "max": "maximal", + "half": "halber", + "quarter": "viertel", + "threequarter": "dreiviertel" }, "action": { "on": "an", - "off": "aus" + "off": "aus", + "nightmode": "nachtmodus", + "reset": "zurücksetzen" } }, "commands": { @@ -83,7 +88,7 @@ "map_zoom_out": { "text": "verkleinern", "voice": "(Karte) verkleinern", - "description": "Verkleinert die aktulle Karte" + "description": "Verkleinert die aktuelle Karte." }, "map_zoom_point": { "text": "vergrößere ________", @@ -93,7 +98,7 @@ "map_zoom_reset": { "text": "Normalansicht", "voice": "(Karte) Normalansicht", - "description": "Setzt die Ansicht zurück" + "description": "Setzt die Ansicht zurück." }, "video_search": { "text": "Zeige mir ________", @@ -103,12 +108,12 @@ "video_stop": { "text": "Stop video", "voice": "stop (the) video", - "description": "Stops the playback of video content." + "description": "Stopt die Video Wiedergabe." }, "image_giphy": { "text": "Bild von ________", "voice": "Bild von *img", - "description": "Zeigt ein Giphy Bild" + "description": "Zeigt ein Giphy Bild." }, "image_comic": { "text": "Zeige Comic", @@ -118,7 +123,7 @@ "image_comic_dilbert": { "text": "Dilbert Comic", "voice": "Dilbert", - "description": "Dilbert Comic" + "description": "Zeigt den aktuellsten Dilbert Comic." }, "reminder_insert": { "text": "Erinnere mich an ________", @@ -163,27 +168,27 @@ "sc_play": { "text": "SoundCloud play ________", "voice": "SoundCloud play *query", - "description": "Play a song on SoundCloud" + "description": "Spielt einen Song auf SoundCloud." }, "sc_pause": { "text": "SoundCloud pause/stop", "voice": "SoundCloud (pause)(post)(stop)(stock)", - "description": "Stop/pause SoundCoud playback" + "description": "Stoppt/Pausiert die SoundCoud Wiedergabe." }, "sc_resume": { "text": "SoundCloud play", "voice": "SoundCloud (play)(resume)", - "description": "Resumes playback" + "description": "Setzt die Soundcloud Wiedergabe fort." }, "sc_replay": { "text": "SoundCloud replay", "voice": "SoundCloud replay", - "description": "Replays the current song on SoundCloud" + "description": "Spielt den aktuellen Song erneut auf Soundcloud." }, "light_action": { - "text": "Schalte das (state) Licht (action)", - "voice": "(Schalte) (das) :state (die) Licht(er) *action", - "description": "(Schalte) (das) :state (die) Licht(er) *action" + "text": "Schalte (das|die) Licht(er) (action)", + "voice": "(Schalte) (das) (die) Licht(er) *action", + "description": "Steuert Farbe und Helligkeit von Lichtern." } } } diff --git a/locales/en.json b/locales/en.json index dbb1a84e8..42f2842f5 100644 --- a/locales/en.json +++ b/locales/en.json @@ -6,7 +6,7 @@ "time_to" : "Time to {{name}}: " }, "reminders": { - "empty": "Empty list" + "empty": "Empty list." }, "timer": { "one": "One", @@ -31,11 +31,16 @@ "intensity": { "increase": "increase", "decrease": "decrease", - "max": "max" + "max": "max", + "half": "half", + "quarter": "quarter", + "threequarter": ["three-quarter", "three-fourth"] }, "action": { "on": "on", - "off": "off" + "off": "off", + "nightmode": "nightmode", + "reset": "reset" } }, "commands": { @@ -48,22 +53,22 @@ "home": { "text": "Go home", "voice": "Go home", - "description": "Takes you back to the home screen" + "description": "Takes you back to the home screen." }, "sleep": { "text": "Go to sleep", "voice": "Go to sleep", - "description": "Go to sleep" + "description": "Go to sleep." }, "wake_up": { "text": "Wake up", "voice": "Wake up", - "description": "Wake up" + "description": "Wake up." }, "debug": { "text": "Show debug information", "voice": "Show debug information", - "description": "Show debug information" + "description": "Show debug information." }, "map_show": { "text": "Show map", @@ -78,22 +83,22 @@ "map_zoom_in": { "text": "Zoom in", "voice": "(map) zoom in", - "description": "Zooms in the current map" + "description": "Zooms in the current map." }, "map_zoom_out": { "text": "Zoom out", "voice": "(map) zoom out", - "description": "Zooms out the current map" + "description": "Zooms out the current map." }, "map_zoom_point": { "text": "Zoom to ________", "voice": "(map) zoom (to) *value", - "description": "Zooms to indicated point" + "description": "Zooms to indicated point." }, "map_zoom_reset": { "text": "Reset zoom", "voice": "(map) reset zoom", - "description": "Resets zoom" + "description": "Resets zoom." }, "video_search": { "text": "Show me ________", @@ -108,7 +113,7 @@ "image_giphy": { "text": "Giphy ________", "voice": "giphy *img", - "description": "Shows a giphy image" + "description": "Shows a Giphy image." }, "image_comic": { "text": "Show xkcd", @@ -118,7 +123,7 @@ "image_comic_dilbert": { "text": "Show Dilbert comic", "voice": "Show Dilbert (comic)", - "description": "Show Dilbert comic." + "description": "Show the most recent Dilbert comic." }, "reminder_insert": { "text": "Remind me to ________", @@ -133,12 +138,12 @@ "reminder_show": { "text": "Show me reminders", "voice": "Show me reminders", - "description": "Display the reminders list" + "description": "Display the reminders list." }, "time_show": { "text": "what time is it", "voice": "what time is it", - "description": "what time is it" + "description": "Shows the current time." }, "timer_start": { "text": "Timer for ________", @@ -158,32 +163,32 @@ "timer_resume": { "text": "Resume timer", "voice": "resume (the) timer", - "description": "Resume timer" + "description": "Resume timer." }, "sc_play": { "text": "SoundCloud play ________", "voice": "SoundCloud play *query", - "description": "Play a song on SoundCloud" + "description": "Play a song on SoundCloud." }, "sc_pause": { "text": "SoundCloud pause/stop", "voice": "SoundCloud (pause)(post)(stop)(stock)", - "description": "Stop/pause SoundCoud playback" + "description": "Stop/pause SoundCoud playback." }, "sc_resume": { "text": "SoundCloud play", "voice": "SoundCloud (play)(resume)", - "description": "Resumes playback" + "description": "Resumes playback." }, "sc_replay": { "text": "SoundCloud replay", "voice": "SoundCloud replay", - "description": "Replays the current song on SoundCloud" + "description": "Replays the current song on SoundCloud." }, "light_action": { - "text": "Turn the (state) light (action)", + "text": "Turn (state) light(s) (action)", "voice": "(turn) (the) :state (the) light(s) *action", - "description": "(turn) (the) :state (the) light(s) *action" + "description": "Control color and brightness of lights." } } } diff --git a/locales/es.json b/locales/es.json index 7c30ee8b8..48530d259 100644 --- a/locales/es.json +++ b/locales/es.json @@ -6,7 +6,7 @@ "time_to" : "Tiempo al {{name}}: " }, "reminders": { - "empty": "No recuerdo" + "empty": "No recuerdo." }, "timer": { "one": "Uno", @@ -43,62 +43,62 @@ "list": { "text": "¿Qué digo?", "voice": "Que digo", - "description": "Lista de los comandos de voz" + "description": "Lista de los comandos de voz." }, "home": { "text": "Vuelve", "voice": "Vuelve", - "description": "Vuelve al menú principal" + "description": "Vuelve al menú principal." }, "sleep": { "text": "Duerme", "voice": "Duerme", - "description": "Duerme el sistema" + "description": "Duerme el sistema." }, "wake_up": { "text": "Despierta", "voice": "Despierta", - "description": "Despierta el sistema" + "description": "Despierta el sistema." }, "debug": { "text": "Opciones", "voice": "Opciones", - "description": "Muestra información de depuración" + "description": "Muestra información de depuración." }, "map_show": { "text": "Muestra el mapa", "voice": "Muestra el mapa", - "description": "Muestra el mapa de tu posición actual" + "description": "Muestra el mapa de tu posición actual." }, "map_location": { "text": "Muestra el mapa", "voice": "Muestra el mapa de *location", - "description": "Muestra el mapa de la posición indicada" + "description": "Muestra el mapa de la posición indicada." }, "map_zoom_in": { "text": "Centra el mapa", "voice": "Centra (el mapa)", - "description": "Centra el mapa" + "description": "Centra el mapa." }, "map_zoom_out": { "text": "Amplia el mapa", "voice": "Amplia (el mapa)", - "description": "Amplia el mapa" + "description": "Amplia el mapa." }, "map_zoom_point": { "text": "Apunta el mapa a _______", "voice": "Apunta (el mapa) a *value", - "description": "Apunta el mapa a un punto en concreto" + "description": "Apunta el mapa a un punto en concreto." }, "map_zoom_reset": { "text": "Resetea el mapa", "voice": "Resetea (el) (mapa)", - "description": "Resetea (el) (mapa)" + "description": "Resetea (el) (mapa)." }, "video_search": { "text": "Busca imagen de _______", "voice": "Busca imagen de *term", - "description": "Busca una imagen" + "description": "Busca una imagen." }, "video_stop": { "text": "Stop video", @@ -108,12 +108,12 @@ "image_giphy": { "text": "Busca animacion de _______", "voice": "Busca animacion de *img", - "description": "Busca animacion de algún tema" + "description": "Busca animacion de algún tema." }, "image_comic": { "text": "Comic", "voice": "Comic (del dia)", - "description": "Muestra el comic del día" + "description": "Muestra el comic del día." }, "image_comic_dilbert": { "text": "Comic Dilbert", @@ -123,22 +123,22 @@ "reminder_insert": { "text": "Recuerdame hacer _______", "voice": "Recuerdame hacer *task", - "description": "Recuerdame hacer una tarea" + "description": "Recuerdame hacer una tarea." }, "reminder_clear": { "text": "Limpia la tareas pendientes", "voice": "Limpia la tareas pendientes", - "description": "Limpia la tareas pendientes" + "description": "Limpia la tareas pendientes." }, "reminder_show": { "text": "Muéstrame la lista de retiro", "voice": "Muéstrame la lista de retiro", - "description": "Muestra la lista de retiro" + "description": "Muestra la lista de retiro." }, "time_show": { "text": "¿Qué hora es?", "voice": "que hora es", - "description": "Muestra la hora actual" + "description": "Muestra la hora actual." }, "timer_start": { "text": "Temporizador a _______", @@ -163,27 +163,27 @@ "sc_play": { "text": "SoundCloud play ________", "voice": "SoundCloud play *query", - "description": "Play a song on SoundCloud" + "description": "Play a song on SoundCloud." }, "sc_pause": { "text": "SoundCloud pause/stop", "voice": "SoundCloud (pause)(post)(stop)(stock)", - "description": "Stop/pause SoundCoud playback" + "description": "Stop/pause SoundCoud playback." }, "sc_resume": { "text": "SoundCloud play", "voice": "SoundCloud (play)(resume)", - "description": "Resumes playback" + "description": "Resumes playback." }, "sc_replay": { "text": "SoundCloud replay", "voice": "SoundCloud replay", - "description": "Replays the current song on SoundCloud" + "description": "Replays the current song on SoundCloud." }, "light_action": { "text": "[estado] las luces a [acción]", "voice": ":state las luces a *action", - "description": "Cambia el estado de las luces" + "description": "Cambia el estado de las luces." } } } diff --git a/locales/fr.json b/locales/fr.json index df5d85162..92036d799 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -6,7 +6,7 @@ "time_to" : "Temps de {{name}}: " }, "reminders": { - "empty": "Aucun rappel" + "empty": "Aucun rappel." }, "timer": { "one": "Une", @@ -48,22 +48,22 @@ "home": { "text": "Accueil", "voice": "Accueil", - "description": "Vous ramène à l'écran d'accueil" + "description": "Vous ramène à l'écran d'accueil." }, "sleep": { "text": "Bonne nuit", "voice": "Bonne nuit", - "description": "Va te coucher" + "description": "Va te coucher." }, "wake_up": { "text": "Réveille toi", "voice": "Réveille toi", - "description": "Réveille Toi" + "description": "Réveille Toi." }, "debug": { "text": "Débogage", "voice": "Débogage", - "description": "Afficher les informations de débogage" + "description": "Afficher les informations de débogage." }, "map_show": { "text": "Affiche carte", @@ -78,22 +78,22 @@ "map_zoom_in": { "text": "Zoom avant", "voice": "Zoom (avant) (sur la carte)", - "description": "Zoom avant sur la carte actuelle" + "description": "Zoom avant sur la carte actuelle." }, "map_zoom_out": { "text": "Zoom arrière", "voice": "Zoom arrière (sur la carte)", - "description": "Zoom arrière sur la carte actuelle" + "description": "Zoom arrière sur la carte actuelle." }, "map_zoom_point": { "text": "Zoom vers ________", "voice": "Zoom (vers) *value", - "description": "Zoom vers le point indiqué" + "description": "Zoom vers le point indiqué." }, "map_zoom_reset": { "text": "Réinitialise zoom", "voice": "Réinitialise le zoom", - "description": "Réinitilalise la fonction zoom" + "description": "Réinitilalise la fonction zoom." }, "video_search": { "text": "(Re)cherche une image de ________", @@ -108,7 +108,7 @@ "image_giphy": { "text": "(Re)cherche une image animée de ________", "voice": "(Re)cherche une image animée de *img", - "description": "Affiche une image de giphy" + "description": "Affiche une image de giphy." }, "image_comic": { "text": "Montre(-moi) le dernier xkcd ", @@ -163,27 +163,27 @@ "sc_play": { "text": "SoundCloud play ________", "voice": "SoundCloud play *query", - "description": "Play a song on SoundCloud" + "description": "Play a song on SoundCloud." }, "sc_pause": { "text": "SoundCloud pause/stop", "voice": "SoundCloud (pause)(post)(stop)(stock)", - "description": "Stop/pause SoundCoud playback" + "description": "Stop/pause SoundCoud playback." }, "sc_resume": { "text": "SoundCloud play", "voice": "SoundCloud (play)(resume)", - "description": "Resumes playback" + "description": "Resumes playback." }, "sc_replay": { "text": "SoundCloud replay", "voice": "SoundCloud replay", - "description": "Replays the current song on SoundCloud" + "description": "Replays the current song on SoundCloud." }, "light_action": { "text": "(Allume|Éteins) (la|les) lumières (action)", "voice": ":state (les) (la) lumière(s) (*action)", - "description": ":state (les) (la) lumière(s) (*action)" + "description": ":state (les) (la) lumière(s) (*action)." } } } diff --git a/locales/ko.json b/locales/ko.json index b0b01ec0b..3bbb30817 100644 --- a/locales/ko.json +++ b/locales/ko.json @@ -6,7 +6,7 @@ "time_to" : "{{name}} 에 시간: " }, "reminders": { - "empty": "더 리콜 없습니다" + "empty": "더 리콜 없습니다." }, "timer": { "one": "일", @@ -53,12 +53,12 @@ "sleep": { "text": "잠자러가", "voice": "잠자러가", - "description": "잠자러가" + "description": "잠자러가." }, "wake_up": { "text": "일어나", "voice": "일어나", - "description": "일어나" + "description": "일어나." }, "debug": { "text": "디버그 정보 보여 줘", @@ -133,57 +133,57 @@ "reminder_show": { "text": "나에게 리콜 목록을 표시", "voice": "나에게 리콜 목록을 표시", - "description": "리콜 목록을 표시합니다" + "description": "리콜 목록을 표시합니다." }, "time_show": { "text": "지금 몇 시", "voice": "지금 몇 시", - "description": "지금 몇 시" + "description": "지금 몇 시." }, "timer_start": { "text": "______ 타이머 (설정)", "voice": "*duration 타이머 (설정)", - "description": "*duration 타이머 (설정)" + "description": "*duration 타이머 (설정)." }, "timer_show": { "text": "타이머 보여줄래", "voice": "타이머 보여줄래", - "description": "타이머 보여줄래" + "description": "타이머 보여줄래." }, "timer_stop": { "text": "타이머 정지", "voice": "타이머 정지", - "description": "타이머 정지" + "description": "타이머 정지." }, "timer_resume": { "text": "타이머 재시작", "voice": "타이머 재시작", - "description": "타이머 재시작" + "description": "타이머 재시작." }, "sc_play": { "text": "SoundCloud play ________", "voice": "SoundCloud play *query", - "description": "Play a song on SoundCloud" + "description": "Play a song on SoundCloud." }, "sc_pause": { "text": "SoundCloud pause/stop", "voice": "SoundCloud (pause)(post)(stop)(stock)", - "description": "Stop/pause SoundCoud playback" + "description": "Stop/pause SoundCoud playback." }, "sc_resume": { "text": "SoundCloud play", "voice": "SoundCloud (play)(resume)", - "description": "Resumes playback" + "description": "Resumes playback." }, "sc_replay": { "text": "SoundCloud replay", "voice": "SoundCloud replay", - "description": "Replays the current song on SoundCloud" + "description": "Replays the current song on SoundCloud." }, "light_action": { "text": "불 (흰/빨간/파란)색으로 (켜/꺼)줘", "voice": "불 :state *action (해)줘", - "description": "불 :state *action (해)줘" + "description": "불 :state *action (해)줘." } } } diff --git a/main.js b/main.js index b429846a2..c79e3e659 100644 --- a/main.js +++ b/main.js @@ -11,6 +11,9 @@ const BrowserWindow = electron.BrowserWindow const powerSaveBlocker = electron.powerSaveBlocker powerSaveBlocker.start('prevent-display-sleep') +// Launching the mirror in dev mode +const DevelopmentMode = process.argv[2] == "dev"; + // Load the smart mirror config var config; try{ @@ -59,7 +62,7 @@ function createWindow () { mainWindow.loadURL('file://' + __dirname + '/index.html') // Open the DevTools if run with "npm start dev" - if(process.argv[2] == "dev"){ + if(DevelopmentMode){ mainWindow.webContents.openDevTools(); } @@ -108,4 +111,4 @@ app.on('window-all-closed', function () { // No matter how the app is quit, we should clean up after ourselvs app.on('will-quit', function () { kwsProcess.kill() -}) \ No newline at end of file +}) diff --git a/package.json b/package.json index 0fbe3712a..cac0865f1 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,13 @@ { "name": "smart-mirror", - "version": "0.0.2", + "version": "0.0.3", "description": "The fairest of them all", "main": "main.js", "scripts": { "install": "bower install", "start": "electron main.js ", "microphone-debug" : "electron scripts/microphone-debug/main.js", + "train-model" : "electron scripts/train-model.js", "wiredep": "wiredep -s index.html" }, "repository": { @@ -37,6 +38,7 @@ "express": "^4.13.4", "fitbit-oauth2": "0.0.1", "fs": "0.0.2", + "hyperion-client": "1.0.3", "electron-json-storage": "2.0.0" } } diff --git a/sass/icesnow.scss b/sass/icesnow.scss deleted file mode 100644 index a53db7242..000000000 --- a/sass/icesnow.scss +++ /dev/null @@ -1,114 +0,0 @@ -@import "main"; - -@import url(https://fonts.googleapis.com/css?family=Work+Sans:300,400,500); - -body { - font-family: 'Work Sans', sans-serif; - font-weight: 300; -} - -.top-left { - float: right; - text-align: right; - display: -webkit-flex; - -webkit-flex-direction: column; - flex-direction: column; - float: right; - width: 420px; - .date { - -webkit-flex: 2; - flex: 2; - -webkit-order: 2; - order: 2; - width: 220px; - position: relative; - left: 200px; - } - ul.calendar { - -webkit-flex: 3; - flex: 3; - -webkit-order: 3; - order: 3; - } - .time { - -webkit-flex: 1; - flex: 1; - -webkit-order: 1; - order: 1; - } -} - -.top-right { - float: left; - text-align: left; - width: 265px; - .weather { - text-align: left; - width: 100%; - } -} - -/* - -Weather - -*/ - -.weather-today .tempreture { - font-size: 80px; -} - -.weather-week-descriptor span.ng-binding { - &:first-child { - font-size: 21px; - } - text-align: left; - word-spacing: normal; - display: inline-block; -} - -.weather-week-day { - margin-bottom: 5px; -} - -.weather { - .weather-today .icon, .weather-week-day .icon-small { - display: none; - } - .weather-today canvas, .weather-week-day canvas { - display: inline-block; - } - .weather-week-descriptor span { - padding-bottom: 7px; - margin-bottom: 7px; - display: block; - border-bottom: 2px solid #aaa; - &:last-child { - border-bottom: 0; - } - } -} - -/* -Calc -*/ - -.top-left ul.calendar { - font-size: 17px; - margin-top: 80px; - .day { - display: none; - } - .event-details .details { - color: #999; - } -} - -/* middle */ - -.middle-center { - justify-content: flex-end; - h1 { - font-size: 90px; - } -} \ No newline at end of file diff --git a/sass/main.scss b/sass/main.scss deleted file mode 100644 index f9a82b62a..000000000 --- a/sass/main.scss +++ /dev/null @@ -1,370 +0,0 @@ -@font-face { - font-family: "HelveticaNeue-UltraLight"; - src: url("../fonts/HelveticaNeue-UltraLight.ttf"); - /* EOT file for IE */ -} - -body { - background-color: black; - color: #fff; - font-family: 'HelveticaNeue-UltraLight', 'Open Sans', sans-serif; - font-weight: 300; - position: relative; -} - -h1, h2, h3, h4, h5 { - font-weight: 300; -} - -h1 { - font-size: 120px; -} - -dt { - font-weight: 600; -} - -/* Colors */ - -.light-grey { - color: #ccc; -} - -.grey { - color: #999; -} - -/* Displays */ - -.sleep-cover { - background-color: black; - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: 999; -} - -.container { - z-index: -1; - /* so things are still selectable */ - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - height: 100%; -} - -.listening, .interim-result { - font-family: 'Open Sans', sans-serif; -} - -.top-left { - float: left; -} - -.date { - font-size: 42px; -} - -.time { - font-size: 110px; -} - -.top-right { - float: right; -} - -.middle-center { - display: flex; - flex: 1; - align-items: stretch; - align-self: flex-start; - flex-direction: column; - width: 100%; - text-align: center; - justify-content: center; -} - -.bottom-center { - font-family: 'Open Sans', sans-serif; - width: 100%; - text-align: center; - margin-bottom: 20px; -} - -.commands { - width: 450px; - text-align: left; - margin-left: auto; - margin-right: auto; -} - -ul.calendar { - list-style: none; - font-size: 22px; - margin-left: 10px; - padding: 0; -} - -.calendar { - .event { - margin-bottom: 10px; - } - span { - display: inline-block; - &.day { - font-weight: bold; - width: 128px; - vertical-align: top; - } - &.summary { - max-width: 400px; - } - } - .event-details .details { - font-size: 12px; - padding-left: 135px; - font-family: 'Open Sans', sans-serif; - font-weight: lighter; - } -} - -.weather { - margin-left: auto; - display: inline-block; - text-align: right; - width: 230px; -} - -.weather-today .tempreture { - font-size: 60px; -} - -.weather-week-descriptor { - font-family: 'Open Sans', sans-serif; - font-size: 12px; - margin-left: auto; - margin-bottom: 10px; - text-align: justify; -} - -.weather-week { - margin-right: 10px; - font-size: 22px; - .day { - display: inline-block; - margin-right: 10px; - width: 40px; - } - .tempreture { - display: inline-block; - width: 60px; - } -} - -.weather { - .weather-today canvas, .weather-week-day canvas { - display: none; - } -} - -.traffic-information { - text-align: right; - margin-top: 10px; - margin-right: 10px; -} - -.time-to { - font-weight: bold; -} - -@keyframes reduce-dashoffset { - to { stroke-dashoffset: 0; } -} - -@keyframes increase-dashoffset { - from { stroke-dashoffset: 0; } -} - -.timer { - font-size: 120px; - position: relative; -} - -.timer-circle { - $size: 3.25em; - $stroke: 0.1em; - $pi: 3.1415926535; - - width: $size; - height: $size; - transform: rotate(-90deg) scaleY(-1); - margin: 20px auto; - display: block; - - .background, - .progress { - r: $size / 2 - $stroke; - cx: $size / 2; - cy: $size / 2; - fill: none; - stroke: #222; - stroke-width: $stroke; - } - - .progress { - stroke-dasharray: $pi * $size; - stroke-dashoffset: $pi * $size; - - stroke: white; - stroke-linecap: round; - animation-name: increase-dashoffset; - animation-timing-function: linear; - animation-fill-mode: forwards; - } - - &.finish .progress { - // animation-name: reduce-dashoffset; - // animation-duration: 1500ms; - // animation-timing-function: cubic-bezier(0.6, 0.04, 0.98, 0.335); - } -} - -.timer-countdown { - position: absolute; - top: 50%; - left: 50%; - transform: translateY(-50%) translateX(-50%); -} - -.timer-duration { - @extend .timer-countdown; - top: 75%; - font-size: 25%; -} - -.contents { - max-width: 100%; -} - -.gif { - height: 100%; -} - -.map { - height: 1080px; -} - -.contents-box { - text-align: center; - width: 100%; - position: relative; - overflow: hidden; - &:after { - content: ''; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - -webkit-box-shadow: inset 0 0 10px 10px #000; - -moz-box-shadow: inset 0 0 10px 10px #000; - box-shadow: inset 0 0 10px 10px #000; - overflow: hidden; - } -} - -.color-block { - height: 200px; - width: 200px; - display: inline-block; - margin: 10px; - margin-bottom: 20px; -} - -.debug-info { - width: 500px; -} - -/* Animations */ - -.fade { - &.ng-hide { - opacity: 0; - } - &.ng-hide-remove, &.ng-hide-add { - display: block !important; - } - &.ng-hide-remove { - transition: all ease 1500ms; - } - &.ng-hide-add { - transition: all ease 500ms; - } -} - -.animate-grow { - max-height: 1280px !important; - &.ng-hide-add, &.ng-hide-remove { - transition: all linear 500ms; - } - &.ng-hide { - max-height: 0 !important; - } -} - -.dimmed { - color: #aaa; -} - -.xxsmall, .xsmall, .small { - font-family: "HelveticaNeue-Medium", sans-serif; - letter-spacing: 0; -} - -.xxsmall { - font-size: 15px; - .wi { - line-height: 15px; - } -} - -.xsmall { - font-size: 20px; -} - -.small { - font-size: 25px; -} - -.icon { - position: relative; - top: -10px; - display: inline-block; - font-size: 45px; - padding-right: 5px; - font-weight: 100; - margin-right: 10px; -} - -.icon-small { - position: relative; - display: inline-block; - font-size: 20px; - padding-left: 0px; - padding-right: -10px; - font-weight: 100; - width: 20px; -} - -.xkcd { - -webkit-filter: invert(100%); - max-width: 100%; -} diff --git a/scripts/bash-start.sh b/scripts/bash-start.sh new file mode 100755 index 000000000..b4c53b1c6 --- /dev/null +++ b/scripts/bash-start.sh @@ -0,0 +1,4 @@ +#!/bin/bash +export DISPLAY=:0 +export XAUTHORITY=/home/pi/.Xauthority +cd /home/pi/smart-mirror && npm start diff --git a/scripts/install.sh b/scripts/install.sh deleted file mode 100644 index 6bb428076..000000000 --- a/scripts/install.sh +++ /dev/null @@ -1,131 +0,0 @@ -#!/bin/bash - -# Any subsequent(*) commands which fail will cause the shell script to exit immediately -set -e - -# Supported versions of node: v4.x, v5.x -NODE_VERSION="v4.*\|v5.*" - -# Terminal Colors -red=$'\e[1;31m' -grn=$'\e[1;32m' -yel=$'\e[1;33m' -blu=$'\e[1;34m' -mag=$'\e[1;35m' -cyn=$'\e[1;36m' -end=$'\e[0m' - -# Ensure we are using sudo -if [ "$(whoami)" != "root" ]; -then - echo "This script requires root permissions, try: sudo ./${0##*/} " - exit 0 -fi - -cat << "EOF" - ________ _____ ______ ________ ________ _________ -|\ ____\|\ _ \ _ \|\ __ \|\ __ \|\___ ___\ -\ \ \___|\ \ \\\__\ \ \ \ \|\ \ \ \|\ \|___ \ \_| - \ \_____ \ \ \\|__| \ \ \ __ \ \ _ _\ \ \ \ - \|____|\ \ \ \ \ \ \ \ \ \ \ \ \\ \| \ \ \ - ____\_\ \ \__\ \ \__\ \__\ \__\ \__\\ _\ \ \__\ - |\_________\|__| \|__|\|__|\|__|\|__|\|__| \|__| - \|_________| - - _____ ______ ___ ________ ________ ________ ________ -|\ _ \ _ \|\ \|\ __ \|\ __ \|\ __ \|\ __ \ -\ \ \\\__\ \ \ \ \ \ \|\ \ \ \|\ \ \ \|\ \ \ \|\ \ - \ \ \\|__| \ \ \ \ \ _ _\ \ _ _\ \ \\\ \ \ _ _\ - \ \ \ \ \ \ \ \ \ \\ \\ \ \\ \\ \ \\\ \ \ \\ \ - \ \__\ \ \__\ \__\ \__\\ _\\ \__\\ _\\ \_______\ \__\\ _\ - \|__| \|__|\|__|\|__|\|__|\|__|\|__|\|_______|\|__|\|__| - -EOF - -printf "%sThis script will install the smart-mirror and it's dependencies.\n" - -# Ensure the use would like to start the install -read -r -p "Would you like to continue? [y/N] " response -if [[ $response =~ ^([yY][eE][sS]|[yY])$ ]] -then - printf "%sExcellent! ${red}Please do not exit this script until it is complete.${end}\n" -else - exit 1 -fi - -printf "%s\n" -read -r -p "[Requires Reboot] Would you like to automoticlly rotate your monitor? [y/N]" rotateResponse -if [[ $rotateResponse =~ ^([yY][eE][sS]|[yY])$ ]] -then - # Rotate Display (replace the display_rotate line with display_rotate=1) - sed -i -e '$a\ -\ -#Rotate the display (smart-mirror)\ -display_rotate=1' /boot/config.txt -fi - -printf "%s\nChecking for node...\n" -node --version | grep ${NODE_VERSION} -if [[ $? != 0 ]] ; -then - # Install Node - printf "%s{blu}Downloading node${end}\n" - wget https://nodejs.org/dist/v4.0.0/node-v4.0.0-linux-armv7l.tar.gz - tar -xvf node-v4.0.0-linux-armv7l.tar.gz - cd node-v4.0.0-linux-armv7l - - # Copy to /usr/local - printf "%s{blu}Installing node${end}\n" - sudo cp -R * /usr/local/ - - # Clean up after ourselvs - cd .. - rm node-v4.0.0-linux-armv7l.tar.gz - rm -R node-v4.0.0-linux-armv7l - printf "%s$(tput setaf 10)node is now installed!${end}\n" -else - printf "%s$(tput setaf 10)node is already installed, great job!${end}\n" -fi - -# Getting the code -printf "%s\n{blu}Cloning Git Repo${end}\n" -cd /home/$SUDO_USER -sudo -u $SUDO_USER git clone https://github.com/evancohen/smart-mirror.git -printf "%s\n$(tput setaf 10)smart-mirror code is now downloaded${end}\n" - -cd smart-mirror - -printf "%s{blu}generating config template${end}\n" -sudo -u $SUDO_USER cp config.example.js config.js - -# Install package to hide the mouse when inactive -printf "%s\n{blu}Installing unclutter${end}\n" -sudo apt-get install unclutter - -# Apply LXDE unclutter autostart -sed -i -e '$a\ -\ -#Hide the mouse when inactive (smart-mirror)\ -unclutter -idle 0.1 -root' /etc/xdg/lxsession/LXDE-pi/autostart - -printf "%s\n{blu}Installing smart-mirror dependencies...${end}\n" -printf "%s${yel}This may take a while. Go grab a beer :)${end}\n" -sudo -u $SUDO_USER npm install - -# The mirror is now installed, yay! -cat << "EOF" - - | The smart-mirror is now installed! - / \ - / _ \ Once you fill out your config you can start the mirror with: - |.o '.| npm start - |'._.'| - | | To lean more, check out the documentation at: - ,'| | |`. docs.smart-mirror.io - / | | | \ - |,-'--|--'-.| - -EOF -# ASCII art found on http://textart.io/ - -exit 0 \ No newline at end of file diff --git a/scripts/pi-install.sh b/scripts/pi-install.sh new file mode 100755 index 000000000..a9bd19f68 --- /dev/null +++ b/scripts/pi-install.sh @@ -0,0 +1,181 @@ +#!/bin/bash + +# Any subsequent(*) commands which fail will cause the shell script to exit immediately +set -e + +# Supported versions of node: v4.x, v5.x +NODE_MINIMUM_VERSION="v4.0.0" +NODE_STABLE_VERSION="6.x" + +# Compare node versions. +function check_version() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; } +# Check to see if a command exists (if something is installed) +function command_exists () { type "$1" &> /dev/null ;} + +# Terminal Colors +red=$'\e[1;31m' +grn=$'\e[1;32m' +yel=$'\e[1;33m' +blu=$'\e[1;34m' +mag=$'\e[1;35m' +cyn=$'\e[1;36m' +end=$'\e[0m' + +# Ensure we are using sudo +if [ "$(whoami)" != "root" ]; +then + echo "This script requires root permissions, try: sudo ./${0##*/} " + exit 0 +fi + +cat << "EOF" + ________ _____ ______ ________ ________ _________ +|\ ____\|\ _ \ _ \|\ __ \|\ __ \|\___ ___\ +\ \ \___|\ \ \\\__\ \ \ \ \|\ \ \ \|\ \|___ \ \_| + \ \_____ \ \ \\|__| \ \ \ __ \ \ _ _\ \ \ \ + \|____|\ \ \ \ \ \ \ \ \ \ \ \ \\ \| \ \ \ + ____\_\ \ \__\ \ \__\ \__\ \__\ \__\\ _\ \ \__\ + |\_________\|__| \|__|\|__|\|__|\|__|\|__| \|__| + \|_________| + + _____ ______ ___ ________ ________ ________ ________ +|\ _ \ _ \|\ \|\ __ \|\ __ \|\ __ \|\ __ \ +\ \ \\\__\ \ \ \ \ \ \|\ \ \ \|\ \ \ \|\ \ \ \|\ \ + \ \ \\|__| \ \ \ \ \ _ _\ \ _ _\ \ \\\ \ \ _ _\ + \ \ \ \ \ \ \ \ \ \\ \\ \ \\ \\ \ \\\ \ \ \\ \ + \ \__\ \ \__\ \__\ \__\\ _\\ \__\\ _\\ \_______\ \__\\ _\ + \|__| \|__|\|__|\|__|\|__|\|__|\|__|\|_______|\|__|\|__| + +EOF + +ARCH=$(uname -m) +# Check processor archetecture. +if [$ARCH != "armv7l" ]; then + printf "%s${red} Unupported device!${end} The smart-mirror only works on the Pi 2 and 3" + exit; +fi + +printf "%sThis script will install the smart-mirror and it's dependencies.\n" + +# Ensure the use would like to start the install +read -r -p "Would you like to continue? [y/N] " response +if [[ $response =~ ^([yY][eE][sS]|[yY])$ ]]; then + printf "%sExcellent! ${red}Please do not exit this script until it is complete.${end}\n" +else + exit 1 +fi + +# # Rotate the monitor +# printf "%s\n" +# read -r -p "Would you like to rotate your monitor? [y/N]" rotateResponse +# if [[ $rotateResponse =~ ^([yY][eE][sS]|[yY])$ ]]; then +# # Rotate Display (replace the display_rotate line with display_rotate=1) +# sed -i -e '$a\ +# \ +# #Rotate the display (smart-mirror)\ +# display_rotate=1' /boot/config.txt +# fi + +# Install native dependencies +printf "%s\n${blu}Installing native dependencies${end}\n" +sudo apt-get install curl wget git python-pyaudio python3-pyaudio sox unclutter + +# Check if we need to install or upgrade Node.js. +printf "%s\n${blu}Checking current Node installation${end}\n" +NODE_INSTALL=false +if command_exists node; then + NODE_CURRENT=$(node -v) + printf "%sMinimum Node version: $NODE_MINIMUM_VERSION\n" + printf "%sInstalled Node version: $NODE_CURRENT\n" + if check_version $NODE_MINIMUM_VERSION $NODE_CURRENT; then + NODE_INSTALL=true + # If Node is already running then abort + if pgrep "node" > /dev/null; then + printf "%s${red}A node process is currently running. Unable to upgrade for you.${end}\n" + printf "Exit all Node processes and then restart this installer." + exit; + fi + printf "%sLooks like you need an upgrade. Taking care of that for you.\n" + fi +else + printf "%sNo Node installation found. Installing it for you.\n"; + NODE_INSTALL=true +fi +# Upgrade node if it is out of date +if $NODE_INSTALL; then + printf "%sInstalling Node...\n" + curl -sL https://deb.nodesource.com/setup_$NODE_STABLE_VERSION | sudo -E bash - + sudo apt-get install -y nodejs + printf "%sNode installation complete.\n" +fi + +#Install magic mirror +cd /home/"$SUDO_USER" +if [ -d "$HOME/smart-mirror" ]; then + printf "%s${red}Looks like the smart mirror is already installed.${end}\n" + printf "%sPlease rename or remove the ${mag}smart-mirror${end} folder and re-run the installer.\n" + printf "%sIf you want to upgrade your smart mirror run ${cyn}git pull${end} from the ~/smart-mirror directory.\n" + exit; +fi + +# Getting the code +printf "%s\n${blu}Cloning smart-mirror Git Repo${end}\n" +if sudo -u "$SUDO_USER" git clone https://github.com/evancohen/smart-mirror.git; then + printf "%s${grn}smart-mirror code is now downloaded${end}\n" +else + printf "%s${red}Unable to clone smart-mirror :( ${end}\n" + exit; +fi + +# Generate config and install dependencies +cd smart-mirror || exit +printf "%s\n${blu}generating config template...${end}\n" +sudo -u "$SUDO_USER" cp config.example.js config.js + +# Install smart-mirror dependencies +printf "%s\n${blu}Installing smart-mirror dependencies...${end}\n" +printf "%s${yel}This may take a while. Go grab a beer :)${end}\n" +if sudo -u "$SUDO_USER" npm install; then + printf "%s${grn}Dependency installation complete!${end}\n" +else + printf "%s${red}Unable to install dependencies :( ${end}\n" + exit; +fi + +# Apply LXDE unclutter autostart (if we haven't already) +if ! grep -q '(smart-mirror)' /etc/xdg/lxsession/LXDE/autostart; then + sed -i -e '$a\ +\ +#Hide the mouse when inactive (smart-mirror)\ +unclutter -idle 0.1 -root' /etc/xdg/lxsession/LXDE/autostart +fi + +# Disable the screensaver (if we haven't already) +if ! grep -q '(smart-mirror)' /home/"$SUDO_USER"/.config/lxsession/LXDE-pi/autostart; then + sed -i -e '$a\ +\ +#Disable screen saver (smart-mirror)\ +@xset s 0 0\ +@xset s noblank\ +@xset s noexpose\ +@xset dpms 0 0 0' /home/"$SUDO_USER"/.config/lxsession/LXDE-pi/autostart +fi + + +# The mirror is now installed, yay! +cat << "EOF" + + | The smart-mirror is now installed! + / \ + / _ \ Once you fill out your config you can start the mirror with: + |.o '.| > npm start + |'._.'| Or if you are running over SSH: + | | > DISPLAY=:0 npm start + ,'| | |`. + / | | | \ To lean more, check out the documentation at: + |,-'--|--'-.| http://docs.smart-mirror.io + +EOF +# ASCII art found on http://textart.io/ + +exit 0 diff --git a/scripts/train-model.js b/scripts/train-model.js new file mode 100644 index 000000000..c16646d32 --- /dev/null +++ b/scripts/train-model.js @@ -0,0 +1,51 @@ +'use strict'; + +const electron = require('electron'); +// Module to control application life. +const app = electron.app; +// Module to create native browser window. +const BrowserWindow = electron.BrowserWindow; + +// Keep a global reference of the window object, if you don't, the window will +// be closed automatically when the JavaScript object is garbage collected. +let mainWindow; + +function createWindow () { + // Create the browser window. + mainWindow = new BrowserWindow({width: 1000, height: 800, webPreferences : {nodeIntegration: false}}); + + // and load the index.html of the app. + mainWindow.loadURL('https://snowboy.kitt.ai/hotword/47'); + + // Open the DevTools. + //mainWindow.webContents.openDevTools(); + + // Emitted when the window is closed. + mainWindow.on('closed', function() { + // Dereference the window object, usually you would store windows + // in an array if your app supports multi windows, this is the time + // when you should delete the corresponding element. + mainWindow = null; + }); +} + +// This method will be called when Electron has finished +// initialization and is ready to create browser windows. +app.on('ready', createWindow); + +// Quit when all windows are closed. +app.on('window-all-closed', function () { + // On OS X it is common for applications and their menu bar + // to stay active until the user quits explicitly with Cmd + Q + if (process.platform !== 'darwin') { + app.quit(); + } +}); + +app.on('activate', function () { + // On OS X it's common to re-create a window in the app when the + // dock icon is clicked and there are no other windows open. + if (mainWindow === null) { + createWindow(); + } +});