Skip to content

Commit

Permalink
Merge pull request #19 from freud-martinou/add_jeedom_custom_port
Browse files Browse the repository at this point in the history 
Add jeedom custom port
  • Loading branch information
@hallard
hallard committed Jan 9, 2017
2 parents 82c65b4 + 315c3cc commit 38e2e03
Show file tree
Hide file tree
Showing 9 changed files with 108 additions and 70 deletions.
Binary file modified data/index.htm.gz
View file
Binary file not shown.
Binary file modified data/js/remora.js.gz
View file
Binary file not shown.
18 changes: 9 additions & 9 deletions remora.h
View file
Expand Up @@ -92,7 +92,7 @@
#include <ESP8266WebServer.h>
#include <Ticker.h>
#include <NeoPixelBus.h>

extern "C" {
#include "user_interface.h"
}
Expand All @@ -113,10 +113,10 @@ extern "C" {
//#define DEBUG_INIT // Décommenter cette ligne si DEBUG_SERIAL est Serial1
#endif

#define DEBUG
//#define DEBUG // Décommenter cette ligne pour activer le DEBUG serial

// I prefix debug macro to be sure to use specific for THIS library
// debugging, this should not interfere with main sketch or other
// debugging, this should not interfere with main sketch or other
// libraries
#ifdef DEBUG
#define Debug(x) DEBUG_SERIAL.print(x)
Expand All @@ -126,12 +126,12 @@ extern "C" {
#define Debugf(...) DEBUG_SERIAL.printf(__VA_ARGS__)
#define Debugflush DEBUG_SERIAL.flush
#else
#define Debug(x) {}
#define Debugln(x) {}
#define DebugF(x) {}
#define DebuglnF(x) {}
#define Debugf(...) {}
#define Debugflush(){}
#define Debug(x)
#define Debugln(x)
#define DebugF(x)
#define DebuglnF(x)
#define Debugf(...)
#define Debugflush()
#endif

// Includes du projets remora
Expand Down
31 changes: 19 additions & 12 deletions webdev/config.json
View file
@@ -1,13 +1,20 @@
{
"ssid":"myssid",
"psk":"mypsk",
"host":"WifInfo",
"ap_psk":"",
"emon_host":"emoncms.org",
"emon_port":"80",
"emon_url":"/input.json",
"emon_apikey":"sdfsdsdsds",
"emon_node":"0",
"ota_auth":"WifInfo_8266",
"ota_port":"8266"
}
"ssid":"myssid",
"psk":"mypsk",
"host":"WifInfo",
"ap_psk":"",
"emon_host":"emoncms.org",
"emon_port":"80",
"emon_url":"/input.json",
"emon_apikey":"sdfsdsdsds",
"emon_node":"0",

"jdom_host":"jeedom.local",
"jdom_port":"12",
"jdom_url":"/jeedom/plugins/teleinfo/core/php/jeeTeleinfo.php",
"jdom_apikey":"12345678901234567890123456789012345678901234567890",
"jdom_adco":"123456789012",

"ota_auth":"WifInfo_8266",
"ota_port":"8266"
}
5 changes: 2 additions & 3 deletions webdev/create_spiffs.js
View file
Expand Up @@ -4,9 +4,9 @@
// This file is not part of web server, it's just used as ESP8266 SPIFFS
// WEB server files preparation tool
// Please install dependencies with
// npm install zlib
// npm install
// after all is installed just start by typing on command line
// node create_spiffs.js
// npm run create_spiffs
// once all is fine, you can upload data tiles with Arduino IDE
//
// Written by Charles-Henri Hallard (http://hallard.me)
Expand Down Expand Up @@ -102,4 +102,3 @@ for (var i = 0; i < fonts.length; i++) {
fs.createReadStream('fonts/' + fonts[i]).pipe(fs.createWriteStream('../data/fonts/' + fonts[i]));
}
console.log('finished!');

40 changes: 18 additions & 22 deletions webdev/index.htm
View file
Expand Up @@ -220,27 +220,24 @@ <h3 class="panel-title clickable" data-toggle="collapse" data-parent="#pan_emon"
<span class="glyphicon glyphicon-leaf pull-left"></span>&nbsp;Emoncms<span class="pull-right glyphicon glyphicon-chevron-down"></span>
</h3>
</div>
<div class="panel-collapse collapse out" id="col_emon">
<div class="panel-collapse collapse out" id="col_emon">
<div class="panel-body">
<div class="form-group">
<label class="col-sm-3 control-label">Protocole</label>
<label class="col-sm-3 control-label">Port</label>
<div class="col-sm-9">
<select id="emon_port" name="emon_port" class="form-control col-sm-2">
<option value="80">http (80)</option>
<option value="443">https (443)</option>
</select>
<input type="number" id="emon_port" name="emon_port" class="form-control" min="0" max="65535" placeholder="Port du serveur (ex : 80, 443, 8080...)">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Nom du serveur</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="emon_host" name="emon_host" maxlength="32" placeholder="Serveur">
<input type="text" class="form-control" id="emon_host" name="emon_host" maxlength="32" placeholder="Nom du serveur (ex : emoncms.org)">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">URL</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="emon_url" name="emon_url" maxlength="32" placeholder="Url">
<input type="text" class="form-control" id="emon_url" name="emon_url" maxlength="32" placeholder="URL du serveur (ex : /input.json...)">
</div>
</div>
<div class="form-group">
Expand All @@ -253,7 +250,7 @@ <h3 class="panel-title clickable" data-toggle="collapse" data-parent="#pan_emon"
<div class="form-group">
<label class="col-sm-3 control-label">Mise à jour</label>
<div class="col-sm-9">
<select id="emon_port" name="emon_freq" class="form-control col-sm-2">
<select id="emon_freq" name="emon_freq" class="form-control col-sm-2">
<option value="0">désactivée</option>
<option value="15">toutes les 15 secondes</option>
<option value="30">toutes les 30 secondes</option>
Expand Down Expand Up @@ -296,27 +293,24 @@ <h3 class="panel-title clickable" data-toggle="collapse" data-parent="#pan_jdom"
<span class="glyphicon glyphicon-home"></span>&nbsp;Jeedom<span class="pull-right glyphicon glyphicon-chevron-down"></span>
</h3>
</div>
<div class="panel-collapse collapse out" id="col_jdom">
<div class="panel-collapse collapse out" id="col_jdom">
<div class="panel-body">
<div class="form-group">
<label class="col-sm-3 control-label">Protocole</label>
<label class="col-sm-3 control-label">Port</label>
<div class="col-sm-9">
<select id="jdom_port" name="jdom_port" class="form-control col-sm-2">
<option value="80">http (80)</option>
<option value="443">https (443)</option>
</select>
<input type="number" id="jdom_port" name="jdom_port" class="form-control" min="0" max="65535" placeholder="Port du serveur (ex : 80, 443, 8080...)">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Serveur Jeedom</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="jdom_host" name="jdom_host" maxlength="32" placeholder="Serveur">
<input type="text" class="form-control" id="jdom_host" name="jdom_host" maxlength="32" placeholder="Nom du serveur (ex : jeedom.local...)">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">URL</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="jdom_url" name="jdom_url" maxlength="64" placeholder="Url">
<input type="text" class="form-control" id="jdom_url" name="jdom_url" maxlength="64" placeholder="URL du serveur (ex : /jeedom/plugins/teleinfo/core/php/jeeTeleinfo.php...)">
</div>
</div>
<div class="form-group">
Expand All @@ -328,7 +322,7 @@ <h3 class="panel-title clickable" data-toggle="collapse" data-parent="#pan_jdom"
<div class="form-group">
<label class="col-sm-3 control-label">Mise à jour</label>
<div class="col-sm-9">
<select id="emon_port" name="jdom_freq" class="form-control col-sm-2">
<select id="jdom_freq" name="jdom_freq" class="form-control col-sm-2">
<option value="0">désactivée</option>
<option value="15">toutes les 15 secondes</option>
<option value="30">toutes les 30 secondes</option>
Expand Down Expand Up @@ -932,9 +926,13 @@ <h4 class="modal-title">Redémarrage Remora en cours</h4>
.fail(function() { console.log( "error while requestiong spiffs data" ); })
} else if (target=='#tab_cfg') {
$.getJSON( "/config.json", function(form_data) {

// Autofill form
$("#frm_config").autofill(form_data);
})
.fail(function() { console.log( "error while requestiong configuration data" ); })

// Trigger change on all form inputs
$("#frm_config input, textarea, select").trigger('change', [form_data]);
}).fail(function() { console.log( "error while requestiong configuration data" ); })

$('#tab_scan_data').bootstrapTable('refresh',{silent:true, showLoading:true, url:'/wifiscan.json'});
}
Expand Down Expand Up @@ -1147,7 +1145,6 @@ <h4 class="modal-title">Redémarrage Remora en cours</h4>
}

$('#btn_test').click(function(){ waitReboot(); });

</script>
<div id="loader-wrapper">
<div id="loader"></div>
Expand All @@ -1156,4 +1153,3 @@ <h4 class="modal-title">Redémarrage Remora en cours</h4>
</div>
</body>
</html>

2 changes: 1 addition & 1 deletion webdev/js/remora.js
View file

Large diffs are not rendered by default.

34 changes: 34 additions & 0 deletions webdev/package.json
View file
@@ -0,0 +1,34 @@
{
"name": "remora",
"version": "1.0.0",
"description": "remora node server (for development purpose only)",
"scripts": {
"start": "node web_server.js",
"create_spiffs": "node create_spiffs.js",
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "git+ssh://git@github.com/hallard/remora_soft.git"
},
"keywords": [
"remora"
],
"author": "hallard",
"license": "MIT",
"bugs": {
"url": "https://github.com/hallard/remora_soft/issues"
},
"homepage": "https://github.com/hallard/remora_soft#readme",
"dependencies": {
"formidable": "1.0.17",
"httpdispatcher": "2.0.1",
"mime": "1.3.4",
"websocket": "1.0.24"
},
"devDependencies": {
"zlib": "^1.0.5",
"concat-files": "^0.1.1",
"uglify": "^0.1.5"
}
}

0 comments on commit 38e2e03

Please sign in to comment.