20190718_jeffrey - silenceuncrio/diary GitHub Wiki

0915

M330 已經有 release/v0.05 branch

base on 這個 branch 再加上 ariel 的需求 - health check

  • Vendor/Products = GENERIC/1_GENERIC_WIFI

M300 之前有做過相關修改

不過當時該功能分散在兩個 web page

  • WAN > Ethernet
  • LTE > LTE Config

目前 ariel 打算在 M330 將該功能整併變成獨立一個 page

  • WAN > Health Check

1500

M330 - release/v0.05 - add 'WAN > Health Check' page

commit 68242677535db821e6babe87a0614c1e98508928
Refs: [release/v0.05], {origin/release/v0.05}
Author: jeffrey <[email protected]>
Date:   Thu Jul 18 14:59:48 2019 +0800

    add 'WAN > Health Check' page
    - remove 'Ethernet Ping Health' tab from 'WAN > Ethernet' page
    - remove 'LTE Ping Health' fieldset from 'LTE > LTE Config' page

 proscend/prosrc/webcgi/connmgr.c                   |  16 +++
 proscend/prosrc/www/app/feature/lteConfig.html     |  68 ---------
 proscend/prosrc/www/app/feature/wanEthernet.html   | 112 ---------------
 proscend/prosrc/www/app/feature/wanEthernet.js     |  33 +----
 .../prosrc/www/app/feature/wan_health_check.html   | 160 +++++++++++++++++++++
 .../prosrc/www/app/feature/wan_health_check.js     |  56 ++++++++
 proscend/prosrc/www/app/locale-en.json             |  32 +++++
 proscend/prosrc/www/app/locale-fr.json             |  32 +++++
 proscend/prosrc/www/app/locale-zh-tw.json          |  32 +++++
 proscend/prosrc/www/src/index.html.src             |   1 +
 proscend/prosrc/www/src/menu.html.src              |   1 +
 11 files changed, 332 insertions(+), 211 deletions(-)

1525

需要用 compile option PROSRC_ETH_PING_HEALTH 來包一下 'WAN > Health Check' 這個功能

diff --git a/proscend/prosrc/www/src/menu.html.src b/proscend/prosrc/www/src/menu.html.src
index 1f7abef..b0111a9 100644
--- a/proscend/prosrc/www/src/menu.html.src
+++ b/proscend/prosrc/www/src/menu.html.src
@@ -66,7 +66,9 @@
 #if defined(PROSRC_DNS)
     <a href="#dnsDhcp6c" class="list-group-item">{{ 'MENU_DNS_DHCP6C' | translate }}</a>
 #endif
+#if defined(PROSRC_ETH_PING_HEALTH)
     <a href="#wan_health_check" class="list-group-item">{{ 'MENU_WAN_HEALTH_CHECK' | translate }}</a>
+#endif
   </ul>
   </div>
   </div>

簡單在 menu.html.src 裡打包即可


M330 - release/v0.05 - use compile option 'PROSRC_DNS' to compile in/out the 'WAN > Health Check' function

commit 9691386adf3fd5b6bd6c577c2275acfbe1f97bb0
Refs: [release/v0.05], {origin/release/v0.05}
Author: jeffrey <[email protected]>
Date:   Thu Jul 18 15:25:52 2019 +0800

    use compile option 'PROSRC_DNS' to compile in/out the 'WAN > Health Check' function

 proscend/prosrc/www/src/menu.html.src | 2 ++
 1 file changed, 2 insertions(+)

review 一下 online manual

先看 WAN > Ethernet

發現原本 online manual 就沒有提到 'Ethernet Ping Health'


再看 LTE > LTE Config

移除 LTE Ping Health 部分


加上 WAN > Health Check

manual.html.src 利用 compile option PROSRC_ETH_PING_HEALTH 決定是否顯示 WAN > Health Check

diff --git a/proscend/prosrc/www/src/manual.html.src b/proscend/prosrc/www/src/manual.html.src
index e8f958f..afd6223 100644
--- a/proscend/prosrc/www/src/manual.html.src
+++ b/proscend/prosrc/www/src/manual.html.src
@@ -61,6 +61,9 @@
 #include "manual/wan_priority.h.html"
 #include "manual/wan_ethernet.h.html"
 #include "manual/wan_ipv6_dns.h.html"
+#ifdef PROSRC_ETH_PING_HEALTH
+#include "manual/wan_health_check.h.html"
+#endif

sidebar.h.html 一樣利用 compile option PROSRC_ETH_PING_HEALTH 決定是否顯示 WAN > Health Check

diff --git a/proscend/prosrc/www/src/manual/sidebar.h.html b/proscend/prosrc/www/src/manual/sidebar.h.html
index fbed794..40acbc1 100644
--- a/proscend/prosrc/www/src/manual/sidebar.h.html
+++ b/proscend/prosrc/www/src/manual/sidebar.h.html
@@ -50,6 +50,9 @@
             <li><a href="#wan_priority">Priority</a></li>
             <li><a href="#wan_ethernet">Ethernet</a></li>
             <li><a href="#wan_ipv6_dns">IPv6 DNS</a></li>
+#ifdef PROSRC_ETH_PING_HEALTH
+            <li><a href="#wan_health_check">Health Check</a></li>
+#endif
           </ul>
         </li>

M330 - release/v0.05 - add the online manual for 'WAN > Health Check'

commit 7d19dc35c832560b473fc49e910ffc804706379c
Refs: [release/v0.05], {origin/release/v0.05}
Author: jeffrey <[email protected]>
Date:   Thu Jul 18 16:01:03 2019 +0800

    add the online manual for 'WAN > Health Check'
    - remove 'LTE Ping Health' part from 'LTE > LTE Config' chapter

    remove the debug infomation from 'WAN > Health Check' web page

 .../prosrc/www/app/feature/wan_health_check.html   |  2 -
 proscend/prosrc/www/src/manual.html.src            |  3 +
 .../prosrc/www/src/manual/lte_lte_config.h.html    | 38 -----------
 proscend/prosrc/www/src/manual/sidebar.h.html      |  3 +
 .../prosrc/www/src/manual/wan_health_check.h.html  | 77 ++++++++++++++++++++++
 5 files changed, 83 insertions(+), 40 deletions(-)

M330 - release/v0.05 - remove wording '(Ethernet > WAN WiFi > LTE)' from the hint at 'WAN > Health Check'

commit 08f7695fdf8f6b0cc8547dbd928894511e475d40
Refs: [release/v0.05], {origin/release/v0.05}
Author: jeffrey <[email protected]>
Date:   Thu Jul 18 16:23:24 2019 +0800

    remove wording '(Ethernet > WAN WiFi > LTE)' from the hint at 'WAN > Health Check
    - then we need no compile option to display whether the firmware has WiFi or not

 proscend/prosrc/www/app/locale-en.json    | 2 +-
 proscend/prosrc/www/app/locale-fr.json    | 2 +-
 proscend/prosrc/www/app/locale-zh-tw.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

1630

M330 - develop 上的 FOTA 可以先依據 wiki 來做 UI 了

記得 compile flag 要打開 - PROSRC_FOTAD


盤一下 工作狀態

  • M300
    • survey - Layer 2 Encapsulation over GRE (L2oGRE)
    • develop - wanst.apply() need the information about the dns_static.apply()
    • develop - offer CGI for batch upload used by openvpn
  • M330
    • develop - CLI - remove 'mgmt production'
    • develop - remove 'COM 2' option from 'COM Port' field at 'LTE > GPS Config' web page
    • develop - chmod the following scrips to 755
    • develop - remove 'COM Port' field at 'LTE > GPS Config' web page
    • develop - add 'LTE > USSD' web page
    • develop - wanst.apply() need the information about the dns_static.apply()
    • release/v0.05 - add 'WAN > Health Check' page
    • release/v0.05 - use compile option 'PROSRC_DNS' to compile in/out the 'WAN > Health Check' function
    • release/v0.05 - add the online manual for 'WAN > Health Check'
    • release/v0.05 - remove wording '(Ethernet > WAN WiFi > LTE)' from the hint at 'WAN > Health Check'
  • M360P
    • develop - add 'IP Address Selection' field at 'Service > Dynamic DNS' web page

順手幫明天的自己寫 周報

但明天才寄出

⚠️ **GitHub.com Fallback** ⚠️