20190722_jeffrey - silenceuncrio/diary GitHub Wiki

0920

review

1155

M330[develop] - add 'Management > FOTA' web page: finished

commit fad47fca25e282bef2561419a0375a25cb3afa00
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date:   Mon Jul 22 11:54:08 2019 +0800

    add 'Management > FOTA' web page: finished

 proscend/prosrc/webcgi/fota.c                    | 105 ++++++++++++++++++++++-
 proscend/prosrc/www/app/feature/fota.html        |  96 ++++++++++++++++++++-
 proscend/prosrc/www/app/feature/fota.js          |  37 ++++++++
 proscend/prosrc/www/app/locale-en.json           |  13 ++-
 proscend/prosrc/www/app/locale-fr.json           |  13 ++-
 proscend/prosrc/www/app/locale-zh-tw.json        |  13 ++-
 proscend/prosrc/www/app/services/icos.service.js |   3 +
 7 files changed, 272 insertions(+), 8 deletions(-)

不過 FOTA 還要在 Management > Identification page 顯示 FOTA 相關資訊

1345

M330[develop] - add fota status at 'Management > Identification' web page while PROSRC_FOTAD defined

commit 47068a2f8d5b33576ffde7ca7e6e38109d4fbac9
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date:   Mon Jul 22 13:42:29 2019 +0800

    add fota status at 'Management > Identification' web page while PROSRC_FOTAD defined

 proscend/prosrc/webcgi/Makefile                    |  2 -
 proscend/prosrc/webcgi/fota.c                      | 61 ++++++++++++++++++++++
 .../prosrc/www/app/feature/identification.html     | 11 ++++
 proscend/prosrc/www/app/feature/identification.js  |  9 +++-
 proscend/prosrc/www/app/locale-en.json             |  4 ++
 proscend/prosrc/www/app/locale-fr.json             |  4 ++
 proscend/prosrc/www/app/locale-zh-tw.json          |  4 ++
 proscend/prosrc/www/app/services/icos.service.js   |  3 ++
 8 files changed, 95 insertions(+), 3 deletions(-)

1350

新人 VIC 已陣亡

M330[feature/wifi_sta] 已沒有存在必要

先併回 develop

git flow feature finish

➜  m330 git:(feature/wifi_sta) ✗ git flow feature finish
Switched to branch 'develop'
Your branch is up-to-date with 'origin/develop'.
Auto-merging proscend/prosrc/www/src/menu.html.src
Auto-merging proscend/prosrc/www/src/index.html.src
CONFLICT (content): Merge conflict in proscend/prosrc/www/src/index.html.src
Auto-merging proscend/prosrc/www/app/services/icos.service.js
CONFLICT (content): Merge conflict in proscend/prosrc/www/app/services/icos.service.js
Auto-merging proscend/prosrc/www/app/locale-zh-tw.json
CONFLICT (content): Merge conflict in proscend/prosrc/www/app/locale-zh-tw.json
Auto-merging proscend/prosrc/www/app/locale-fr.json
CONFLICT (content): Merge conflict in proscend/prosrc/www/app/locale-fr.json
Auto-merging proscend/prosrc/www/app/locale-en.json
CONFLICT (content): Merge conflict in proscend/prosrc/www/app/locale-en.json
Auto-merging proscend/prosrc/webcgi/Makefile
Auto-merging proscend/prosrc/icos/icoslib/wan_connmgr_iot/connmgr_iot.c
CONFLICT (content): Merge conflict in proscend/prosrc/icos/icoslib/wan_connmgr_iot/connmgr_iot.c
Auto-merging proscend/prosrc/icos/icoslib/wan_connmgr/connmgr.c
CONFLICT (content): Merge conflict in proscend/prosrc/icos/icoslib/wan_connmgr/connmgr.c
Automatic merge failed; fix conflicts and then commit the result.

There were merge conflicts. To resolve the merge conflict manually, use:
    git mergetool
    git commit

You can then complete the finish by running it again:
    git flow feature finish wifi_sta

➜  m330 git:(develop) ✗

git status


➜  m330 git:(develop) ✗ git status
On branch develop
Your branch is up-to-date with 'origin/develop'.
You have unmerged paths.
  (fix conflicts and run "git commit")

Changes to be committed:

        modified:   proscend/prosrc/webcgi/Makefile
        new file:   proscend/prosrc/webcgi/wifi_sta.c
        new file:   proscend/prosrc/www/app/feature/wifi_sta.html
        new file:   proscend/prosrc/www/app/feature/wifi_sta.js
        modified:   proscend/prosrc/www/src/menu.html.src

Unmerged paths:
  (use "git add <file>..." to mark resolution)

        both modified:   proscend/prosrc/icos/icoslib/wan_connmgr/connmgr.c
        both modified:   proscend/prosrc/icos/icoslib/wan_connmgr_iot/connmgr_iot.c
        both modified:   proscend/prosrc/www/app/locale-en.json
        both modified:   proscend/prosrc/www/app/locale-fr.json
        both modified:   proscend/prosrc/www/app/locale-zh-tw.json
        both modified:   proscend/prosrc/www/app/services/icos.service.js
        both modified:   proscend/prosrc/www/src/index.html.src

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        .bash_history
        dl/conntrack-tools-1.0.0.tar.bz2
        dl/cyassl-1.6.5.zip
        dl/gpsd-3.7.tar.gz
        dl/headers-more-nginx-module-a9f7c7e86cc7441d04e2f11f01c2e3a9c4b0301d.tar.gz
        dl/inadyn-mt.v.02.28.10.tar.gz
        dl/libcap-2.22.tar.bz2
        dl/libnetfilter_conntrack-0.9.1.tar.bz2
        dl/libusb-1.0.9.tar.bz2
        dl/lighttpd-1.4.30.tar.xz
        dl/nginx-1.16.0.tar.gz
        dl/nginx-naxsi-module-951123ad456bdf5ac94e8d8819342fe3d49bc002.tar.gz
        dl/openswan-2.6.38.tar.gz
        dl/openswan-2.6.41.tar.gz
        dl/pcre-8.11.tar.bz2
        dl/unqlite-1.1.9-60f5c6b8d3c47e6ce5311eb56b4adbfb68263ab6.tar.gz
        proscend/fwtools/fwtool
        proscend/opensrc/Makefile.local
        proscend/opensrc/inadyn-mt.v.02.28.10/Makefile
        proscend/opensrc/inadyn-mt.v.02.28.10/config.log
        proscend/opensrc/inadyn-mt.v.02.28.10/config.status
        proscend/opensrc/inadyn-mt.v.02.28.10/config_done
        proscend/opensrc/inadyn-mt.v.02.28.10/man/Makefile
        proscend/opensrc/inadyn-mt.v.02.28.10/src/.deps/
        proscend/opensrc/inadyn-mt.v.02.28.10/src/Makefile
        proscend/opensrc/inadyn-mt.v.02.28.10/src/config.h
        proscend/prosrc/icos/checkHC/checkHC
        proscend/prosrc/icos/fotad/fotad
        proscend/prosrc/icos/fotad/fotadInfo
        proscend/prosrc/icos/fotad/module_fota.h
        proscend/prosrc/icos/kmod/prokipc/.kipc.o.cmd
        proscend/prosrc/icos/kmod/prokipc/.main.o.cmd
        proscend/prosrc/icos/kmod/prokipc/.prokipc.ko.cmd
        proscend/prosrc/icos/kmod/prokipc/.prokipc.mod.o.cmd
        proscend/prosrc/icos/kmod/prokipc/.prokipc.o.cmd
        proscend/prosrc/icos/kmod/prokipc/.tmp_versions/
        proscend/prosrc/icos/kmod/prokipc/Module.symvers
        proscend/prosrc/icos/kmod/prokipc/modules.order
        proscend/prosrc/icos/kmod/prokipc/prokipc.ko
        proscend/prosrc/icos/kmod/prokipc/prokipc.mod.c
        proscend/prosrc/www/my-app/
        proscend/prosrc/www/package-lock.json
        proscend/prosrc/www/react_01/src/components/Dmz/

注意到 Unmerged paths:

Unmerged paths:
  (use "git add <file>..." to mark resolution)

        both modified:   proscend/prosrc/icos/icoslib/wan_connmgr/connmgr.c
        both modified:   proscend/prosrc/icos/icoslib/wan_connmgr_iot/connmgr_iot.c
        both modified:   proscend/prosrc/www/app/locale-en.json
        both modified:   proscend/prosrc/www/app/locale-fr.json
        both modified:   proscend/prosrc/www/app/locale-zh-tw.json
        both modified:   proscend/prosrc/www/app/services/icos.service.js
        both modified:   proscend/prosrc/www/src/index.html.src

一個一個解吧

1420

merge 後再 build 個 image 試試

Vendor/Products = GENERIC/1_GENERIC_WIFI

PROSCEND Software Configuration 部分要做額外動作

WIFI Support(STA mode)

 PROSCEND Software Configuration
 ───────────────────────────────────────────────────────────────────────────────
  ┌────────────────────────────── Applications ──────────────────────────────┐
  │  Arrow keys navigate the menu.  <Enter> selects submenus --->.           │
  │  Highlighted letters are hotkeys.  Pressing <Y> includes, <N> excludes,  │
  │  <M> modularizes features.  Press <Esc><Esc> to exit, <?> for Help.      │
  │  Legend: [*] built-in  [ ] excluded  <M> module  < > module capable      │
  │ ┌^(-)──────────────────────────────────────────────────────────────────┐ │
  │ │[*] Schedule Reboot                                                   │ │
  │ │[ ] Performance tuning                                                │ │
  │ │[*] WIFI Support(AP and STA mode)                                     │ │
  │ │     WIFI AP SSID: "" (NEW)                                           │ │
  │ │     WIFI AP Password: "" (NEW)                                       │ │
  │ │[*] WIFI Support(STA mode)                                            │ │
  │ │[ ] LTE Lock Bands                                                    │ │
  │ │[ ] LTE Lock PCIs                                                     │ │
  │ │[ ] LTE Search Operators                                              │ │
  │ └┴(+)──────────────────────────────────────────────────────────────────┘ │
  ├──────────────────────────────────────────────────────────────────────────┤
  │                     <Select>    < Exit >    < Help >                     │
  └──────────────────────────────────────────────────────────────────────────┘

確認 compile option PROSRC_WIFI_STA 有打開

user@3b95631f73fe:~/proscend$ cat .config | grep WIFI_STA
PROSRC_WIFI_STA=y

FOTAD (Firmware Over the Air)

 PROSCEND Software Configuration
 ───────────────────────────────────────────────────────────────────────────────
  ┌────────────────────────────── Applications ──────────────────────────────┐
  │  Arrow keys navigate the menu.  <Enter> selects submenus --->.           │
  │  Highlighted letters are hotkeys.  Pressing <Y> includes, <N> excludes,  │
  │  <M> modularizes features.  Press <Esc><Esc> to exit, <?> for Help.      │
  │  Legend: [*] built-in  [ ] excluded  <M> module  < > module capable      │
  │ ┌^(-)──────────────────────────────────────────────────────────────────┐ │
  │ │[ ] CPU Temperature                                                   │ │
  │ │[ ] LTE_DATA_ALARM                                                    │ │
  │ │[*] ETH WAN as LAN                                                    │ │
  │ │[ ] LTE_BRIDGE_ROUTER                                                 │ │
  │ │[ ] LTE_ROUTER_ROUTER                                                 │ │
  │ │[ ] LTE IOT                                                           │ │
  │ │[*] LTE USSD                                                          │ │
  │ │[*] FOTAD (Firmware Over the Air)                                     │ │
  │ │     Fota server XML list: "ftp://fotaServer:[email protected]:│ │
  │ └──────────────────────────────────────────────────────────────────────┘ │
  ├──────────────────────────────────────────────────────────────────────────┤
  │                     <Select>    < Exit >    < Help >                     │
  └──────────────────────────────────────────────────────────────────────────┘

確認 compile option PROSRC_FOTAD 有打開

user@3b95631f73fe:~/proscend$ cat .config | grep FOTAD
PROSRC_FOTAD=y
PROSRC_FOTAD_FWINFO_XML="ftp://fotaServer:[email protected]:2121/fota_firmware.xml ftp://60.250.198.239:2121/fota_firmware.xml http://60.250.198.239:802/fotaServer/fota_firmware.xml http://fotaServer:[email protected]:802/secured/proscend/fota_firmware.xml"

build image 吧

proscend 目錄下

1425

卡拉廚餘機送修

客服致電表示需要更換風扇

客服表示該機器看起來蠻乾淨的

因不確定購買日期 - 一年內有保固

更換風扇酌收 600 元

客服表示該機器並沒有摔到過的痕跡

不過這麼快就需要更換風扇實在讓人蠻困擾的

1530

未來 M350 透過 CTCU 與 Hinet 的案子目前正在評估

為了方便討論

相關人等加入一個 line 群組 - U中華4G Router評估

1550

M330[develop] - at 'Management > FOTA' web page: change week day order

commit ccd27bdfc9f19d56067dd659f7986b82eacc6fa1
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date:   Mon Jul 22 15:52:09 2019 +0800

    at 'Management > FOTA' web page: change week day order
    - start from 'Sun', not 'Mon'

 proscend/prosrc/www/app/feature/fota.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

1600

M330 - WiFi STA 這 task 的 owner 已離職

我就接手吧

1710

M330[develop] - WiFi STA

目前 /cgi-bin/sifi_sta.cgi?act=status 會回傳 ICOS_GetStatus fail

相關的 code 如下

static json_object * _obj_status()
{

    int res = ICOS_GetStatus(MODULE_WIFI_STA, 0, 0, &Wifi_sta_status, sizeof(Wifi_sta_status));
    if (res != ICOS_SUCCESS)
    {
        jweb.http.status(500);
        jweb.out.json.fail("ICOS_GetStatus fail");
    }


    json_object *obj = json_object_new_object();

    json_object_object_add(obj, "scan_count", json_object_new_int(Wifi_sta_status.scan_count));



    return obj;
}

目前由 jessy 花時間排除中

1715

line 群組 - U中華4G Router評估 已經有了一些討論

我需要在 M300 建一個 branch 專供這個項目做一些實驗方便評估

可能用一個專供實驗的 profile 方便對個別的功能做開關

M300[feature/hinet_evaluate] - add profile for feature/hinet_evaluate

commit 05f0961056929081006e4a5c3d044ed1faca29f6
Refs: [feature/hinet_evaluate], {origin/feature/hinet_evaluate}
Author: jeffrey <[email protected]>
Date:   Mon Jul 22 17:28:30 2019 +0800

    add profile for feature/hinet_evaluate:
    - copy from 0_GENERIC
    - we can easy turn on/turn off some functions for the testing

 .../configs/M300/18_HINET_EVALUATE/defconfig       | 161 +++++++++++++++++++++
 1 file changed, 161 insertions(+)

實際以該 profile 來 build 個 image

(M300/18_HINET_EVALUATE) Products/Vendor

 PROSCEND Software Configuration
 ──────────────────────────────────────────────────────────────────────────────
  ┌─────────────────────────────── Main Menu ───────────────────────────────┐
  │  Arrow keys navigate the menu.  <Enter> selects submenus --->.          │
  │  Highlighted letters are hotkeys.  Pressing <Y> includes, <N> excludes, │
  │  <M> modularizes features.  Press <Esc><Esc> to exit, <?> for Help.     │
  │  Legend: [*] built-in  [ ] excluded  <M> module  < > module capable     │
  │ ┌─────────────────────────────────────────────────────────────────────┐ │
  │ │             (M300/18_HINET_EVALUATE) Products/Vendor                │ │
  │ │             ---                                                     │ │
  │ │             Load software build profile                             │ │
  │ │             Save software build profile as ...                      │ │
  │ │                                                                     │ │
  │ │                                                                     │ │
  │ │                                                                     │ │
  │ │                                                                     │ │
  │ │                                                                     │ │
  │ │                                                                     │ │
  │ └─────────────────────────────────────────────────────────────────────┘ │
  ├─────────────────────────────────────────────────────────────────────────┤
  │                    <Select>    < Exit >    < Help >                     │
  └─────────────────────────────────────────────────────────────────────────┘

1750

M330[develop] - WiFi STA

jessy 表示 /cgi-bin/sifi_sta.cgi?act=status 會回傳 ICOS_GetStatus fail 的問題已排除

目前 M300[feature/hinet_evaluate] 還在 build image

1755

M300[feature/hinet_evaluate] build image 已完成

回到 M330[develop] - WiFi STA

git pull - jessy 已解決問題

還是 fail

再下一次

{ "status": { "scan_count": 33 } }

可以修改 CGI 得到更多的 information 了

再要個幾次 - http://192.168.1.1z/cgi-bin/wifi_sta.cgi?act=status

{ "status": { "scan_count": 38 } }

38 個

#define MAX_WPACLI_SCAN_AP_NUM     32
typedef struct _WPACLI_SCAN_LIST_
{
    int scan_count;
    WPACLI_SCAN_RES scan_list[MAX_WPACLI_SCAN_AP_NUM];
} WPACLI_SCAN_LIST;

MAX_WPACLI_SCAN_AP_NUM 才 32 個

1810

M330 因 wdog 重開機了

 icos: reboot by wdog...

### module <fota> exit
...

不確定跟 jessy 有沒有關係

不過今天 M330 已經有兩次因 wdog 重開機

明天再請 jessy 幫忙注意一下