Comparing version 2.2.0 to 2.3.0
# Corsica | ||
This document is intended for people who are comfortable reading the code to understand what's happening. For everyone else the best place to start is probably the Absolute Beginner's guide to Corsica on a Raspberry Pi. You'll find it in docs/raspi.md and repackaged as an [Instructable](https://www.instructables.com/id/A-Digital-Sign-Server-on-a-Raspberry-Pi/). | ||
@@ -12,3 +13,3 @@ ## Getting Started with Corsica | ||
% git checkout git@github.com:mozilla/corsica.git | ||
% git clone git@github.com:mozilla/corsica.git | ||
% cd corsica | ||
@@ -15,0 +16,0 @@ % npm install |
{ | ||
"name": "corsica", | ||
"version": "2.2.0", | ||
"version": "2.3.0", | ||
"description": "Ephemeral screens for the masses.", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -17,2 +17,3 @@ /* Description: | ||
var subscriptions = {}; | ||
var sequencePosition = {}; | ||
@@ -24,3 +25,4 @@ var settings = corsica.settings.setup('tags', { | ||
name: 'default', | ||
commands: ['http://xkcd.com'], | ||
random: false, | ||
commands: [] | ||
}, | ||
@@ -108,8 +110,17 @@ ], | ||
console.log('sampling from', commands.length, 'commands:', commands); | ||
var index; | ||
if (commands.length) { | ||
var index = Math.floor(Math.random() * commands.length); | ||
if (settings.random) { | ||
console.log('sampling from', commands.length, 'commands'); | ||
index = Math.floor(Math.random() * commands.length); | ||
} else { | ||
index = sequencePosition[screen.toString()] || 0; | ||
console.log('sequence position: ' + index + '/' + (commands.length - 1)); | ||
console.log(index, commands.length); | ||
if (index >= commands.length) { | ||
index = 0; | ||
} | ||
sequencePosition[screen.toString()] = index + 1; | ||
} | ||
var command = commands[index] + ' screen=' + screen; | ||
corsica.sendMessage('command', {raw: command}); | ||
@@ -116,0 +127,0 @@ } |
{ | ||
"settings::timer": { | ||
"resetTime": 5000 | ||
"resetTime": 2000 | ||
}, | ||
"settings::tags": { | ||
"random": false, | ||
"tags": [ | ||
@@ -10,2 +11,3 @@ { | ||
"commands": [ | ||
"http://bits.potch.me/moz-scape.png", | ||
"https://whats-shipping.herokuapp.com/dashboard from=2017-01-01 to=2017-03-08T12:50:00-08:00", | ||
@@ -12,0 +14,0 @@ "http://mozilla.github.io/signage/data-classification.png comment=\"Data Classification\"" |
Sorry, the diff of this file is not supported yet
136250
46
1752