new dark design

This commit is contained in:
Bogdan Pilyugin 2023-03-27 16:12:24 +02:00
parent 8b0b5f76f4
commit dbde75ef32
11 changed files with 7234 additions and 755 deletions

4782
.project

File diff suppressed because it is too large Load Diff

View File

@ -21,8 +21,8 @@
<div class="mlhdr">ETHERNET</div>
<table class='cntr'>
<tr>
<script>PrintCheckBox('Включить ETHERNET','ethen','~ethen~','configIPBoxes()');
PrintCheckBox('Включить DHCP','dhcp','~ecbdh~','configIPBoxes()');
<script>PrintSwitch('Включить ETHERNET','ethen','~ethen~','configIPBoxes()');
PrintSwitch('Включить DHCP','dhcp','~ecbdh~','configIPBoxes()');
PrintIPInput('IP Станции:','ipa','~eip~');
PrintIPInput('Маска подсети:','mas','~emsk~');
PrintIPInput(' Адрес шлюза:','gte','~egate~');
@ -49,7 +49,7 @@
<table class='cntr'>
<table>
<script>
PrintCheckBox('Включить LoRaWAN','lren','~lren~',null);
PrintSwitch('Включить LoRaWAN','lren','~lren~',null);
PrintHexInput('ID устройства:','lrdvid','~lrdvid~',16,16);
PrintHexInput('ID приложения:','lrapid','~lrapid~',16,16);
</script>
@ -74,10 +74,9 @@
<form name="wifi" method="post">
<div class="mlhdr">WiFi</div>
<table class='cntr'>
<tr>
<td class='rl'>Включить WiFi</td>
<td><input type="checkbox" name="wifien" value="1" ~wfen~/></td>
</tr>
<script>
PrintSwitch('Включить WiFi','wifien','~wfen~',null);
</script>
<tr>
<td class='rl'><button type="button" class='btn' name='upd' onclick="StartScan()">Scan
WiFi</button></td>
@ -98,7 +97,7 @@
PrintIPInput('IP адрес(AP):','ipaap','~ipap~');
PrintTextInput('Имя WiFi сети(CLN):','wfi','~ssid~',3,31);
PrintTextInput('Ключ WiFi сети(CLN):','wfp','~wkey~',8,31);
PrintCheckBox('Включить DHCP','dhcp','~cbdh~','configIPBoxes()');
PrintSwitch('Включить DHCP','dhcp','~cbdh~','configIPBoxes()');
PrintIPInput('IP адрес(CLN):','ipa','~ip~');
PrintIPInput('Маска подсети(CLN):','mas','~msk~');
PrintIPInput('Адрес шлюза(CLN):','gte','~gate~');
@ -126,7 +125,7 @@
<form name="gprs" method="post">
<table class='cntr'>
<script>
PrintCheckBox('Включить GSM','gsmen','~gsmen~',null);
PrintSwitch('Включить GSM','gsmen','~gsmen~',null);
PrintLabel('Модуль:','~gsmmod~');
PrintLabel('Оператор:','~gsmopr~');
PrintLabel('IMEI:','~gimei~');

View File

@ -1,17 +1,18 @@
:root {
/*========== Colors ==========*/
--first-color: #FFFFFF;
--first-color-light: #00ccee;
--title-color: #006699;
--header-color: #EEEEEE;
--text-color: #404040;
--text-color-light: #006699;
--body-color: #FFFFFF;
--container-color: #00ccee;
--first-color: #152128;
--first-color-light: #152128;
--title-color: #9FA3A6;
--header-color: #185273;
--text-color: #9FA3A6;
--text-color-light: #9FA3A6;
--body-color: #0E1A21;
--container-color: #0E1A21;
--navy-color: #185273;
/*========== Font and typography ==========*/
--body-font: 'Consolas', monospace;
--large-font-size: 1.4rem;
--large-font-size: 1.2rem;
--normal-font-size: 0.9rem;
--small-font-size: .9rem;
--smaller-font-size: .8rem;
@ -22,3 +23,137 @@
}
.pwrbox{width:80%; height:auto; padding:5px; margin:10px auto; box-sizing:border-box;}
.pwrbox td {font: .9rem consolas, monospace; width:30%; padding:0;margin:0;}
.container{margin: 10px;
display: flex;
flex-wrap:wrap;}
div label input {margin-right: 100px;}
.cat{
margin: 4px;
background-color: var(--first-color);
border-radius: 5px;
border: 1px solid rgba(255, 255, 255, 0.4);
overflow: hidden;
float: left;
}
.cat label {float: left; line-height: 2.6em; width: 2.6em; height: 2.6em;}
.cat label span {text-align: center; padding: 0px 0px; display: block;}
.cat label input { position: absolute; display: none;color: var(--text-color) !important;}
.cat label input + span{color: var(--text-color);}
.cat input:checked + span {
color: var(--text-color);
text-shadow: 0 0 6px rgba(0, 0, 0, 0.8);
}
input:checked + span{background-color: var(--navy-color);}
.channel{ widht:100%;
display: flex;
flex-wrap:no-wrap;
margin:10px;
}
.chnam{
display: flex;
align-items: center;
}
.rngval {
-webkit-appearance: none;
margin: auto 10px;
width: 80%;
height: 5px;
border: none;
background: var(--navy-color);
outline: none;
opacity: 0.7;
-webkit-transition: .2s;
transition: opacity .2s;
}
.rngval::-webkit-slider-thumb {
-webkit-appearance: none;
appearance: none;
width: 25px;
height: 25px;
border-radius: 50%;
background: var(--text-color);
cursor: pointer;
}
.rngval::-moz-range-thumb {
width: 25px;
height: 25px;
border-radius: 50%;
background: var(--text-color);
cursor: pointer;
}
.inpval{
display: flex;
align-items: center;
}
.switch {
position: relative;
display: inline-block;
width: 42px;
height: 24px;
margin: 10px 20px;
}
.switch input {
opacity: 0;
width: 0;
height: 0;
}
.slider {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: var(--text-color);
-webkit-transition: .4s;
transition: .4s;
}
.slider:before {
position: absolute;
content: "";
height: 18px;
width: 18px;
left: 3px;
bottom: 3px;
background-color: #CCC;
-webkit-transition: .4s;
transition: .4s;
}
input:checked + .slider {
background-color: var(--navy-color);
}
input:focus + .slider {
box-shadow: 0 0 1px var(--navy-color);
}
input:checked + .slider:before {
-webkit-transform: translateX(18px);
-ms-transform: translateX(18px);
transform: translateX(18px);
}
/* Rounded sliders */
.slider.round {
border-radius: 24px;
}
.slider.round:before {
border-radius: 50%;
}

View File

@ -141,4 +141,3 @@ const showMenu = (headerToggle, navbarId) =>{
})
}
}

View File

@ -72,8 +72,8 @@ img {
font-weight: var(--font-medium);
font-size: var(--large-font-size);
margin-left: 150px;
display: none;
margin-left: 50px;
/*display: none;*/
}
.header__icon,
@ -93,7 +93,7 @@ img {
left: -100%;
height: 100vh;
padding: 1rem 1rem 0;
background-color: var(--container-color);
background-color: var(--first-color);
box-shadow: 1px 0 0 rgba(22, 8, 43, 0.1);
z-index: var(--z-fixed);
transition: .4s;
@ -146,7 +146,7 @@ img {
}
.nav__link:hover {
color: var(--first-color);
color: var(--navy-color);
}
.nav__icon {
@ -191,7 +191,7 @@ img {
}
.nav__dropdown-item:hover {
color: var(--first-color);
color: var(--navy-color);
}
.nav__dropdown-icon {
@ -216,7 +216,7 @@ img {
/*===== Active link =====*/
.active {
color: var(--first-color);
color: var(--navy-color);
}
/* ========== MEDIA QUERIES ==========*/
@ -293,6 +293,8 @@ img {
.nav:hover .nav__dropdown-icon {
opacity: 1;
}
}
.rl{text-align:right;}
@ -300,15 +302,17 @@ img {
input, select, .btn, .lab, textarea {
font:.85rem consolas,monospace;
padding-left:3px;
border:solid 1px #CCCCCC;
background-color:var(--first-color);
color:var(--text-color);
border:1px solid rgba(255, 255, 255, 0.4);
border-radius: 5px;
height:2.0rem;
margin: 3px 3px;
margin: 15px 3px;
vertical-align: middle;
}
.btn{min-width:100px;}
.btn:active{background-color: #CCCCCC;}
.btn:hover {border:solid 1px #999999;}
.btn{min-width:100px; color:var(--text-color);}
.btn:active{background-color: var(--navy-color);}
.btn:hover {border:1px solid rgba(255, 255, 255, 0.4);}
.lab {border: none;}
@ -347,7 +351,7 @@ input[type="radio"] { margin-top: -1px; vertical-align: middle;}
.mlpc {
margin: 0 0 10px 10px;
padding: 10px;
border:solid 1px #CCCCCC;
background-color:var(--first-color);
}
.ml {

View File

@ -22,8 +22,9 @@
<div class="mlhdr">SNTP</div>
<table class='cntr'>
<tr><td class='rl'>Включить SNTP клиент</td><td><input type="checkbox" name="sntpen" value="1" ~sntpen~></td></tr>
<tr><td class='rl'>Адрес SNTP сервера:</td><td><input type="text" required size="20" name='tsr' value="~tmsrv~" title="3-32 символов A-Z,a-z,0-9,." pattern="^[0-9a-zA-Z\.]{3,32}$"/></td></tr><tr><td></td></tr><tr><td></td></tr>
<script>PrintSwitch('Включить SNTP клиент','sntpen','~sntpen~',null);
PrintTextInput('Адрес SNTP сервера:','tsr','~tmsrv~',3,31);
</script>
</table>
<table class='cntr'>
<tr><td width=90% align='center'>
@ -43,7 +44,7 @@
<form name="conf2" method="post">
<div class="mlhdr">MQTT1</div>
<table class='cntr'>
<script>PrintCheckBox('Enable MQTT 1','mqen1','~mqen1~',null);
<script>PrintSwitch('Enable MQTT 1','mqen1','~mqen1~',null);
PrintTextInput('MQTT broker URL','mqurl1','~mqurl1~',3,31);
PrintInt('MQTT broker port','mqport1','~mqport1~',1000,65534);
PrintTextInput('Global system name','mqsys1','~mqsys1~',3,31);
@ -64,7 +65,7 @@
<div class="mlhdr">MQTT2</div>
<table class='cntr'>
<script>
PrintCheckBox('Enable MQTT 2','mqen2','~mqen2~',null);
PrintSwitch('Enable MQTT 2','mqen2','~mqen2~',null);
PrintTextInput('MQTT broker URL','mqurl2','~mqurl2~',3,31);
PrintInt('MQTT broker port','mqport2','~mqport2~',1000,65534);
PrintTextInput('Global system name','mqsys2','~mqsys2~',3,31);

View File

@ -41,8 +41,8 @@
<form name="syst" method="post">
<div class="mlhdr">FIRMWARE UPDATE</div>
<table class='cntr'><script>
PrintCheckBox('Reset config on OTA update','otarst','~otarst~',null);
PrintCheckBox('Enable OTA auto update','ota','~ota~',null);
PrintSwitch('Reset config on OTA update','otarst','~otarst~',null);
PrintSwitch('Enable OTA auto update','ota','~ota~',null);
PrintInt('Auto update check period','otaint','~otaint~',1,65534);
</script></table>
<table class='cntr'><tr><td align="center">Update firmware URL:</td></tr></table>
@ -78,26 +78,6 @@
</form>
</div>
</div>
<div class="mlp">
<div class="mlpc">
<div class="mlhdr">DEBUG</div>
<div style='margin:auto;text-align:center'>
</br>
<button type="button" class ='btn' name='cmd1' onclick="cmd(1)">F1</button>
<button type="button" class ='btn' name='cmd2' onclick="cmd(2)">F2</button></br></br>
<button type="button" class ='btn' name='cmd3' onclick="cmd(3)">F3</button>
<button type="button" class ='btn' name='cmd4' onclick="cmd(4)">F4</button></br></br>
<button type="button" class ='btn' name='cmd5' onclick="cmd(5)">F5</button>
<button type="button" class ='btn' name='cmd6' onclick="cmd(6)">F6</button></br></br>
<button type="button" class ='btn' name='cmd7' onclick="cmd(7)">F7</button>
<button type="button" class ='btn' name='cmd8' onclick="cmd(8)">F8</button></br></br>
<button type="button" class ='btn' name='cmd9' onclick="cmd(9)">F9</button>
<button type="button" class ='btn' name='cmd10' onclick="cmd(10)">F10</button></br></br>
</div>
</div>
</div>
</div>
</section>
</main>

@ -1 +1 @@
Subproject commit e4d1a8c953c516a41d550716bc7e267d2e571c63
Subproject commit ebf050673c3133dec5db7eab209a2acbdd5aa99f

1562
sdkconfig Normal file

File diff suppressed because it is too large Load Diff

View File

@ -32,7 +32,7 @@ CONFIG_APP_COMPILE_TIME_DATE=y
# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
CONFIG_APP_PROJECT_VER_FROM_CONFIG=y
CONFIG_APP_PROJECT_VER="0.0.0.12"
CONFIG_APP_PROJECT_VER="1"
CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
# end of Application manager
@ -177,13 +177,26 @@ CONFIG_APPTRACE_DEST_NONE=y
CONFIG_APPTRACE_LOCK_ENABLE=y
# end of Application Level Tracing
#
# ESP-ASIO
#
# CONFIG_ASIO_SSL_SUPPORT is not set
# end of ESP-ASIO
#
# Bluetooth
#
# CONFIG_BT_ENABLED is not set
# end of Bluetooth
#
# CoAP Configuration
#
CONFIG_COAP_MBEDTLS_PSK=y
# CONFIG_COAP_MBEDTLS_PKI is not set
# CONFIG_COAP_MBEDTLS_DEBUG is not set
CONFIG_COAP_LOG_DEFAULT_LEVEL=0
# end of CoAP Configuration
#
# Driver configurations
@ -348,7 +361,7 @@ CONFIG_ETH_DMA_RX_BUFFER_NUM=10
CONFIG_ETH_DMA_TX_BUFFER_NUM=10
CONFIG_ETH_USE_SPI_ETHERNET=y
# CONFIG_ETH_SPI_ETHERNET_DM9051 is not set
CONFIG_ETH_SPI_ETHERNET_W5500=y
# CONFIG_ETH_SPI_ETHERNET_W5500 is not set
# CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL is not set
# CONFIG_ETH_USE_OPENETH is not set
# end of Ethernet
@ -416,10 +429,11 @@ CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4
#
# Sleep Config
#
CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
# CONFIG_ESP_SLEEP_POWER_DOWN_FLASH is not set
CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
# CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set
# CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND is not set
CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
# CONFIG_ESP_SLEEP_MSPI_NEED_ALL_IO_PU is not set
# end of Sleep Config
#
@ -753,7 +767,9 @@ CONFIG_LWIP_SO_REUSE_RXTOALL=y
# CONFIG_LWIP_SO_RCVBUF is not set
# CONFIG_LWIP_NETBUF_RECVINFO is not set
CONFIG_LWIP_IP4_FRAG=y
CONFIG_LWIP_IP6_FRAG=y
# CONFIG_LWIP_IP4_REASSEMBLY is not set
# CONFIG_LWIP_IP6_REASSEMBLY is not set
# CONFIG_LWIP_IP_FORWARD is not set
# CONFIG_LWIP_STATS is not set
# CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set
@ -775,7 +791,10 @@ CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
# end of DHCP server
# CONFIG_LWIP_AUTOIP is not set
# CONFIG_LWIP_IPV6 is not set
CONFIG_LWIP_IPV6=y
# CONFIG_LWIP_IPV6_AUTOCONFIG is not set
CONFIG_LWIP_IPV6_NUM_ADDRESSES=3
# CONFIG_LWIP_IPV6_FORWARD is not set
# CONFIG_LWIP_NETIF_STATUS_CALLBACK is not set
CONFIG_LWIP_NETIF_LOOPBACK=y
CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
@ -824,14 +843,9 @@ CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
# CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set
# CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1 is not set
CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
CONFIG_LWIP_PPP_SUPPORT=y
# CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT is not set
# CONFIG_LWIP_PPP_PAP_SUPPORT is not set
CONFIG_LWIP_PPP_CHAP_SUPPORT=y
# CONFIG_LWIP_PPP_MSCHAP_SUPPORT is not set
# CONFIG_LWIP_PPP_MPPE_SUPPORT is not set
# CONFIG_LWIP_ENABLE_LCP_ECHO is not set
# CONFIG_LWIP_PPP_DEBUG_ON is not set
# CONFIG_LWIP_PPP_SUPPORT is not set
CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
# CONFIG_LWIP_SLIP_SUPPORT is not set
#
@ -864,6 +878,12 @@ CONFIG_LWIP_ESP_LWIP_ASSERT=y
# CONFIG_LWIP_HOOK_TCP_ISN_NONE is not set
CONFIG_LWIP_HOOK_TCP_ISN_DEFAULT=y
# CONFIG_LWIP_HOOK_TCP_ISN_CUSTOM is not set
CONFIG_LWIP_HOOK_IP6_ROUTE_NONE=y
# CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT is not set
# CONFIG_LWIP_HOOK_IP6_ROUTE_CUSTOM is not set
CONFIG_LWIP_HOOK_ND6_GET_GW_NONE=y
# CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT is not set
# CONFIG_LWIP_HOOK_ND6_GET_GW_CUSTOM is not set
CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_NONE=y
# CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT is not set
# CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_CUSTOM is not set
@ -1203,7 +1223,7 @@ CONFIG_WL_SECTOR_SIZE=4096
#
CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
CONFIG_WIFI_PROV_BLE_FORCE_ENCRYPTION=y
# CONFIG_WIFI_PROV_BLE_FORCE_ENCRYPTION is not set
# end of Wi-Fi Provisioning Manager
#
@ -1254,12 +1274,14 @@ CONFIG_TTN_PROVISION_UART_NUM=0
#
# WebGUIApp
#
CONFIG_GPIO_RANGE_MIN=0
CONFIG_GPIO_RANGE_MAX=36
CONFIG_DEVICE_MODEL_NAME="DEVICE MODEL NAME"
CONFIG_WEBGUIAPP_HOSTNAME="DEVICE_HOSTNAME"
CONFIG_WEBGUIAPP_USERNAME="user"
CONFIG_WEBGUIAPP_USERPASS="password"
CONFIG_MAIN_FUNCTIONAL_BUTTON_GPIO=15
# CONFIG_DEBUG_MODE_ENABLE is not set
CONFIG_DEBUG_MODE_ENABLE=y
# CONFIG_RESET_MODE_ENABLE is not set
#
@ -1285,9 +1307,9 @@ CONFIG_WEBGUIAPP_SNTP_TIMEZONE=2
#
CONFIG_WEBGUIAPP_SPI_ENABLE=y
CONFIG_SPI_HOST=1
CONFIG_SPI_SCLK_GPIO=19
CONFIG_SPI_MOSI_GPIO=5
CONFIG_SPI_MISO_GPIO=18
CONFIG_SPI_SCLK_GPIO=18
CONFIG_SPI_MOSI_GPIO=23
CONFIG_SPI_MISO_GPIO=19
# end of SPI settings
#
@ -1338,12 +1360,13 @@ CONFIG_WEBGUIAPP_WIFI_GATEWAY_STA="192.168.150.1"
# MQTT settings
#
CONFIG_WEBGUIAPP_MQTT_ENABLE=y
CONFIG_WEBGUIAPP_MQTT_CLIENTS_NUM=1
CONFIG_WEBGUIAPP_MQTT_CLIENTS_NUM=2
CONFIG_WEBGUIAPP_MQTT_ON=y
CONFIG_WEBGUIAPP_MQTT_MAX_TOPIC_LENGTH=64
CONFIG_WEBGUIAPP_MQTT_MAX_TOPIC_LENGTH=128
CONFIG_WEBGUIAPP_MQTT_SERVER_URL="myfirstmqttserver.com"
CONFIG_WEBGUIAPP_MQTT_SERVER_PORT=1883
CONFIG_WEBGUIAPP_MQTT_CLIENT_ID_1="DEVID1"
CONFIG_WEBGUIAPP_MQTT_CLIENT_ID_1="DEV1"
CONFIG_WEBGUIAPP_MQTT_CLIENT_ID_2="DEV2"
CONFIG_WEBGUIAPP_MQTT_SYSTEM_NAME="SYSTEMNAME"
CONFIG_WEBGUIAPP_MQTT_GROUP_NAME="GROUPNAME"
CONFIG_WEBGUIAPP_MQTT_USERNAME="username"
@ -1447,7 +1470,7 @@ CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
# CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set
CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
CONFIG_ESP_SYSTEM_PD_FLASH=y
# CONFIG_ESP_SYSTEM_PD_FLASH is not set
# CONFIG_ESP32C3_LIGHTSLEEP_GPIO_RESET_WORKAROUND is not set
CONFIG_IPC_TASK_STACK_SIZE=1536
CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
@ -1521,13 +1544,7 @@ CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
# CONFIG_TCPIP_TASK_AFFINITY_CPU0 is not set
# CONFIG_TCPIP_TASK_AFFINITY_CPU1 is not set
CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF
CONFIG_PPP_SUPPORT=y
# CONFIG_PPP_NOTIFY_PHASE_SUPPORT is not set
# CONFIG_PPP_PAP_SUPPORT is not set
CONFIG_PPP_CHAP_SUPPORT=y
# CONFIG_PPP_MSCHAP_SUPPORT is not set
# CONFIG_PPP_MPPE_SUPPORT is not set
# CONFIG_PPP_DEBUG_ON is not set
# CONFIG_PPP_SUPPORT is not set
CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
CONFIG_ESP32_PTHREAD_STACK_MIN=768