Skip to content

Commit 38e2e03

Browse files
hallardhallard
authored
Merge pull request #19 from freud-martinou/add_jeedom_custom_port
Add jeedom custom port
2 parents 82c65b4 + 315c3cc commit 38e2e03

File tree

9 files changed

+108
-70
lines changed

9 files changed

+108
-70
lines changed

‎data/index.htm.gz‎

124 Bytes
Binary file not shown.

‎data/js/remora.js.gz‎

0 Bytes
Binary file not shown.

‎remora.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
#include <ESP8266WebServer.h>
9393
#include <Ticker.h>
9494
#include <NeoPixelBus.h>
95-
95+
9696
extern "C" {
9797
#include "user_interface.h"
9898
}
@@ -113,10 +113,10 @@ extern "C" {
113113
//#define DEBUG_INIT // Décommenter cette ligne si DEBUG_SERIAL est Serial1
114114
#endif
115115

116-
#define DEBUG
116+
//#define DEBUG // Décommenter cette ligne pour activer le DEBUG serial
117117

118118
// I prefix debug macro to be sure to use specific for THIS library
119-
// debugging, this should not interfere with main sketch or other
119+
// debugging, this should not interfere with main sketch or other
120120
// libraries
121121
#ifdef DEBUG
122122
#define Debug(x) DEBUG_SERIAL.print(x)
@@ -126,12 +126,12 @@ extern "C" {
126126
#define Debugf(...) DEBUG_SERIAL.printf(__VA_ARGS__)
127127
#define Debugflush DEBUG_SERIAL.flush
128128
#else
129-
#define Debug(x) {}
130-
#define Debugln(x) {}
131-
#define DebugF(x) {}
132-
#define DebuglnF(x) {}
133-
#define Debugf(...) {}
134-
#define Debugflush(){}
129+
#define Debug(x)
130+
#define Debugln(x)
131+
#define DebugF(x)
132+
#define DebuglnF(x)
133+
#define Debugf(...)
134+
#define Debugflush()
135135
#endif
136136

137137
// Includes du projets remora

‎webdev/config.json‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
{
2-
"ssid":"myssid",
3-
"psk":"mypsk",
4-
"host":"WifInfo",
5-
"ap_psk":"",
6-
"emon_host":"emoncms.org",
7-
"emon_port":"80",
8-
"emon_url":"/input.json",
9-
"emon_apikey":"sdfsdsdsds",
10-
"emon_node":"0",
11-
"ota_auth":"WifInfo_8266",
12-
"ota_port":"8266"
13-
}
2+
"ssid":"myssid",
3+
"psk":"mypsk",
4+
"host":"WifInfo",
5+
"ap_psk":"",
6+
"emon_host":"emoncms.org",
7+
"emon_port":"80",
8+
"emon_url":"/input.json",
9+
"emon_apikey":"sdfsdsdsds",
10+
"emon_node":"0",
11+
12+
"jdom_host":"jeedom.local",
13+
"jdom_port":"12",
14+
"jdom_url":"/jeedom/plugins/teleinfo/core/php/jeeTeleinfo.php",
15+
"jdom_apikey":"12345678901234567890123456789012345678901234567890",
16+
"jdom_adco":"123456789012",
17+
18+
"ota_auth":"WifInfo_8266",
19+
"ota_port":"8266"
20+
}

‎webdev/create_spiffs.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
// This file is not part of web server, it's just used as ESP8266 SPIFFS
55
// WEB server files preparation tool
66
// Please install dependencies with
7-
// npm install zlib
7+
// npm install
88
// after all is installed just start by typing on command line
9-
// node create_spiffs.js
9+
// npm run create_spiffs
1010
// once all is fine, you can upload data tiles with Arduino IDE
1111
//
1212
// Written by Charles-Henri Hallard (http://hallard.me)
@@ -102,4 +102,3 @@ for (var i = 0; i < fonts.length; i++) {
102102
fs.createReadStream('fonts/' + fonts[i]).pipe(fs.createWriteStream('../data/fonts/' + fonts[i]));
103103
}
104104
console.log('finished!');
105-

‎webdev/index.htm‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -220,27 +220,24 @@ <h3 class="panel-title clickable" data-toggle="collapse" data-parent="#pan_emon"
220220
<span class="glyphicon glyphicon-leaf pull-left"></span>&nbsp;Emoncms<span class="pull-right glyphicon glyphicon-chevron-down"></span>
221221
</h3>
222222
</div>
223-
<div class="panel-collapse collapse out" id="col_emon">
223+
<div class="panel-collapse collapse out" id="col_emon">
224224
<div class="panel-body">
225225
<div class="form-group">
226-
<label class="col-sm-3 control-label">Protocole</label>
226+
<label class="col-sm-3 control-label">Port</label>
227227
<div class="col-sm-9">
228-
<select id="emon_port" name="emon_port" class="form-control col-sm-2">
229-
<option value="80">http (80)</option>
230-
<option value="443">https (443)</option>
231-
</select>
228+
<input type="number" id="emon_port" name="emon_port" class="form-control" min="0" max="65535" placeholder="Port du serveur (ex : 80, 443, 8080...)">
232229
</div>
233230
</div>
234231
<div class="form-group">
235232
<label class="col-sm-3 control-label">Nom du serveur</label>
236233
<div class="col-sm-9">
237-
<input type="text" class="form-control" id="emon_host" name="emon_host" maxlength="32" placeholder="Serveur">
234+
<input type="text" class="form-control" id="emon_host" name="emon_host" maxlength="32" placeholder="Nom du serveur (ex : emoncms.org)">
238235
</div>
239236
</div>
240237
<div class="form-group">
241238
<label class="col-sm-3 control-label">URL</label>
242239
<div class="col-sm-9">
243-
<input type="text" class="form-control" id="emon_url" name="emon_url" maxlength="32" placeholder="Url">
240+
<input type="text" class="form-control" id="emon_url" name="emon_url" maxlength="32" placeholder="URL du serveur (ex : /input.json...)">
244241
</div>
245242
</div>
246243
<div class="form-group">
@@ -253,7 +250,7 @@ <h3 class="panel-title clickable" data-toggle="collapse" data-parent="#pan_emon"
253250
<div class="form-group">
254251
<label class="col-sm-3 control-label">Mise à jour</label>
255252
<div class="col-sm-9">
256-
<select id="emon_port" name="emon_freq" class="form-control col-sm-2">
253+
<select id="emon_freq" name="emon_freq" class="form-control col-sm-2">
257254
<option value="0">désactivée</option>
258255
<option value="15">toutes les 15 secondes</option>
259256
<option value="30">toutes les 30 secondes</option>
@@ -296,27 +293,24 @@ <h3 class="panel-title clickable" data-toggle="collapse" data-parent="#pan_jdom"
296293
<span class="glyphicon glyphicon-home"></span>&nbsp;Jeedom<span class="pull-right glyphicon glyphicon-chevron-down"></span>
297294
</h3>
298295
</div>
299-
<div class="panel-collapse collapse out" id="col_jdom">
296+
<div class="panel-collapse collapse out" id="col_jdom">
300297
<div class="panel-body">
301298
<div class="form-group">
302-
<label class="col-sm-3 control-label">Protocole</label>
299+
<label class="col-sm-3 control-label">Port</label>
303300
<div class="col-sm-9">
304-
<select id="jdom_port" name="jdom_port" class="form-control col-sm-2">
305-
<option value="80">http (80)</option>
306-
<option value="443">https (443)</option>
307-
</select>
301+
<input type="number" id="jdom_port" name="jdom_port" class="form-control" min="0" max="65535" placeholder="Port du serveur (ex : 80, 443, 8080...)">
308302
</div>
309303
</div>
310304
<div class="form-group">
311305
<label class="col-sm-3 control-label">Serveur Jeedom</label>
312306
<div class="col-sm-9">
313-
<input type="text" class="form-control" id="jdom_host" name="jdom_host" maxlength="32" placeholder="Serveur">
307+
<input type="text" class="form-control" id="jdom_host" name="jdom_host" maxlength="32" placeholder="Nom du serveur (ex : jeedom.local...)">
314308
</div>
315309
</div>
316310
<div class="form-group">
317311
<label class="col-sm-3 control-label">URL</label>
318312
<div class="col-sm-9">
319-
<input type="text" class="form-control" id="jdom_url" name="jdom_url" maxlength="64" placeholder="Url">
313+
<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...)">
320314
</div>
321315
</div>
322316
<div class="form-group">
@@ -328,7 +322,7 @@ <h3 class="panel-title clickable" data-toggle="collapse" data-parent="#pan_jdom"
328322
<div class="form-group">
329323
<label class="col-sm-3 control-label">Mise à jour</label>
330324
<div class="col-sm-9">
331-
<select id="emon_port" name="jdom_freq" class="form-control col-sm-2">
325+
<select id="jdom_freq" name="jdom_freq" class="form-control col-sm-2">
332326
<option value="0">désactivée</option>
333327
<option value="15">toutes les 15 secondes</option>
334328
<option value="30">toutes les 30 secondes</option>
@@ -932,9 +926,13 @@ <h4 class="modal-title">Redémarrage Remora en cours</h4>
932926
.fail(function() { console.log( "error while requestiong spiffs data" ); })
933927
} else if (target=='#tab_cfg') {
934928
$.getJSON( "/config.json", function(form_data) {
929+
930+
// Autofill form
935931
$("#frm_config").autofill(form_data);
936-
})
937-
.fail(function() { console.log( "error while requestiong configuration data" ); })
932+
933+
// Trigger change on all form inputs
934+
$("#frm_config input, textarea, select").trigger('change', [form_data]);
935+
}).fail(function() { console.log( "error while requestiong configuration data" ); })
938936

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

11491147
$('#btn_test').click(function(){ waitReboot(); });
1150-
11511148
</script>
11521149
<div id="loader-wrapper">
11531150
<div id="loader"></div>
@@ -1156,4 +1153,3 @@ <h4 class="modal-title">Redémarrage Remora en cours</h4>
11561153
</div>
11571154
</body>
11581155
</html>
1159-

‎webdev/js/remora.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎webdev/package.json‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"name": "remora",
3+
"version": "1.0.0",
4+
"description": "remora node server (for development purpose only)",
5+
"scripts": {
6+
"start": "node web_server.js",
7+
"create_spiffs": "node create_spiffs.js",
8+
"test": "echo \"Error: no test specified\" && exit 1"
9+
},
10+
"repository": {
11+
"type": "git",
12+
"url": "git+ssh://[email protected]/hallard/remora_soft.git"
13+
},
14+
"keywords": [
15+
"remora"
16+
],
17+
"author": "hallard",
18+
"license": "MIT",
19+
"bugs": {
20+
"url": "https://github.com/hallard/remora_soft/issues"
21+
},
22+
"homepage": "https://github.com/hallard/remora_soft#readme",
23+
"dependencies": {
24+
"formidable": "1.0.17",
25+
"httpdispatcher": "2.0.1",
26+
"mime": "1.3.4",
27+
"websocket": "1.0.24"
28+
},
29+
"devDependencies": {
30+
"zlib": "^1.0.5",
31+
"concat-files": "^0.1.1",
32+
"uglify": "^0.1.5"
33+
}
34+
}

0 commit comments

Comments
 (0)