diff --git a/HTML/adapters.html b/HTML/adapters.html index 9543297..89a77ef 100644 --- a/HTML/adapters.html +++ b/HTML/adapters.html @@ -10,7 +10,9 @@ ~name~ - +
@@ -22,14 +24,14 @@ @@ -37,7 +39,7 @@

+ PrintSaveBtn('eth'); @@ -116,7 +118,9 @@
+ PrintSaveBtn('wifi'); + + @@ -192,6 +196,8 @@ console.log('stop wifi scan'); GetDataFile("/api/wifiscan.json", function(data){PrintNetworks(data);}); } + function StartWiFi(){PostData('wifistart=prs', 'adapters.html',false ,false, false);} + function StopWiFi(){PostData('wifistop=prs', 'adapters.html',false ,false, false);} showMenu('header-toggle','navbar'); diff --git a/HTML/res/appstyles.css b/HTML/res/appstyles.css index 06b8b9d..7233ef0 100644 --- a/HTML/res/appstyles.css +++ b/HTML/res/appstyles.css @@ -77,7 +77,7 @@ input[type="radio"] { margin-top: -1px; vertical-align: middle;} .cntr { margin:auto; font: .85rem consolas, monospace;} - + .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;} diff --git a/HTML/res/main.js b/HTML/res/main.js index 3d65e9d..7c29fa2 100644 --- a/HTML/res/main.js +++ b/HTML/res/main.js @@ -1,143 +1,161 @@ -function PostData(data,page,conf,alrt,reld) { -if(conf){if (!confirm(conf)) return;} -var xhr = new XMLHttpRequest(); -xhr.open('POST',page, true); -xhr.timeout = 5000; -xhr.send(data); -xhr.onreadystatechange = function() { -if (xhr.readyState != 4) return; -if (Number(xhr.status) >= 400) {alert(xhr.status+': '+xhr.statusText);} -else {if(reld)location.reload(); -if(alrt) alert(alrt); -}}} - -function GetDataFile(file, callback) { -var xhr = new XMLHttpRequest(); -xhr.overrideMimeType("application/json"); -xhr.open("GET", file, true); -xhr.onreadystatechange = function() {if (xhr.readyState === 4 && xhr.status == "200") {callback(xhr.responseText);}} -xhr.timeout = 5000; -xhr.send(null); -} - -function configIPBoxes() { -e = document.forms.conf; -var ap = document.getElementsByName('netm'); -st = e.dhcp.checked; -function apmode(m){ -e.wfiap.disabled = m; -e.wfpap.disabled = m; -e.ipaap.disabled = m; -} -function clnmode(m){ -e.wfi.disabled = m; -e.wfp.disabled = m; -e.ipa.disabled = m; -e.mas.disabled = m; -e.gte.disabled = m; -} -if(ap[0].checked){ -apmode(true); -clnmode(false); -e.ipa.disabled = st; -e.mas.disabled = st; -e.gte.disabled = st; -} -if(ap[1].checked){ -apmode(false); -clnmode(true); -} -} - -function configIPBoxes2() { -e = document.forms.conf; -st2 = e.tsen.checked; -e.tsr.disabled = !st2; -st3 = e.clen.checked; -e.cld.disabled = !st3; -e.idd.disabled = !st3; -e.top.disabled = !st3; -e.prt.disabled = !st3; -e.clnm.disabled = !st3; -e.clps.disabled = !st3; -e.ssen.disabled = !st3; -} - -function configIPBoxesOCPP() { -e = document.forms.conf; -} - -function UnixToStr(t, base, sec) -{ -if(t.lenth < 10) t = '000000000'; -var d; -if (base == 16) d = new Date(parseInt(t,16)*1000); -else d = new Date(parseInt(t,10)*1000); -var dd = d.getDate(); if (dd < 10) dd = '0' + dd; -var mm = d.getMonth() + 1; if (mm < 10) mm = '0' + mm; -var yy = d.getFullYear() % 100; if (yy < 10) yy = '0' + yy; -var h = d.getHours(); if (h < 10) h = '0' + h; -var m = d.getMinutes(); if (m < 10) m = '0' + m; -var s = d.getSeconds(); if (s < 10) s = '0' + s; -d=yy+'/'+mm+'/'+dd+' '+h+':'+m; -if(sec==1) d+=':'+s; -return d; -} - -function FloatToString(f) -{ -var buffer = new ArrayBuffer(4); -var bytes = new Uint8Array(buffer); -var doubles = new Float32Array(buffer); -bytes[3] = '0x'+f.substr(6,2); -bytes[2] = '0x'+f.substr(4,2); -bytes[1] = '0x'+f.substr(2,2); -bytes[0] = '0x'+f.substr(0,2); -return doubles[0]; -} - -function sendtime() { -var ut = Date.parse(new Date( Date.parse(document.getElementById('curdt').value)))/1000; -var xhr = new XMLHttpRequest(); -xhr.open('POST', 'index23.html', true); -var body = 'timenow=' + ut; -xhr.send(body); -xhr.onreadystatechange = function() { -if (xhr.readyState != 4) return; -if (xhr.status != 200) { -alert(xhr.status + ': ' + xhr.statusText); -} else { -alert('Time changed'); -} -} -} - -function Pst(Rqv,Pag,Conf){ -if (confirm(Conf)) { -var xhr = new XMLHttpRequest(); -xhr.open('POST',Pag, true); -xhr.send(Rqv); -xhr.onreadystatechange = function() { -if (xhr.readyState != 4) return; -if (xhr.status != 200) { -alert(xhr.status + ': ' + xhr.statusText); -} else { -location.reload(); -} -} -} -} -/*==================== SHOW NAVBAR ====================*/ -const showMenu = (headerToggle, navbarId) =>{ - const toggleBtn = document.getElementById(headerToggle), - nav = document.getElementById(navbarId) - // Validate that variables exist - if(headerToggle && navbarId){ - toggleBtn.addEventListener('click', ()=>{ - // We add the show-menu class to the div tag with the nav__menu class - nav.classList.toggle('show-menu') - // change icon - toggleBtn.classList.toggle('bx-x') - }) - } -} +function PostData(data,page,conf,alrt,reld) { +if(conf){if (!confirm(conf)) return;} +var xhr = new XMLHttpRequest(); +xhr.open('POST',page, true); +xhr.timeout = 5000; +xhr.send(data); +xhr.onreadystatechange = function() { +if (xhr.readyState != 4) return; +if (Number(xhr.status) >= 400) {alert(xhr.status+': '+xhr.statusText);} +else {if(reld)location.reload(); +if(alrt) alert(alrt); +}}} + +function PostJSONData(data,page,conf,alrt,reld) { +if(conf){if (!confirm(conf)) return;} +var xhr = new XMLHttpRequest(); +xhr.open('POST',page, true); +xhr.setRequestHeader('Content-type', 'application/json'); +xhr.timeout = 5000; +xhr.send(data); +xhr.onreadystatechange = function() { +if (xhr.readyState != 4) return; +if (Number(xhr.status) >= 200) {alert(xhr.status+': '+xhr.statusText+'\n'+xhr.responseText);} +else {if(reld)location.reload(); +if(alrt) alert(alrt); +}}} + +function GetDataFile(file, callback) { +var xhr = new XMLHttpRequest(); +xhr.overrideMimeType("application/json"); +xhr.open("GET", file, true); +xhr.onreadystatechange = function() {if (xhr.readyState === 4 && xhr.status == "200") {callback(xhr.responseText);}} +xhr.timeout = 5000; +xhr.send(null); +} + +function configIPBoxes() { +e = document.forms.conf; +var ap = document.getElementsByName('netm'); +st = e.dhcp.checked; +function apmode(m){ +e.wfiap.disabled = m; +e.wfpap.disabled = m; +e.ipaap.disabled = m; +} +function clnmode(m){ +e.wfi.disabled = m; +e.wfp.disabled = m; +e.ipa.disabled = m; +e.mas.disabled = m; +e.gte.disabled = m; +} +if(ap[0].checked){ +apmode(true); +clnmode(false); +e.ipa.disabled = st; +e.mas.disabled = st; +e.gte.disabled = st; +} +if(ap[1].checked){ +apmode(false); +clnmode(true); +} +} + +function configIPBoxes2() { +e = document.forms.conf; +st2 = e.tsen.checked; +e.tsr.disabled = !st2; +st3 = e.clen.checked; +e.cld.disabled = !st3; +e.idd.disabled = !st3; +e.top.disabled = !st3; +e.prt.disabled = !st3; +e.clnm.disabled = !st3; +e.clps.disabled = !st3; +e.ssen.disabled = !st3; +} + +function configIPBoxesOCPP() { +e = document.forms.conf; +} + +function UnixToStr(t, base, sec) +{ +if(t.lenth < 10) t = '000000000'; +var d; +if (base == 16) d = new Date(parseInt(t,16)*1000); +else d = new Date(parseInt(t,10)*1000); +var dd = d.getDate(); if (dd < 10) dd = '0' + dd; +var mm = d.getMonth() + 1; if (mm < 10) mm = '0' + mm; +var yy = d.getFullYear() % 100; if (yy < 10) yy = '0' + yy; +var h = d.getHours(); if (h < 10) h = '0' + h; +var m = d.getMinutes(); if (m < 10) m = '0' + m; +var s = d.getSeconds(); if (s < 10) s = '0' + s; +d=yy+'/'+mm+'/'+dd+' '+h+':'+m; +if(sec==1) d+=':'+s; +return d; +} + +function FloatToString(f) +{ +var buffer = new ArrayBuffer(4); +var bytes = new Uint8Array(buffer); +var doubles = new Float32Array(buffer); +bytes[3] = '0x'+f.substr(6,2); +bytes[2] = '0x'+f.substr(4,2); +bytes[1] = '0x'+f.substr(2,2); +bytes[0] = '0x'+f.substr(0,2); +return doubles[0]; +} + +function sendtime() { +var ut = Date.parse(new Date( Date.parse(document.getElementById('curdt').value)))/1000; +var xhr = new XMLHttpRequest(); +xhr.open('POST', 'index23.html', true); +var body = 'timenow=' + ut; +xhr.send(body); +xhr.onreadystatechange = function() { +if (xhr.readyState != 4) return; +if (xhr.status != 200) { +alert(xhr.status + ': ' + xhr.statusText); +} else { +alert('Time changed'); +} +} +} + +function Pst(Rqv,Pag,Conf){ +if (confirm(Conf)) { +var xhr = new XMLHttpRequest(); +xhr.open('POST',Pag, true); +xhr.send(Rqv); +xhr.onreadystatechange = function() { +if (xhr.readyState != 4) return; +if (xhr.status != 200) { +alert(xhr.status + ': ' + xhr.statusText); +} else { +location.reload(); +} +} +} +} + + + + +/*==================== SHOW NAVBAR ====================*/ +const showMenu = (headerToggle, navbarId) =>{ + const toggleBtn = document.getElementById(headerToggle), + nav = document.getElementById(navbarId) + // Validate that variables exist + if(headerToggle && navbarId){ + toggleBtn.addEventListener('click', ()=>{ + // We add the show-menu class to the div tag with the nav__menu class + nav.classList.toggle('show-menu') + // change icon + toggleBtn.classList.toggle('bx-x') + }) + } +} diff --git a/HTML/res/res.js b/HTML/res/res.js index 586bd98..2e7d8b3 100644 --- a/HTML/res/res.js +++ b/HTML/res/res.js @@ -1,103 +1,102 @@ -var hedmen = ` -
-
- LOGO - -
- -
-
-
- -`; - -function PageSurround() -{document.write(hedmen);} - -function PrintIPInput(title,name,value){document.write(""+title+"");} -function PrintMACInput(title,name,value){document.write(""+title+"");} -function PrintTextInput(title,name,value,min,max){document.write(""+title+"");} -function PrintTextInputID(title,id,value,min,max){document.write(""+title+"");} -function PrintHexInput(title,name,value,min,max){document.write(""+title+"");} -function PrintTextInputNoReg(title,name,value,min,max){document.write(""+title+"");} -function PrintLabel(title,value){document.write(""+title+""+value+"");} -function PrintSpanLabel(title,idx){document.write(""+title+"?");} -function PrintCheckBox(title,name,checked,action){document.write(""+title+"");} -function PrintSwitch(title,name,checked,action){document.write(""+title+"");} -function PrintInt(title,name,value,min,max){document.write(""+title+"");} -function PrintIntId(title,id,value,min,max){document.write(""+title+"");} -function PrintSep(){document.write("");} -function PrintSaveBtn(form){document.write("");} -function PrintApplyBtn(form){document.write("");} -function PrintSaveFail(isfail){document.write("

Wrong data format!


");} +var hedmen = ` +
+
+ LOGO + +
+ +
+
+
+ +`; + +function PageSurround() +{document.write(hedmen);} + +function PrintIPInput(title,name,value){document.write(""+title+"");} +function PrintMACInput(title,name,value){document.write(""+title+"");} +function PrintTextInput(title,name,value,min,max){document.write(""+title+"");} +function PrintTextInputID(title,id,value,min,max){document.write(""+title+"");} +function PrintHexInput(title,name,value,min,max){document.write(""+title+"");} +function PrintTextInputNoReg(title,name,value,min,max){document.write(""+title+"");} +function PrintLabel(title,value){document.write(""+title+""+value+"");} +function PrintSpanLabel(title,idx){document.write(""+title+"?");} +function PrintCheckBox(title,name,checked,action){document.write(""+title+"");} +function PrintSwitch(title,name,checked,action){document.write(""+title+"");} +function PrintInt(title,name,value,min,max){document.write(""+title+"");} +function PrintIntId(title,id,value,min,max){document.write(""+title+"");} +function PrintSep(){document.write("");} +function PrintSaveBtn(form){document.write("");} +function PrintApplyBtn(form){document.write("");} +function PrintSaveFail(isfail){document.write("

Wrong data format!


");} diff --git a/HTML/system.html b/HTML/system.html index 9d742e7..317c19a 100644 --- a/HTML/system.html +++ b/HTML/system.html @@ -82,6 +82,7 @@ Free RAM:? Minimal free RAM :? + @@ -112,6 +113,9 @@ function fwupd() { PostData("upd=prs", "system.html",false ,false, false); } + function getrtos(){ + PostJSONData("rtos=prs", "system.html",false ,false, false); + } showMenu('header-toggle','navbar'); diff --git a/components/webguiapp b/components/webguiapp index d307a36..32c90af 160000 --- a/components/webguiapp +++ b/components/webguiapp @@ -1 +1 @@ -Subproject commit d307a365a95771ed45edd945697cada343d639d6 +Subproject commit 32c90af2c182453caad7003c280e5223cadb5b87 diff --git a/sdkconfig b/sdkconfig index 7801e51..49e595f 100644 --- a/sdkconfig +++ b/sdkconfig @@ -689,8 +689,12 @@ CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 -# CONFIG_FREERTOS_USE_TRACE_FACILITY is not set -# CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set +CONFIG_FREERTOS_USE_TRACE_FACILITY=y +CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=y +# CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID is not set +CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y +CONFIG_FREERTOS_RUN_TIME_STATS_USING_ESP_TIMER=y +# CONFIG_FREERTOS_RUN_TIME_STATS_USING_CPU_CLK is not set CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y # CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set diff --git a/sdkconfig.old b/sdkconfig.old index 9bedc91..7801e51 100644 --- a/sdkconfig.old +++ b/sdkconfig.old @@ -225,6 +225,7 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST is not set # CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID is not set # CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT is not set +# CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM is not set # end of TWAI configuration # @@ -280,9 +281,16 @@ CONFIG_ESP_TLS_USING_MBEDTLS=y # CONFIG_ESP32_REV_MIN_0=y # CONFIG_ESP32_REV_MIN_1 is not set +# CONFIG_ESP32_REV_MIN_1_1 is not set # CONFIG_ESP32_REV_MIN_2 is not set # CONFIG_ESP32_REV_MIN_3 is not set +# CONFIG_ESP32_REV_MIN_3_1 is not set CONFIG_ESP32_REV_MIN=0 +CONFIG_ESP32_REV_MIN_FULL=0 +CONFIG_ESP_REV_MIN_FULL=0 +CONFIG_ESP32_REV_MAX_FULL_STR_OPT=y +CONFIG_ESP32_REV_MAX_FULL=399 +CONFIG_ESP_REV_MAX_FULL=399 CONFIG_ESP32_DPORT_WORKAROUND=y # CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set CONFIG_ESP32_DEFAULT_CPU_FREQ_160=y @@ -417,6 +425,7 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_ETH=y # CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_TWO is not set CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4 +# CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR is not set # end of MAC Config # @@ -470,7 +479,10 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y # CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP_PHY_MAX_TX_POWER=20 -CONFIG_ESP_PHY_REDUCE_TX_POWER=y +CONFIG_ESP_PHY_RF_CAL_PARTIAL=y +# CONFIG_ESP_PHY_RF_CAL_NONE is not set +# CONFIG_ESP_PHY_RF_CAL_FULL is not set +CONFIG_ESP_PHY_CALIBRATION_MODE=0 # end of PHY # @@ -748,6 +760,7 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y CONFIG_LWIP_LOCAL_HOSTNAME="espressif" # CONFIG_LWIP_NETIF_API is not set # CONFIG_LWIP_TCPIP_CORE_LOCKING is not set +# CONFIG_LWIP_CHECK_THREAD_SAFETY is not set CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y # CONFIG_LWIP_L2_TO_L3_COPY is not set # CONFIG_LWIP_IRAM_OPTIMIZATION is not set @@ -768,12 +781,15 @@ CONFIG_LWIP_IP6_FRAG=y # CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set CONFIG_LWIP_ESP_GRATUITOUS_ARP=y CONFIG_LWIP_GARP_TMR_INTERVAL=60 +CONFIG_LWIP_ESP_MLDV6_REPORT=y +CONFIG_LWIP_MLDV6_TMR_INTERVAL=40 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y # CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID=y # CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set CONFIG_LWIP_DHCP_OPTIONS_LEN=68 +CONFIG_LWIP_DHCP_COARSE_TIMER_SECS=1 # # DHCP server @@ -1187,6 +1203,11 @@ CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y # CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL is not set # end of Unity unit testing library +# +# Root Hub configuration +# +# end of Root Hub configuration + # # Virtual file system # @@ -1268,7 +1289,7 @@ CONFIG_TTN_PROVISION_UART_NUM=0 # WebGUIApp # CONFIG_GPIO_RANGE_MIN=0 -CONFIG_GPIO_RANGE_MAX=36 +CONFIG_GPIO_RANGE_MAX=39 CONFIG_DEVICE_MODEL_NAME="DEVICE MODEL NAME" CONFIG_WEBGUIAPP_HOSTNAME="DEVICE_HOSTNAME" CONFIG_WEBGUIAPP_USERNAME="user" @@ -1282,16 +1303,16 @@ CONFIG_MAIN_FUNCTIONAL_BUTTON_GPIO=-1 # CONFIG_WEBGUIAPP_DEFAULT_COLOR_SCHEME=1 CONFIG_WEBGUIAPP_ACCENT_COLOR="#dba617" -CONFIG_WEBGUIAPP_SCH1_BACKGROUNG_COLOR="#1D2327" -CONFIG_WEBGUIAPP_SCH1_PANEL_COLOR="#2c3338" -CONFIG_WEBGUIAPP_SCH1_MENU_COLOR="#3c434a" -CONFIG_WEBGUIAPP_SCH1_TEXT_COLOR="#F0F0F0" -CONFIG_WEBGUIAPP_SCH1_BORDER_COLOR="#ffffff66" -CONFIG_WEBGUIAPP_SCH2_BACKGROUNG_COLOR="#e0e0dd" -CONFIG_WEBGUIAPP_SCH2_PANEL_COLOR="#f0f0ed" -CONFIG_WEBGUIAPP_SCH2_MENU_COLOR="#ededea" -CONFIG_WEBGUIAPP_SCH2_TEXT_COLOR="#404040" -CONFIG_WEBGUIAPP_SCH2_BORDER_COLOR="#00000066" +CONFIG_WEBGUIAPP_SCH1_BACKGROUNG_COLOR="#e0e0dd" +CONFIG_WEBGUIAPP_SCH1_PANEL_COLOR="#f0f0ed" +CONFIG_WEBGUIAPP_SCH1_MENU_COLOR="#ededea" +CONFIG_WEBGUIAPP_SCH1_TEXT_COLOR="#404040" +CONFIG_WEBGUIAPP_SCH1_BORDER_COLOR="#00000066" +CONFIG_WEBGUIAPP_SCH2_BACKGROUNG_COLOR="#1D2327" +CONFIG_WEBGUIAPP_SCH2_PANEL_COLOR="#2c3338" +CONFIG_WEBGUIAPP_SCH2_MENU_COLOR="#3c434a" +CONFIG_WEBGUIAPP_SCH2_TEXT_COLOR="#F0F0F0" +CONFIG_WEBGUIAPP_SCH2_BORDER_COLOR="#ffffff66" # end of Web UI settings # @@ -1497,7 +1518,6 @@ CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y # CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP32_PHY_MAX_TX_POWER=20 -CONFIG_ESP32_REDUCE_PHY_TX_POWER=y # CONFIG_ESP32S2_PANIC_PRINT_HALT is not set CONFIG_ESP32S2_PANIC_PRINT_REBOOT=y # CONFIG_ESP32S2_PANIC_SILENT_REBOOT is not set