Skip to content

Commit

Permalink
Version 2.5.7
Browse files Browse the repository at this point in the history 
- Correct HRU250-300 settings labels alignment #187
- add preliminary support for new RFT AUTO-N remote
- add support to send RF commands (using CC1101) and change RF remote type through add-on web interface
- prep for bidirectional remote join support, not working yet though
- Build script cleanup (Thanks to @eldigo)
- manually reapply PR#183 to correct js file
- Improve async websock handling
- Update to IDF 4.4.5, esp_littlefs to 1.9.2, platform espressif32 to 6.4.0
  • Loading branch information
@arjenhiemstra
arjenhiemstra committed Oct 23, 2023
1 parent ba5982d commit 8e30ebb
Show file tree
Hide file tree
Showing 15 changed files with 728 additions and 663 deletions.
8 changes: 4 additions & 4 deletions compiled_firmware_files/firmware.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
"link_beta": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/hardware_rev_1/nrgitho-hw1-v2.2.4.bin"
},
"2": {
"latest_fw": "2.5.6",
"link": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/hardware_rev_2/nrgitho-hw2-v2.5.6.bin",
"latest_fw": "2.5.7",
"link": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/hardware_rev_2/nrgitho-hw2-v2.5.7.bin",
"latest_beta_fw": "2.5.6",
"link_beta": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/hardware_rev_2/nrgitho-hw2-v2.5.6.bin"
},
"NON-CVE 1": {
"latest_fw": "2.5.6",
"link": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/non-cve_rev_1/nrgitho-noncve-v2.5.6.bin",
"latest_fw": "2.5.7",
"link": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/non-cve_rev_1/nrgitho-noncve-v2.5.7.bin",
"latest_beta_fw": "2.5.6",
"link_beta": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/non-cve_rev_1/nrgitho-noncve-v2.5.6.bin"
}
Expand Down
Binary file added compiled_firmware_files/hardware_rev_2/nrgitho-hw2-v2.5.7.bin
View file
Binary file not shown.
Binary file added compiled_firmware_files/non-cve_rev_1/nrgitho-noncve-v2.5.7.bin
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/components/esp_littlefs
Submodule esp_littlefs updated 10 files
+1 −1 .bumpversion.cfg
+10 −1 .github/workflows/pr.yml
+4 −1 README.md
+1 −1 idf_component.yml
+6 −5 include/esp_littlefs.h
+4 −0 project_include.cmake
+29 −12 src/esp_littlefs.c
+1 −1 src/littlefs
+20 −0 test/test_littlefs.c
+44 −0 test/test_littlefs_static_partition.c
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ dependencies:
source:
type: idf
version: 4.4.5
manifest_hash: 54a38b19466a5edc05bdba67bc40aad98828e91f6742a18c2e8b3fec9047d367
manifest_hash: 2f59de916b212295b1e7401452b95a3d8781b1253aa29ad96a3471ae3b909908
target: esp32
version: 1.0.0
1,204 changes: 605 additions & 599 deletions software/NRG_itho_wifi/main/webroot/controls_js_gz.h
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/main/webroot/edit_html_gz.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

const unsigned char edit_html_gz[] = {
0x1f, 0x8b, 0x8, 0x0, 0xde, 0x3f, 0x71, 0x64, 0x2, 0xff, 0xe5, 0x5d, 0x6b, 0x5b, 0xdb, 0x48, 0xb2, 0xfe, 0x3e, 0xbf, 0x42, 0x28, 0xbb, 0x83, 0xb4, 0xd8, 0x92, 0x4d, 0x2, 0x21, 0x6, 0x93, 0xe5, 0x1a, 0x8, 0xd7, 0x70, 0xd, 0xc9, 0xc9, 0xd9,
0x1f, 0x8b, 0x8, 0x0, 0xfe, 0xc, 0x36, 0x65, 0x2, 0xff, 0xe5, 0x5d, 0x6b, 0x5b, 0xdb, 0x48, 0xb2, 0xfe, 0x3e, 0xbf, 0x42, 0x28, 0xbb, 0x83, 0xb4, 0xd8, 0x92, 0x4d, 0x2, 0x21, 0x6, 0x93, 0xe5, 0x1a, 0x8, 0xd7, 0x70, 0xd, 0xc9, 0xc9, 0xd9,
0x47, 0x96, 0xda, 0xb6, 0x40, 0x96, 0x14, 0xa9, 0x8d, 0x6d, 0x76, 0x73, 0x7e, 0xfb, 0xa9, 0xea, 0x96, 0xe4, 0xd6, 0xd5, 0x98, 0xc9, 0xec, 0xce, 0x9c, 0x93, 0xcc, 0x13, 0x84, 0xfa, 0x56, 0x5d, 0x5d, 0x5d, 0xf5, 0x56, 0x75, 0xb5, 0x66,
0x63, 0x61, 0xf7, 0x6c, 0xe7, 0xea, 0xee, 0x7c, 0x4f, 0xea, 0xd3, 0x81, 0xf3, 0x8b, 0x4, 0x7f, 0xce, 0xaf, 0xb7, 0x8f, 0xf, 0x77, 0x24, 0xb9, 0xae, 0xeb, 0xb7, 0xaf, 0x77, 0x74, 0x7d, 0xf7, 0x6a, 0x57, 0xfa, 0x7c, 0x70, 0x75, 0x72,
0x2c, 0x35, 0xb5, 0x86, 0x74, 0x15, 0x18, 0x6e, 0x68, 0x53, 0xdb, 0x73, 0xd, 0x47, 0xd7, 0xf7, 0x4e, 0x65, 0x49, 0xee, 0x53, 0xea, 0xb7, 0x74, 0x7d, 0x34, 0x1a, 0x69, 0xa3, 0xd7, 0x9a, 0x17, 0xf4, 0xf4, 0xab, 0xb, 0x7d, 0x8c, 0xfd,
Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/main/webroot/favicon_png_gz.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

const unsigned char favicon_png_gz[] = {
0x1f, 0x8b, 0x8, 0x0, 0xde, 0x3f, 0x71, 0x64, 0x2, 0xff, 0x1, 0x66, 0x9, 0x99, 0xf6, 0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 0x0, 0x0, 0x0, 0xd, 0x49, 0x48, 0x44, 0x52, 0x0, 0x0, 0x0, 0x20, 0x0, 0x0, 0x0, 0x20, 0x8, 0x6,
0x1f, 0x8b, 0x8, 0x0, 0xfe, 0xc, 0x36, 0x65, 0x2, 0xff, 0x1, 0x66, 0x9, 0x99, 0xf6, 0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 0x0, 0x0, 0x0, 0xd, 0x49, 0x48, 0x44, 0x52, 0x0, 0x0, 0x0, 0x20, 0x0, 0x0, 0x0, 0x20, 0x8, 0x6,
0x0, 0x0, 0x0, 0x73, 0x7a, 0x7a, 0xf4, 0x0, 0x0, 0x0, 0x9, 0x70, 0x48, 0x59, 0x73, 0x0, 0x0, 0xe, 0xc4, 0x0, 0x0, 0xe, 0xc4, 0x1, 0x95, 0x2b, 0xe, 0x1b, 0x0, 0x0, 0x9, 0x18, 0x49, 0x44, 0x41, 0x54, 0x58, 0x85, 0x9d,
0x97, 0x7b, 0x8c, 0x55, 0xd7, 0x75, 0x87, 0xbf, 0xb5, 0xcf, 0xb9, 0xe7, 0xbe, 0x66, 0xc6, 0xb7, 0x74, 0x5e, 0x19, 0x3f, 0x42, 0x46, 0x13, 0xec, 0xa2, 0xf8, 0x95, 0x46, 0x36, 0x6, 0x6c, 0x6, 0x8c, 0x61, 0x18, 0x83, 0x54, 0x48, 0x9a,
0x54, 0x6e, 0xdd, 0x34, 0xa9, 0x9c, 0xda, 0xea, 0xc3, 0xb5, 0x10, 0x42, 0x96, 0x8b, 0x90, 0x85, 0xa8, 0x85, 0x28, 0xb2, 0xa2, 0xa4, 0x71, 0x49, 0x42, 0x1d, 0xc7, 0x72, 0x12, 0x3b, 0x6a, 0xe2, 0xda, 0x63, 0x66, 0x8c, 0x4d, 0x61, 0x50,
Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/main/webroot/index_html_gz.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

const unsigned char index_html_gz[] = {
0x1f, 0x8b, 0x8, 0x0, 0xde, 0x3f, 0x71, 0x64, 0x2, 0xff, 0xad, 0x56, 0x6d, 0x6f, 0xd3, 0x30, 0x10, 0xfe, 0xde, 0x5f, 0x61, 0x82, 0x40, 0x20, 0x91, 0xb4, 0x9b, 0x34, 0x81, 0xd6, 0xa4, 0x12, 0x1a, 0x9a, 0x98, 0x4, 0x12, 0x8c, 0xc1, 0x3e, 0x22,
0x1f, 0x8b, 0x8, 0x0, 0xfe, 0xc, 0x36, 0x65, 0x2, 0xff, 0xad, 0x56, 0x6d, 0x6f, 0xd3, 0x30, 0x10, 0xfe, 0xde, 0x5f, 0x61, 0x82, 0x40, 0x20, 0x91, 0xb4, 0x9b, 0x34, 0x81, 0xd6, 0xa4, 0x12, 0x1a, 0x9a, 0x98, 0x4, 0x12, 0x8c, 0xc1, 0x3e, 0x22,
0x37, 0xbe, 0x36, 0x7, 0x8e, 0x1d, 0xec, 0x4b, 0xd7, 0xf2, 0xeb, 0xb1, 0x93, 0xf4, 0x3d, 0xd9, 0x80, 0x2c, 0x5f, 0x62, 0xfb, 0x1e, 0xdf, 0x73, 0x7e, 0x7c, 0xb6, 0x2f, 0x7e, 0x22, 0x74, 0x4a, 0xab, 0x2, 0x58, 0x46, 0xb9, 0x9c, 0xc,
0x62, 0xff, 0x63, 0x92, 0xab, 0x79, 0x12, 0x80, 0xa, 0x26, 0x3, 0x37, 0x2, 0x5c, 0x4c, 0x6, 0xcc, 0x7d, 0x71, 0xe, 0xc4, 0x59, 0x9a, 0x71, 0x63, 0x81, 0x92, 0xa0, 0xa4, 0x59, 0xf8, 0x26, 0xd8, 0x35, 0x29, 0x9e, 0x43, 0x12, 0x2c,
0x10, 0xee, 0xa, 0x6d, 0x28, 0x60, 0xa9, 0x56, 0x4, 0xca, 0x41, 0xef, 0x50, 0x50, 0x96, 0x8, 0x58, 0x60, 0xa, 0x61, 0xd5, 0x79, 0xc5, 0x50, 0x21, 0x21, 0x97, 0xa1, 0x4d, 0xb9, 0x84, 0xe4, 0x24, 0x1a, 0xb5, 0xb8, 0x12, 0x60, 0x53,
Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/main/webroot/pure_min_css_gz.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

const unsigned char pure_min_css_gz[] = {
0x1f, 0x8b, 0x8, 0x0, 0xde, 0x3f, 0x71, 0x64, 0x2, 0xff, 0xed, 0x3d, 0xfd, 0x8f, 0xeb, 0x36, 0x72, 0xbf, 0xbf, 0xbf, 0x42, 0x79, 0x8b, 0xe0, 0x76, 0x3, 0xcb, 0x2b, 0x4b, 0x96, 0xec, 0xb5, 0x71, 0xc1, 0x5d, 0x72, 0x69, 0x9b, 0xe2, 0x1a, 0x1c,
0x1f, 0x8b, 0x8, 0x0, 0xfe, 0xc, 0x36, 0x65, 0x2, 0xff, 0xed, 0x3d, 0xfd, 0x8f, 0xeb, 0x36, 0x72, 0xbf, 0xbf, 0xbf, 0x42, 0x79, 0x8b, 0xe0, 0x76, 0x3, 0xcb, 0x2b, 0x4b, 0x96, 0xec, 0xb5, 0x71, 0xc1, 0x5d, 0x72, 0x69, 0x9b, 0xe2, 0x1a, 0x1c,
0xf0, 0xee, 0x97, 0x22, 0x7d, 0x28, 0x64, 0x89, 0xb6, 0xd5, 0x27, 0x4b, 0x86, 0x24, 0xbf, 0xdd, 0x8d, 0xeb, 0xff, 0xbd, 0xfc, 0x94, 0x38, 0x43, 0x52, 0xf6, 0xbe, 0x26, 0x4d, 0xb, 0xf4, 0x8c, 0x77, 0xd1, 0x90, 0xc3, 0xe1, 0x90, 0xf3,
0x45, 0x52, 0x43, 0xed, 0xe3, 0x37, 0x5f, 0xbd, 0xfb, 0xdb, 0xa9, 0x21, 0xde, 0xe7, 0x70, 0x1a, 0x4c, 0x23, 0xef, 0xfb, 0xfa, 0xf8, 0xda, 0x14, 0xbb, 0x7d, 0xe7, 0x85, 0xc1, 0x2c, 0xf2, 0xfe, 0x35, 0xdd, 0xd7, 0xf5, 0x57, 0xde, 0x5f,
0x8b, 0x8c, 0x54, 0x2d, 0xc9, 0xbd, 0x53, 0x95, 0x93, 0xc6, 0xeb, 0xf6, 0xc4, 0xfb, 0xee, 0xc3, 0x5f, 0x54, 0xf1, 0xd4, 0xdb, 0x77, 0xdd, 0xb1, 0x5d, 0x3d, 0x3e, 0xee, 0x8a, 0x6e, 0x7f, 0xda, 0x4c, 0xb3, 0xfa, 0xf0, 0x78, 0xa4, 0x44,
Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/main/webroot/zepto_min_js_gz.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

const unsigned char zepto_min_js_gz[] = {
0x1f, 0x8b, 0x8, 0x0, 0xde, 0x3f, 0x71, 0x64, 0x2, 0xff, 0xb5, 0x3d, 0x6b, 0x77, 0xd3, 0xd6, 0x96, 0xdf, 0xe7, 0x57, 0xc8, 0x1a, 0xa6, 0x4b, 0x22, 0x8e, 0x92, 0x30, 0xf3, 0x65, 0x1c, 0x82, 0x17, 0xa5, 0xd0, 0x72, 0xb, 0x81, 0x4b, 0xd2, 0x96,
0x1f, 0x8b, 0x8, 0x0, 0xfe, 0xc, 0x36, 0x65, 0x2, 0xff, 0xb5, 0x3d, 0x6b, 0x77, 0xd3, 0xd6, 0x96, 0xdf, 0xe7, 0x57, 0xc8, 0x1a, 0xa6, 0x4b, 0x22, 0x8e, 0x92, 0x30, 0xf3, 0x65, 0x1c, 0x82, 0x17, 0xa5, 0xd0, 0x72, 0xb, 0x81, 0x4b, 0xd2, 0x96,
0xe2, 0xa4, 0x5d, 0xb2, 0x7d, 0x9c, 0x8, 0x64, 0xc9, 0x95, 0xe4, 0x3c, 0x20, 0x99, 0xdf, 0x3e, 0xfb, 0x75, 0x5e, 0xb2, 0xe4, 0xc2, 0x9d, 0x35, 0xab, 0xac, 0x46, 0x3a, 0x3a, 0xcf, 0x7d, 0xf6, 0xd9, 0xef, 0xb3, 0xbd, 0xf7, 0x30, 0xf8,
0xa0, 0x56, 0x4d, 0x19, 0x5c, 0x1d, 0x24, 0x8f, 0x92, 0xfd, 0x60, 0x37, 0xf8, 0x4c, 0xaf, 0xea, 0x4a, 0x15, 0x4d, 0x90, 0x7e, 0x4c, 0x6f, 0x82, 0x45, 0x59, 0x2d, 0x83, 0x4c, 0xe9, 0x4f, 0x1f, 0xeb, 0x64, 0x56, 0x2e, 0xf7, 0xf2, 0x6c,
0xa6, 0x8a, 0x5a, 0x5, 0xf, 0xf7, 0xfe, 0x6d, 0xb0, 0x58, 0x17, 0xb3, 0x26, 0x2b, 0x8b, 0x20, 0x6a, 0x86, 0x81, 0x8a, 0x83, 0x2f, 0x41, 0xa8, 0x8b, 0xc2, 0xe0, 0xe8, 0x28, 0x68, 0x6e, 0x57, 0xaa, 0x5c, 0x4, 0x73, 0xb5, 0xc8, 0xa,
Expand Down
103 changes: 57 additions & 46 deletions software/NRG_itho_wifi/main/webroot_source/controls.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,22 +438,15 @@ $(document).ready(function () {
alert("Please select a remote.");
}
else {
var remtype = 1;
if ($('#type_remote-' + i).val() < 4) {
if ($('#type_remote-' + i).prop('checked')) {
remtype = 3;
}
}
else {
remtype = $('#type_remote-' + i).val();
}
var remfunc = $('#func_remote-' + i).val();
var remtype = $('#type_remote-' + i).val();
var id = $('#id_remote-' + i).val();
if (id == 'empty slot') id = "0,0,0";
if (isNaN(parseInt(id.split(",")[0], 16)) || isNaN(parseInt(id.split(",")[1], 16)) || isNaN(parseInt(id.split(",")[2], 16))) {
alert("ID error, please use HEX notation separated by ',' (ie. 'A1,34,7F')");
}
else {
websock.send(`{"${$(this).attr('id')}":${i},"id":[${parseInt(id.split(",")[0], 16)},${parseInt(id.split(",")[1], 16)},${parseInt(id.split(",")[2], 16)}],"value":"${$('#name_remote-' + i).val()}","remtype":${remtype}}`);
websock.send(`{"${$(this).attr('id')}":${i},"id":[${parseInt(id.split(",")[0], 16)},${parseInt(id.split(",")[1], 16)},${parseInt(id.split(",")[2], 16)}],"value":"${$('#name_remote-' + i).val()}","remtype":${remtype},"remfunc":${remfunc}}`);
}
}
}
Expand Down Expand Up @@ -551,6 +544,10 @@ $(document).ready(function () {
const items = $(this).attr('id').split('-');
websock.send(`{"vremote":${items[1]}, "command":"${items[2]}"}`);
}
else if ($(this).attr('id').startsWith('button_remote-')) {
const items = $(this).attr('id').split('-');
websock.send(`{"remote":${items[1]}, "command":"${items[2]}"}`);
}
else if ($(this).attr('id').startsWith('ithobutton-')) {
const items = $(this).attr('id').split('-');
websock.send(`{"ithobutton":"${items[1]}"}`);
Expand Down Expand Up @@ -775,6 +772,12 @@ function radio(origin, state) {
$(`#type_${origin}-${index}`).prop('disabled', false);
}
});
$(`[id^=func_${origin}-]`).each(function (index) {
$(`#func_${origin}-${index}`).prop('disabled', true);
if (index == state) {
$(`#func_${origin}-${index}`).prop('disabled', false);
}
});
$(`[id^=id_${origin}-]`).each(function (index) {
$(`#id_${origin}-${index}`).prop('readonly', true);
if (index == state) {
Expand Down Expand Up @@ -1004,8 +1007,15 @@ var remtypes = [
["RFT RV", 0x12A0, ['auto', 'autonight', 'low', 'medium', 'high', 'timer1', 'timer2', 'timer3', 'join', 'leave']],
["RFT CO2", 0x1298, ['auto', 'autonight', 'low', 'medium', 'high', 'timer1', 'timer2', 'timer3', 'join', 'leave']]
];
var remfuncs = [
["Receive", 1],
["Monitor Only", 3],
["Send", 5],
["Bidirectional", 7]
];

function addRemoteButtons(selector, remtype, vremotenum, seperator) {
function addRemoteButtons(selector, remfunc, remtype, vremotenum, seperator) {
var remfuncname = remfunc == 1 ? "remote" : "vremote";
for (const item of remtypes) {
if (remtype == item[1]) {
var newinner = '';
Expand All @@ -1014,7 +1024,7 @@ function addRemoteButtons(selector, remtype, vremotenum, seperator) {
if (i == 0 || item[2][i] == 'cook30' || item[2][i] == 'timer1' || (item[2].length == 10 && item[2][i] == 'low') || item[2][i] == 'join') { newinner += `<div style="text-align: center;margin: 2em 0 0 0;">`; }
}

newinner += `<button value='${item[2][i]}_remote-${vremotenum}' id='button_vremote-${vremotenum}-${item[2][i]}' class='pure-button pure-button-primary'>${item[2][i].charAt(0).toUpperCase() + item[2][i].slice(1)}</button>\u00A0`;
newinner += `<button value='${item[2][i]}_remote-${vremotenum}' id='button_${remfuncname}-${vremotenum}-${item[2][i]}' class='pure-button pure-button-primary'>${item[2][i].charAt(0).toUpperCase() + item[2][i].slice(1)}</button>\u00A0`;

if (seperator) {
if (item[2][i] == 'high' || item[2][i] == 'cook60' || item[2][i] == 'timer3' || (item[2].length == 10 && item[2][i] == 'autonight') || item[2][i] == 'leave') {
Expand All @@ -1037,7 +1047,7 @@ function addvRemoteInterface(remtype) {

var elem = $('#reminterface');
elem.empty();
addRemoteButtons(elem, remtype, 0, true);
addRemoteButtons(elem, 2, remtype, 0, true);

}

Expand Down Expand Up @@ -1073,42 +1083,49 @@ function buildHtmlTable(selector, remfunc, jsonVar) {
for (var colIndex = 0; colIndex < columns.length; colIndex++) {
if (colIndex == 3) {
remfunction = jsonVar[i][columns[colIndex]];
}
else if (colIndex == 4) {
var cellValue = jsonVar[i][columns[colIndex]];
if (remfunction == 1 || remfunction == 3) {
var checkbox = document.createElement('input');
checkbox.type = 'checkbox';
checkbox.id = `type_remote-${i}`;
checkbox.value = remfunction;
checkbox.disabled = true;
if (remfunction == 3) checkbox.checked = true;
row$.append($('<td>').html(checkbox));
}
else if (remfunction == 2) {
if (remfunction != 2) { //do not add remote function is remfunction == virtual remote
var select = document.createElement('select');
select.name = cellValue;
select.id = `type_remote-${i}`;
select.name = remfunction;
select.id = `func_remote-${i}`;
select.disabled = true;
for (const item of remtypes) {
for (const item of remfuncs) {
var option = document.createElement('option');
option.value = item[1];
option.text = item[0];
if (item[1] == cellValue) {
if (item[1] == remfunction) {
option.selected = true;
remtype = cellValue;
remtype = remfunction;
}
select.appendChild(option);
}
row$.append($('<td>').html(select));
}
else {
row$.append($('<td>').html(cellValue));
}
else if (colIndex == 4) {
var cellValue = jsonVar[i][columns[colIndex]];
var select = document.createElement('select');
select.name = cellValue;
select.id = `type_remote-${i}`;
select.disabled = true;
for (const item of remtypes) {
var option = document.createElement('option');
option.value = item[1];
option.text = item[0];
if (item[1] == cellValue) {
option.selected = true;
remtype = cellValue;
}
select.appendChild(option);
}
row$.append($('<td>').html(select));
}
else if (colIndex == 5) {

if (remfunction == 1 || remfunction == 3) {
if (remfunction == 2 || remfunction == 5) {
var td$ = $('<td>');
addRemoteButtons(td$, remfunc, remtype, i, false);
row$.append(td$);
}
else {
var str = '';
var JSONObj = jsonVar[i][columns[colIndex]];
if (JSONObj != null) {
Expand All @@ -1121,11 +1138,6 @@ function buildHtmlTable(selector, remfunc, jsonVar) {
}
row$.append($('<td>').html(str));
}
else if (remfunction == 2) {
var td$ = $('<td>');
addRemoteButtons(td$, remtype, i, false);
row$.append(td$);
}
}
else {
var cellValue = jsonVar[i][columns[colIndex]].toString();
Expand All @@ -1149,9 +1161,6 @@ function buildHtmlTable(selector, remfunc, jsonVar) {
headerTbody$.append(row$);
}
$(selector).append(headerTbody$);
if (remfunc == 1) {
$('#remtype').html("monitor only");
}
}

function buildHtmlStatusTable(selector, jsonVar) {
Expand Down Expand Up @@ -1251,7 +1260,7 @@ function addAllColumnHeadersPlain(jsonVar, selector) {
return columnSet;
}

function addAllColumnHeaders(jsonVar, selector, appendRow) {
function addAllColumnHeaders(jsonVar, selector, appendRow, remfunc) {
var columnSet = [];
var headerThead$ = $('<thead>');
var headerTr$ = $('<tr>');
Expand All @@ -1262,8 +1271,8 @@ function addAllColumnHeaders(jsonVar, selector, appendRow) {
for (var key in rowHash) {
if ($.inArray(key, columnSet) == -1) {
columnSet.push(key);
if (key == "remtype") {
headerTr$.append($('<th id="remtype">').html(key));
if (key == "remfunc" & remfunc == 1) {
headerTr$.append($('<th id="remfunc">').html(key));
}
else if (key != "remfunc") {
headerTr$.append($('<th>').html(key));
Expand Down Expand Up @@ -2520,6 +2529,7 @@ var html_remotessetup = `
<p>There is also an option
to monitor only. With this option checked, a RF device still paired with an itho can be monitored without influencing
the commands using the add-on.</p>
<p>Changing the remote function to "Send" will enable the user to send RF commands by using the CC1101 RF module.</p>
<p>Last received commands (and if applicable data) received from paired RF devices is available through the MQTT API and
WebAPI</p>
<form class="pure-form pure-form-aligned">
Expand All @@ -2544,6 +2554,7 @@ var html_remotessetup = `
</form>
<script>
$(document).ready(function () {
$('#main').css('max-width', '1400px')
getSettings('ithoremotes');
});
</script>
Expand Down
6 changes: 3 additions & 3 deletions software/NRG_itho_wifi/platformio.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
[platformio]
src_dir = main
default_envs =
dev
; dev
; debug
; beta_cve
; beta_noncve
; release_cve
; release_noncve
release_cve
release_noncve

[env]
; Global data for all [env:***]
Expand Down
Loading

0 comments on commit 8e30ebb

Please sign in to comment.