20200211_jeffrey - silenceuncrio/diary GitHub Wiki

0910

review

繼續利用 jjbox 來做 m350 的 tty2tcp web ui

參考 m330 來做 porting

m300 被客戶抱怨說 LTE > GPS Config 不見了

m350 告一段落後趕緊處理

1025

m350[develop] - add 'Diagnosis > TTY2TCP'

also the factory default

commit 65761f45e678fcc3281096d0fce6c679e91f1732
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date:   Tue Feb 11 10:23:46 2020 +0800

    add 'Diagnosis > TTY2TCP'
    - also the factory default

 .../rootfs/home/factory/icos/tty2tcp/tty2tcp.ini   |   4 +
 proscend/prosrc/webcgi/Makefile                    |   2 +
 proscend/prosrc/webcgi/tty2tcp.c                   | 103 +++++++++++++++++++++
 proscend/prosrc/www/app/feature/tty2tcp.html       |  43 +++++++++
 proscend/prosrc/www/app/feature/tty2tcp.js         |  81 ++++++++++++++++
 proscend/prosrc/www/app/locale-en.json             |   9 ++
 proscend/prosrc/www/app/locale-fr.json             |   9 ++
 proscend/prosrc/www/app/locale-zh-tw.json          |   9 ++
 proscend/prosrc/www/app/services/icos.service.js   |  11 +++
 proscend/prosrc/www/src/index.html.src             |   1 +
 proscend/prosrc/www/src/manual.html.src            |   1 +
 .../prosrc/www/src/manual/diagnosis_tty2tcp.h.html |  33 +++++++
 proscend/prosrc/www/src/manual/sidebar.h.html      |   3 +
 proscend/prosrc/www/src/menu.html.src              |   1 +
 14 files changed, 310 insertions(+)

切回 m300 做事 - 這需要 VMware jbox

1040

先 porting tty2tcp

1055

m300 已經在 build 了 - 忘了注意到 profile 是什麼

依據 20200203_jeffrey

profile 是 M300/8_GPS_ADVICE

1115

M300[release/v2.03] - add 'Diagnosis > TTY2TCP'

commit 7f48521ad33b2900d49b17b624766e71033224c9
Refs: [release/v2.03], {origin/release/v2.03}
Author: jeffrey <[email protected]>
Date:   Tue Feb 11 11:15:15 2020 +0800

    add 'Diagnosis > TTY2TCP'

 proscend/prosrc/webcgi/Makefile                    |   3 +
 proscend/prosrc/webcgi/tty2tcp.c                   | 103 +++++++++++++++++++++
 proscend/prosrc/www/app/feature/tty2tcp.html       |  43 +++++++++
 proscend/prosrc/www/app/feature/tty2tcp.js         |  81 ++++++++++++++++
 proscend/prosrc/www/app/locale-en.json             |   9 ++
 proscend/prosrc/www/app/locale-fr.json             |   9 ++
 proscend/prosrc/www/app/locale-zh-tw.json          |   9 ++
 proscend/prosrc/www/app/services/icos.service.js   |  11 +++
 proscend/prosrc/www/src/index.html.src             |   1 +
 proscend/prosrc/www/src/manual.html.src            |   1 +
 .../prosrc/www/src/manual/diagnosis_tty2tcp.h.html |  33 +++++++
 proscend/prosrc/www/src/manual/sidebar.h.html      |   1 +
 proscend/prosrc/www/src/menu.html.src              |   1 +
 13 files changed, 305 insertions(+)

再來就是 m300 被客戶抱怨說 LTE > GPS Config 不見了

目前這件事情的結論請參考以下

PROSRC_GNSS_LAB 是 GPS output 到console 的flag, 純屬於 lab 測試用. GPS menu 請看 PROSRC_GNSS

目前 M300 PROSRC_GNSS_LAB 是全關的, 可是 m330, m350 還沒有關. 我打算通通關掉, 也請各位通通ignore PROSRC_GNSS_LAB
上 code 的 branch
M300 (release/v2.03)
M330 (release/v0.09)
M350 (develop)

先做 M300[release/v2.03]

注意到三個地方

➜  www git:(release/v2.03) ✗ grep -r PROSRC_GNSS_LAB *
src/manual.html.src:#if defined(PROSRC_GNSS) && defined(PROSRC_GNSS_LAB)
src/manual/sidebar.h.html:#if defined(PROSRC_GNSS) && defined(PROSRC_GNSS_LAB)
src/menu.html.src:#if defined(PROSRC_GNSS) && defined(PROSRC_GNSS_LAB)

修正

diff --git a/proscend/prosrc/www/src/manual.html.src b/proscend/prosrc/www/src/manual.html.src
index 55ad092..4b78e7a 100755
--- a/proscend/prosrc/www/src/manual.html.src
+++ b/proscend/prosrc/www/src/manual.html.src
@@ -89,7 +89,7 @@
 #ifdef PROSRC_LTE || defined(SIERRA_SEL)
 #include "manual/lte_lte_config.h.html"

-#if defined(PROSRC_GNSS) && defined(PROSRC_GNSS_LAB)
+#if defined(PROSRC_GNSS)
 #include "manual/lte_gps.h.html"
 #endif

diff --git a/proscend/prosrc/www/src/manual/sidebar.h.html b/proscend/prosrc/www/src/manual/sidebar.h.html
index 0542274..9832a42 100644
--- a/proscend/prosrc/www/src/manual/sidebar.h.html
+++ b/proscend/prosrc/www/src/manual/sidebar.h.html
@@ -82,7 +82,7 @@
           </a>
           <ul class="collapse list-unstyled" id="lteSubmenu">
             <li><a href="#lte_lte_config">LTE Config</a></li>
-#if defined(PROSRC_GNSS) && defined(PROSRC_GNSS_LAB)
+#if defined(PROSRC_GNSS)
             <li><a href="#lte_gps">GPS Config</a></li>
 #endif
             <li><a href="#lte_dual_sim">Dual SIM</a></li>
diff --git a/proscend/prosrc/www/src/menu.html.src b/proscend/prosrc/www/src/menu.html.src
index 5de9a84..5b23f3d 100755
--- a/proscend/prosrc/www/src/menu.html.src
+++ b/proscend/prosrc/www/src/menu.html.src
@@ -99,7 +99,7 @@
   <div id="menu_lte" class="panel-collapse collapse">
   <ul class="list-group">
     <a href="#lteConfig" class="list-group-item">{{ 'MENU_LTE_CONFIG' | translate }}</a>
-#if defined(PROSRC_GNSS) && defined(PROSRC_GNSS_LAB)
+#if defined(PROSRC_GNSS)
     <a href="#lteGps" class="list-group-item">{{ 'MENU_LTE_GPS' | translate }}</a>
 #endif

(END)

M300[release/v2.03] - base on compile flag PROSRC_GNSS to show 'LTE > GPS' function

commit dcf1b7d712c50a5563bb098e1f4e429f44717c16
Refs: [release/v2.03], {origin/release/v2.03}
Author: jeffrey <[email protected]>
Date:   Tue Feb 11 11:41:37 2020 +0800

    base on compile flag PROSRC_GNSS to show 'LTE > GPS' function

 proscend/prosrc/www/src/manual.html.src       | 2 +-
 proscend/prosrc/www/src/manual/sidebar.h.html | 4 ++--
 proscend/prosrc/www/src/menu.html.src         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

1140

再來是 m330 - 一樣使用 jbox

選擇一個 PROSRC_GNSS 打開的 profile - 全部都有打開

m330[release/v0.09]

Vendor/Products = GENERIC/0_GENERIC

➜  www git:(release/v0.09) ✗ grep -r PROSRC_GNSS_LAB app/*
➜  www git:(release/v0.09) ✗ grep -r PROSRC_GNSS_LAB manual/*
➜  www git:(release/v0.09) ✗ grep -r PROSRC_GNSS_LAB src/*
src/manual/sidebar.h.html:#if defined(PROSRC_GNSS) && defined(PROSRC_GNSS_LAB)
src/manual.html.src:#if defined(PROSRC_GNSS) && defined(PROSRC_GNSS_LAB)
src/menu.html.src:#if defined(PROSRC_GNSS) && defined(PROSRC_GNSS_LAB)
➜  www git:(release/v0.09) ✗

一樣也是三個地方待修正

1325

m330[release/v0.09] - base on compile flag PROSRC_GNSS to show 'LTE > GPS' function

commit 7eaca96f096648d798d102b5465dce460804437e
Refs: [release/v0.09], {origin/release/v0.09}
Author: jeffrey <[email protected]>
Date:   Tue Feb 11 13:24:14 2020 +0800

    base on compile flag PROSRC_GNSS to show 'LTE > GPS' function

 proscend/prosrc/www/src/manual.html.src       | 2 +-
 proscend/prosrc/www/src/manual/lte_gps.h.html | 2 +-
 proscend/prosrc/www/src/manual/sidebar.h.html | 4 ++--
 proscend/prosrc/www/src/menu.html.src         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

1330

再來是 m350[develop]

這要使用的 VMware 是 jjbox

➜  www git:(develop) ✗ grep -r PROSRC_GNSS_LAB src/*
src/manual/sidebar.h.html:#if defined(PROSRC_GNSS) && defined(PROSRC_GNSS_LAB)
src/manual.html.src:#if defined(PROSRC_GNSS) && defined(PROSRC_GNSS_LAB)
src/menu.html.src:#if defined(PROSRC_GNSS) && defined(PROSRC_GNSS_LAB)

三個地方待修正

m350[develop] - base on compile flag PROSRC_GNSS to show 'LTE > GPS' function

commit 184b6c646a1352b1391a6592a36363dc4779a4dd
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date:   Tue Feb 11 14:02:58 2020 +0800

    base on compile flag PROSRC_GNSS to show 'LTE > GPS' function

 proscend/prosrc/www/src/manual.html.src       | 2 +-
 proscend/prosrc/www/src/manual/lte_gps.h.html | 2 +-
 proscend/prosrc/www/src/manual/sidebar.h.html | 4 ++--
 proscend/prosrc/www/src/menu.html.src         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

跟 PROSRC_GNSS_LAB 相關的修正計有

M300[release/v2.03] - base on compile flag PROSRC_GNSS to show 'LTE > GPS' function
m330[release/v0.09] - base on compile flag PROSRC_GNSS to show 'LTE > GPS' function
m350[develop] - base on compile flag PROSRC_GNSS to show 'LTE > GPS' function

1410

再來是今天追加的工作項目

要回到了

M360P 也需要 tty2tcp

ariel 已經 porting 好 tty2tcp icos module 了

我需要幫忙 porting web ui

來使用 VMware jubuntu - 結束後剛好接回 BGP with MD5

1500

M360P TTY2TCP 收工

還順手補了 ariel 漏掉 porting 的地方

M360P[release/v1.06] - add 'Diagnosis > TTY2TCP'

also add MODULE_TTY2TCP into moduleInitAry[]

commit d726296c0b433321d034db5e9e8600371c1e3b76
Refs: [release/v1.06], {origin/release/v1.06}
Author: jeffrey <[email protected]>
Date:   Tue Feb 11 14:56:41 2020 +0800

    add 'Diagnosis > TTY2TCP'
    - also add MODULE_TTY2TCP into moduleInitAry[]

 proscend/prosrc/icos/icoslib/entry.c               |   1 +
 proscend/prosrc/webcgi/Makefile                    |   5 +
 proscend/prosrc/webcgi/tty2tcp.c                   | 103 +++++++++++++++++++++
 proscend/prosrc/www/app/feature/tty2tcp.html       |  43 +++++++++
 proscend/prosrc/www/app/feature/tty2tcp.js         |  81 ++++++++++++++++
 proscend/prosrc/www/app/locale-en.json             |   9 ++
 proscend/prosrc/www/app/locale-fr.json             |   9 ++
 proscend/prosrc/www/app/locale-zh-tw.json          |   9 ++
 proscend/prosrc/www/app/services/icos.service.js   |  11 +++
 proscend/prosrc/www/src/index.html.src             |   1 +
 proscend/prosrc/www/src/manual.html.src            |   1 +
 .../prosrc/www/src/manual/diagnosis_tty2tcp.h.html |  33 +++++++
 proscend/prosrc/www/src/manual/sidebar.h.html      |   3 +
 proscend/prosrc/www/src/menu.html.src              |   1 +
 14 files changed, 310 insertions(+)

1530

回到 BGP with MD5 task 之前

昨天有提到 jubuntu 上 m350 的問題待查

決定直接把 m350.vmdk 捨棄

重新再建一個新的 m350.vmdk

1550

下班前再來 compile m350 吧

回到 m360

1605

幫忙看一下 web ui 的問題

來自 CTCU

趕緊開啟 jbox

先試著 upgrade 一版客戶反應問題的 firmware - ICR-W401_v0.09_014B001200930E0F.img

修改 /tmp/etc/sysinfo.txt 方便透過 web 做 upgrade

但要記得 reset default

應該是 CTCU 開啟 m330 的 web ui 時

browser 先前已經 cache 住同檔名的 m300 的網頁

但同檔名的 m300 的網頁 - 例如 wan_health_check.html

WAN_HEALTH_CHECK_LEGEND_LTE 這個多國語言 key

m300 有但 m330 沒有

所以在 browser 上就會直接把該 key 顯示出來

這是 cache 產生的問題

尤其在相同 ip

m300 和 m330 混著操作的時候更容易發生

jbox 又可以關掉了

再把 jubuntu 叫起來

1800

趁著個機會把 bgp edit 畫面的防呆做好一點

不要著急於 commit