Skip to content

Commit

Permalink
updated readme and config file comments
Browse files Browse the repository at this point in the history
  • Loading branch information
chiva committed May 26, 2013
1 parent 53e6281 commit 758cd28
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
4 changes: 2 additions & 2 deletions README.rst
Expand Up @@ -35,7 +35,7 @@ Note: this has been tested only with one led matrix, but it can be extended up t
Configuration
-------------

**config.php**
**web/config.php**

- SERVER: server domain (including subdomain if existing, but excluding ``http://`` and sub-folders). It is retrieved by default from PHP variable, if wrong, set it manually.
- CONSUMER_KEY & CONSUMER_SECRET: consumer application keys, get them from https://dev.twitter.com/apps.
Expand All @@ -47,7 +47,7 @@ Configuration
- TWITCH_ID: ID of the stream from twitch.tv you want to show.
- DISALLOW_LOGOUT: disallow logging out to keep tweets from a specific user being shown. To log out you have to delete ``auth.txt`` from the web server.

**Arduino**
**tuitwall.ino**

- API_KEY: same as in ``config.php``.
- SERVER: same as in ``config.php``.
Expand Down
20 changes: 11 additions & 9 deletions web/config.php
@@ -1,13 +1,15 @@
<?php

define('SERVER', $_SERVER['SERVER_NAME']); // definir la raíz de la página
define('CONSUMER_KEY', ''); // llaves de aplicación de twitter
/* Refer to README.rst for tips on how to adapt this file to your needs */

define('SERVER', $_SERVER['SERVER_NAME']);
define('CONSUMER_KEY', '');
define('CONSUMER_SECRET', '');
define('OAUTH_CALLBACK', 'http://'.SERVER.'/callback.php'); // fichero que recibe los callback de twitter
define('API_KEY', '4Z17HHTeWELgxqIsB3WMWfu9V1SESwh6YKoG77Nr'); // clave para limitar la petición de tweets (dejar vacío para desactivar el control)
define('SHOW_TWEET', true); // mostrar tweet en página principal
define('SHOW_USER', true); // incluir de quien es el tweet cuando Arduino lo pida
define('STREAM', false); // mostrar stream desde twitch.tv para demos del proyecto
define('TWITCH_ID', 'xxxx'); // ID del stream de twitch.tv a mostrar
define('DISALLOW_LOGOUT', false); // deshabilita el poder cerrar sesión, útil para demos o si queremos fijar la configuración
define('OAUTH_CALLBACK', 'http://'.SERVER.'/callback.php');
define('API_KEY', '4Z17HHTeWELgxqIsB3WMWfu9V1SESwh6YKoG77Nr');
define('SHOW_TWEET', true);
define('SHOW_USER', true);
define('STREAM', false);
define('TWITCH_ID', 'xxxx');
define('DISALLOW_LOGOUT', false);
?>

0 comments on commit 758cd28

Please sign in to comment.