j3d1/RTL00_WEB_WS2812
1
0
Fork 0
mirror of https://github.com/ADElectronics/RTL00_WEB_WS2812.git synced 2024-12-04 19:00:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix main lamp on\off switch

Browse source 
Main lamp switch not worked on Opera\Chrome, but worked on Edge - now worked normal on all browsers.
This commit is contained in:
ADElectronics 2018-01-06 01:15:19 +03:00
parent 8d743effde
commit 7ac60bf6e1
20 changed files with 75 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Firmware/.vs/RTLGDB/v14/.suo
View file

Binary file not shown.

BIN
Firmware/RTLGDB.VC.db
View file

Binary file not shown.

3
Firmware/RTLGDB/Debug/RTLGDB.log
View file

@ -1,6 +1,5 @@
 ===========================================================
Compile (Debug)
USDK/component/common/api/wifi_api.c
USDK/component/common/api/wifi_api_scan.c
===========================================================
Link (Debug)
@ -28,7 +27,7 @@
Make OTA image (Debug/bin/ota.bin)
size = 263820
checksum 1a2dc5a
checksum 1a2dc8a
===========================================================
Create image2p (Debug/bin/ram_2.p.bin)

BIN
Firmware/RTLGDB/Debug/bin/WEBFiles.bin
View file

Binary file not shown.

BIN
Firmware/RTLGDB/Debug/bin/ota.bin
View file

Binary file not shown.

BIN
Firmware/RTLGDB/Debug/bin/ram_2.bin
View file

Binary file not shown.

BIN
Firmware/RTLGDB/Debug/bin/ram_2.ns.bin
View file

Binary file not shown.

BIN
Firmware/RTLGDB/Debug/bin/ram_2.p.bin
View file

Binary file not shown.

BIN
Firmware/RTLGDB/Debug/bin/ram_all.bin
View file

Binary file not shown.

BIN
Firmware/RTLGDB/Debug/obj/Debug.axf
View file

Binary file not shown.

BIN
Firmware/RTLGDB/Project/WS2812 2017.12.14.zip
View file

Binary file not shown.

BIN
Firmware/RTLGDB/Project/WS2812 2017.12.23.zip
View file

Binary file not shown.

6
Firmware/RTLGDB/Project/build_info.h
View file

@ -1,6 +1,6 @@
#define UTS_VERSION "2017/12/28-23:03:40"
#define RTL8195AFW_COMPILE_TIME "2017/12/28-23:03:40"
#define RTL8195AFW_COMPILE_DATE "20171228"
#define UTS_VERSION "2018/01/06-01:09:40"
#define RTL8195AFW_COMPILE_TIME "2018/01/06-01:09:41"
#define RTL8195AFW_COMPILE_DATE "20180106"
#define RTL8195AFW_COMPILE_BY "Andrew"
#define RTL8195AFW_COMPILE_HOST ""
#define RTL8195AFW_COMPILE_DOMAIN

2
Firmware/RTLGDB/USDK/flasher/file_info.jlink
View file

@ -1,5 +1,5 @@
define call1
set $ImageSize = 0x9270
set $ImageSize = 0x9AC0
set $ImageAddr = 0x0D0000
end
define call2

BIN
Firmware/RTLGDB/WEBFiles 2017.12.27.zip
View file

Binary file not shown.

BIN
Firmware/RTLGDB/WEBFiles 2017.12.27_2.zip
View file

Binary file not shown.

8
Firmware/RTLGDB/WEBFiles/elements.css
View file

@ -3,7 +3,10 @@ form{
width:100%;
}
#child_page{
margin:0 auto;width:700px;height:800px;display: block;
margin:0 auto;
width:700px;
height:800px;
display: block;
}
#picker-wrapper{
@ -13,7 +16,8 @@ form{
}
#picker{
margin:0 auto;width:300px;
margin:0 auto;
width:300px;
display: block;
}
.hblockcont {

13
Firmware/RTLGDB/WEBFiles/elements.js
View file

@ -72,19 +72,6 @@ function setFormValues(form, cfg)
field.checked = cfg[name] === '1' ? true : false;
openFilterSettings(field);
}
else if (field.type === 'image')
{
if (cfg[name] == '1')
{
field.src = 'on.gif';
field.className = 'on';
}
else
{
field.src = 'off.gif';
field.className = 'off';
}
}
else
{
field.value = cfg[name];

23
Firmware/RTLGDB/WEBFiles/index.html
View file

@ -4,15 +4,12 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>Глупая гирлянда</title>
<link href="elements.css" rel="stylesheet">
<style>
</style>
<style> </style>
</head>
<body>
<div class="hblockcont">
<input type="image" src="off.gif" class='off' name='ws_isenable' onclick="changeOnOff(this)" />
<input type="image" src="off.gif" class='off' id="ws_isenable" onclick="changeOnOff(this)" />
</div>
<div class="tab" align="center">
@ -40,14 +37,22 @@
else if (tabID == '1') document.getElementById("child_page").src = "settings.html";
}
function isenable_select(elem, val) {
if (val.ws_isenable == '0') {
elem.src = 'off.gif';
elem.className = 'off';
}
else {
elem.src = 'on.gif';
elem.className = 'on';
}
}
var cfg_f0 =
{
ws_isenable: "~ws_isenable~",
}
document.addEventListener('DOMContentLoaded', function()
{
setFormValues(document.getElementsByName("ws_isenable"), cfg_f0);
});
isenable_select(document.getElementById("ws_isenable"), cfg_f0);
</script>
</body>
</html>

54
Firmware/RTLGDB/WEBFiles/settings.html
View file

@ -9,6 +9,51 @@
<body>
<form method="post">
<table>
<tr>
<td class="td1st"><b>Настройки пользовательской кнопки:</b></td>
</tr>
<tr>
<td class="td1st">Кратковременное нажатие</td>
<td>
<select class="select" name='button_shortmode'>
<option value='0'>Отключено</option>
</select>
</td>
</td>
</tr>
<tr>
<td class="td1st">Долговременное нажатие</td>
<td>
<select class="select" name='button_longmode'>
<option value='0'>Отключено</option>
</select>
</td>
</td>
</tr>
<tr>
<td class="td1st"><b>Настройки светодиодов:</b></td>
</tr>
<tr>
<td class="td1st">Светодиод нотификации (зел.)</td>
<td>
<select class="select" name='button_longmode'>
<option value='0'>Отключен</option>
</select>
</td>
</td>
</tr>
<tr>
<td class="td1st">Светодиод ошибки (кр.)</td>
<td>
<select class="select" name='button_longmode'>
<option value='0'>Отключен</option>
</select>
</td>
</td>
</tr>
<tr>
<td class="td1st"><b>Общие настройки Wi-Fi:</b></td>
</tr>
<tr>
<td class="td1st">Режим Wi-Fi</td>
<td>
@ -101,7 +146,7 @@
<td>
<select class="select" name='wifi_ap_auth'>
<option value='0'>Open</option>
<option value='1'>WPA_WPA2_PSK</option>
<option value='1'>WPA\WPA2\PSK</option>
</select>
</td>
</tr>
@ -123,8 +168,9 @@
</form>
<script src="colorpicker.min.js"></script>
<script type="text/javascript">
var cfg_f2 =
<script src="elements.js"></script>
<script type="text/javascript">
var cfg_wifi =
{
wifi_mode: "~wifi_mode~",
wifi_bgn: "~wifi_bgn~",
@ -138,7 +184,7 @@
wifi_ap_auth: "~wifi_ap_auth~",
wifi_ap_ip: "~wifi_ap_ip~"
}
setFormValues(document.forms[1], cfg_f2);
setFormValues(document.forms[0], cfg_wifi);
</script>
</body>
</html>