20170705_jeffrey - silenceuncrio/diary GitHub Wiki
0850
昨天 PROSCEND 2.0 vision 昇頻科技再造工程思維 由 行銷策畫 的 irene 幫忙整理
0900
先幫 vrrp icos module 寫個 CGI
0910
由之前的 dmz CGI 另存新檔
瞬間收工
commit
commit 557c503b0d401d2603a335e276ea0000a60177ea
Refs: [feature/vrrp]
Author: jeffrey <[email protected]>
Date: Wed Jul 5 09:14:02 2017 +0800
'VRRP' ICOS Module implementing
- add vrrp.cgi
proscend/prosrc/webcgi/Makefile | 2 +-
proscend/prosrc/webcgi/vrrp.c | 110 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 111 insertions(+), 1 deletion(-)
0915
做 web
1030
web 收工
順手解了自己在 apply 時發生的問題
- fix icos module problem: _locSaveConfigTxt()
commit
commit 2b99b1f9880723eb3436bce937d128c5d2df108a
Refs: [feature/vrrp]
Author: jeffrey <[email protected]>
Date: Wed Jul 5 10:27:12 2017 +0800
'VRRP' ICOS Module implementing
- add web page
- fix icos module problem: _locSaveConfigTxt()
proscend/prosrc/icos/icoslib/vrrp/vrrp.c | 4 +-
proscend/prosrc/www/.gitignore | 6 +++
proscend/prosrc/www/app/feature/dmz.js | 2 +
proscend/prosrc/www/app/feature/vrrp.html | 64 ++++++++++++++++++++++++
proscend/prosrc/www/app/feature/vrrp.js | 60 ++++++++++++++++++++++
proscend/prosrc/www/app/locale-en.json | 11 ++++
proscend/prosrc/www/app/locale-fr.json | 11 ++++
proscend/prosrc/www/app/locale-zh-tw.json | 11 ++++
proscend/prosrc/www/app/services/icos.service.js | 9 ++++
proscend/prosrc/www/app/views/menu.html | 3 ++
proscend/prosrc/www/index.html.src | 2 +
11 files changed, 181 insertions(+), 2 deletions(-)
先把 branch feature/vrrp 併回 develop
git flow feature finish vrrp
過程中會要求我寫 log
Merge branch 'feature/vrrp' into develop
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
~
...
~
"~/M300_git/M300/.git/MERGE_MSG" 7L, 268C
直接存檔繼續
➜ www git:(feature/vrrp) git flow feature finish vrrp
Switched to branch 'develop'
Your branch is up-to-date with 'origin/develop'.
Merge made by the 'recursive' strategy.
meta-proscend/recipes-core/prosrc/prosrc_0.1.bb | 2 +-
meta-proscend/recipes-extended/keepalived/keepalived_1.3.5.bb | 50 +++++
.../recipes-extended/keepalived/keepalived_1.3.5.bbappend | 6 +
.../base_fs/default/rootfs/home/factory/icos/vrrp/vrrpcfg.ini | 4 +
proscend/mconfig/Config.in | 1 +
proscend/mconfig/configs/M300/0_GENERIC/defconfig | 2 +
proscend/mconfig/configs/M300/1_GPS/defconfig | 2 +
proscend/prosrc/icos/icoslib/Makefile | 3 +
proscend/prosrc/icos/icoslib/entry.c | 7 +
proscend/prosrc/icos/icoslib/vrrp/Makefile | 13 ++
proscend/prosrc/icos/icoslib/vrrp/vrrp.c | 288 +++++++++++++++++++++++++++++
proscend/prosrc/icos/include/icos_common.h | 1 +
proscend/prosrc/icos/include/icos_module.h | 1 +
proscend/prosrc/icos/include/module_vrrp.h | 28 +++
proscend/prosrc/webcgi/Makefile | 2 +-
proscend/prosrc/webcgi/vrrp.c | 110 +++++++++++
proscend/prosrc/www/.gitignore | 6 +
proscend/prosrc/www/app/feature/dmz.js | 2 +
proscend/prosrc/www/app/feature/vrrp.html | 64 +++++++
proscend/prosrc/www/app/feature/vrrp.js | 60 ++++++
proscend/prosrc/www/app/locale-en.json | 11 ++
proscend/prosrc/www/app/locale-fr.json | 11 ++
proscend/prosrc/www/app/locale-zh-tw.json | 11 ++
proscend/prosrc/www/app/services/icos.service.js | 9 +
proscend/prosrc/www/app/views/menu.html | 3 +
proscend/prosrc/www/index.html.src | 2 +
26 files changed, 697 insertions(+), 2 deletions(-)
create mode 100644 meta-proscend/recipes-extended/keepalived/keepalived_1.3.5.bb
create mode 100644 meta-proscend/recipes-extended/keepalived/keepalived_1.3.5.bbappend
create mode 100644 proscend/base_fs/default/rootfs/home/factory/icos/vrrp/vrrpcfg.ini
create mode 100644 proscend/prosrc/icos/icoslib/vrrp/Makefile
create mode 100644 proscend/prosrc/icos/icoslib/vrrp/vrrp.c
create mode 100644 proscend/prosrc/icos/include/module_vrrp.h
create mode 100644 proscend/prosrc/webcgi/vrrp.c
create mode 100644 proscend/prosrc/www/app/feature/vrrp.html
create mode 100644 proscend/prosrc/www/app/feature/vrrp.js
Deleted branch feature/vrrp (was 2b99b1f).
Summary of actions:
- The feature branch 'feature/vrrp' was merged into 'develop'
- Feature branch 'feature/vrrp' has been removed
- You are now on branch 'develop'
➜ www git:(develop)
1050
在 branch develop git pull 需要解決 conflict 的問題
解完之後直接 git push
再來不要忘了 vrrp icos module 的 _notify()
- PRO_EVENT 'ICOS_UCAST_MODULE_APPLY' not implement yet
最關鍵的部分
記得還要跟 aaron 的 MODULE_DHCP icos module 連動
連動的規則參考 Coexisting of VRRP and DHCP Server Problem
1105
可以先切到 branch release/v1.51 等待 john 的 tr069
➜ prosrc git:(develop) ✗ git checkout release/v1.51
Branch release/v1.51 set up to track remote branch release/v1.51 from origin.
Switched to a new branch 'release/v1.51'
➜ prosrc git:(release/v1.51) ✗
先 compile
1400
arile 希望我在 branch release\v1.51 也加上 MQTT 的 web ui
john 表示他的 tr069 icos module 已經放上去了
我就先做 tr069 的 web ui 吧
1600
三點開始 BU II 成員腦力激盪
利用公司的 Proscend NOTE
針對下面兩個 topic 來腦力激盪
- The top urgent cases/concerns of BU II (every one write down 5 items) at meeting.
- 5000units/month at the end of Y2018 ((every one write down 3 concerning items) at meeting.
BU II 的成員也包含 Borchen
Jim 問到 Cindy 說我們能不能送樣給 中東 的客戶時
Cindy 表示之前是由 DQA 來決定是否能送樣
不過 borchen 沒辦法做這個決定
borchen 只能打開 mantis 大家一起來 review
花了不少時間
我想這環節後續要加強一下
1630
ariel 在 web firmware upgrade 時出現了 Error: ubiattach failed
就出現過那麼一次
1655
做 tr069 的 web ui 吧
先做 CGI
commit 310f76ffa3b0d0408973952a6bceef4b1ada5ded
Refs: [release/v1.51]
Author: jeffrey <[email protected]>
Date: Wed Jul 5 17:11:14 2017 +0800
'CWMP' ICOS Module UI
- add cwmp.cgi
proscend/prosrc/webcgi/Makefile | 3 +-
proscend/prosrc/webcgi/cwmp.c | 112 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 114 insertions(+), 1 deletion(-)
1715
再做 WEB UI
參考 john 的 proposal - CWMP
打完收功
commit c9ec0218f8e020cf16d8ab0cb6bd8bdc0dedad6d
Refs: [release/v1.51], {origin/release/v1.51}
Author: jeffrey <[email protected]>
Date: Wed Jul 5 17:42:38 2017 +0800
'CWMP' ICOS Module UI
- add web page
proscend/prosrc/www/app/feature/cwmp.html | 104 +++++++++++++++++++++++
proscend/prosrc/www/app/feature/cwmp.js | 58 +++++++++++++
proscend/prosrc/www/app/locale-en.json | 16 ++++
proscend/prosrc/www/app/locale-fr.json | 29 +++++++
proscend/prosrc/www/app/locale-zh-tw.json | 30 +++++++
proscend/prosrc/www/app/services/icos.service.js | 9 ++
proscend/prosrc/www/app/views/menu.html | 2 +
proscend/prosrc/www/index.html.src | 2 +
8 files changed, 250 insertions(+)