From 93dbaa516a6da0776fc6f3c8e7fe96822cda32f3 Mon Sep 17 00:00:00 2001 From: Christian Herzog Date: Thu, 5 Mar 2020 20:50:36 +0100 Subject: [PATCH] start with syslog --- components/wifi-manager/code.js | 31 +++++--- components/wifi-manager/index.html | 114 +++++++++++------------------ components/wifi-manager/style.css | 18 +++-- 3 files changed, 76 insertions(+), 87 deletions(-) diff --git a/components/wifi-manager/code.js b/components/wifi-manager/code.js index 139c8b2f..17093d99 100644 --- a/components/wifi-manager/code.js +++ b/components/wifi-manager/code.js @@ -40,7 +40,6 @@ var commandHeader = 'squeezelite -b 500:2000 -d all=info '; var pname, ver, otapct, otadsc; var blockAjax = false; var blockFlashButton = false; -var lastMsg = ''; var apList = null; var selectedSSID = ""; @@ -655,11 +654,11 @@ function refreshAPHTML(data){ } function getMessages() { - $.getJSON("/messages.json", function(data) { + $.getJSON("/messages.json?1", function(data) { data.forEach(function(msg) { var msg_age = msg["current_time"] - msg["sent_time"]; - var msg_time = new Date( ); - msg_time.setTime( msg_time .getTime() - msg_age ); + var msg_time = new Date(); + msg_time.setTime( msg_time.getTime() - msg_age ); switch (msg["class"]) { case "MESSAGING_CLASS_OTA": //message: "{"ota_dsc":"Erasing flash complete","ota_pct":0}" @@ -681,16 +680,22 @@ function getMessages() { case "MESSAGING_CLASS_STATS": // for task states, check structure : task_state_t var stats_data = JSON.parse(msg["message"]); - console.log(msg_time + " - Number of tasks on the ESP32: " + stats_data["ntasks"]); + console.log(msg_time.toLocaleString() + " - Number of tasks on the ESP32: " + stats_data["ntasks"]); var stats_tasks = stats_data["tasks"]; - console.log(msg_time + '\tname' + '\tcpu' + '\tstate'+ '\tminstk'+ '\tbprio'+ '\tcprio'+ '\tnum' ); + console.log(msg_time.toLocaleString() + '\tname' + '\tcpu' + '\tstate'+ '\tminstk'+ '\tbprio'+ '\tcprio'+ '\tnum' ); stats_tasks.forEach(function(task) { - console.log(msg_time + '\t' + task["nme"] + '\t'+ task["cpu"] + '\t'+ task_state_t[task["st"]]+ '\t'+ task["minstk"]+ '\t'+ task["bprio"]+ '\t'+ task["cprio"]+ '\t'+ task["num"]); + console.log(msg_time.toLocaleString() + '\t' + task["nme"] + '\t'+ task["cpu"] + '\t'+ task_state_t[task["st"]]+ '\t'+ task["minstk"]+ '\t'+ task["bprio"]+ '\t'+ task["cprio"]+ '\t'+ task["num"]); }); break; case "MESSAGING_CLASS_SYSTEM": showMessage(msg["message"], msg["type"],msg_age); - lastMsg = msg; + + $("#syslogTable").append( + ""+ + ""+msg_time.toLocaleString()+""+ + ""+msg["message"]+""+ + "" + ); break; default: break; @@ -703,6 +708,14 @@ function getMessages() { console.log(thrownError); if (thrownError != '') showMessage(thrownError, 'MESSAGING_ERROR'); }); + /* + Minstk is minimum stack space left +Bprio is base priority +cprio is current priority +nme is name +st is task state. I provided a "typedef" that you can use to convert to text +cpu is cpu percent used +*/ } function checkStatus(){ RepeatCheckStatusInterval(); @@ -924,7 +937,6 @@ function getConfig() { function showMessage(message, severity, age=0) { - if (severity == 'MESSAGING_INFO') { $('#message').css('background', '#6af'); } else if (severity == 'MESSAGING_WARNING') { @@ -935,7 +947,6 @@ function showMessage(message, severity, age=0) { $('#message').css('background', '#f00'); } - $('#message').html(message); $("#content").fadeTo("slow", 0.3, function() { $("#message").show(500).delay(5000).hide(500, function() { diff --git a/components/wifi-manager/index.html b/components/wifi-manager/index.html index c798b48e..445bd99a 100644 --- a/components/wifi-manager/index.html +++ b/components/wifi-manager/index.html @@ -67,7 +67,7 @@ Firmware
  • - GPIO + Syslog
  • NVS editor @@ -190,7 +190,7 @@ - +
    @@ -240,72 +240,7 @@

    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - -
    SignalI2S pinSPDIF pin
    Bit clock - - - -
    Word select - - - -
    Data - - - -
    -
    - -
    -
    - -
    - - - - - - - - - -
    KeyValue
    -
    -
    -
    - -
    -
    - -
    -
    +
    @@ -354,11 +289,48 @@
    - + + +
    + + + + + + + + + +
    TimestampMessage
    +
    + +
    +
    + +
    + + + + + + + + + +
    KeyValue
    +
    +
    +
    + +
    +
    + +
    +
    -

    squeezelite-esp32, © 2019, philippe44, sle118, daduke
    Licensed under the GPL

    +

    squeezelite-esp32, © 2020, philippe44, sle118, daduke
    Licensed under the GPL

    This app would not be possible without the following libraries:

    @@ -377,7 +349,7 @@
    -
    +
    diff --git a/components/wifi-manager/style.css b/components/wifi-manager/style.css index 1e4ea057..bd2a170a 100644 --- a/components/wifi-manager/style.css +++ b/components/wifi-manager/style.css @@ -212,12 +212,6 @@ input[type='text'], input[type='password'], textarea { padding: 4px; } -input.gpio { - width: 2em; - color: #000; - height: 1.8em; -} - .custom-switch { margin-left: 8px; } @@ -273,6 +267,18 @@ textarea#autoexec1, textarea#fwurl, div#upload { width: 80%; } +table tr.MESSAGING_INFO { + background: #123; +} + +table tr.MESSAGING_WARNING { + background: #330; +} + +table tr.MESSAGING_ERROR { + background: #300; +} + input, textarea { border-radius: 3px; border: 1px solid transparent;