經常使用小工具集

Ubuntu環境下SSH服務安裝、SSH遠程登陸以及SSH數據傳輸html

http://www.javashuo.com/article/p-tfolcxrq-gy.htmlpython

 

minicom配置linux

sudo minicom -sandroid

 

dos2unixgit

sudo apt-get -y install dos2unixgithub

find . -type f -exec dos2unix {} \;

 

windows下對127.0.0.1抓包, RawCap很方便web

http://www.javashuo.com/article/p-atuxsjzj-dd.htmlubuntu

 

code::blocks clion atom vscodewindows

 

ubuntu安裝atomvisual-studio-code

https://blog.csdn.net/hao5743/article/details/52056194

ubuntu安裝vscode

sudo apt-get install software-properties-common python-software-properties
sudo add-apt-repository ppa:ubuntu-desktop/ubuntu-make
sudo apt-get update
sudo apt-get install ubuntu-make
umake web visual-studio-code
umake web visual-studio-code --remove

 

gcc升降級

https://blog.csdn.net/agenih/article/details/79491366

https://blog.csdn.net/betty13006159467/article/details/78394974

 

git 一個分支徹底覆蓋另外一個分支

1,git push origin develop:master -f
就能夠把本地的develop分支強制(-f)推送到遠程master

2,
git checkout master // 切換到舊的分支
git reset –hard develop // 將本地的舊分支 master 重置成 develop
git push origin master –force // 再推送到遠程倉庫

 

liaoxuefeng git

https://www.liaoxuefeng.com/wiki/0013739516305929606dd18361248578c67b8067c8c017b000/001375840038939c291467cc7c747b1810aab2fb8863508000

1四、樹梅派

樹梅派應用56:用樹莓派搭建Git私有服務器

https://blog.csdn.net/huayucong/article/details/54407143

樹梅派應用58:使用ngrok將樹莓派web服務映射到公網

https://blog.csdn.net/huayucong/article/details/54407189

 

1三、Linaro Toolchain

https://www.linaro.org/downloads/

Linaro provides monthly GCC source archive snapshots of the current Linaro GCC release branch, as well as quarterly releases of pre-built Linaro GNU cross-toolchain binary archives.

The following tables provide direct access to the most common Linux and bare-metal ABI variants of the Linaro binary cross-toolchain quarterly releases. Both x86_64 Linux and Mingw32 (MS Windows compatible) host binaries are provided:

Latest Linux Targeted Binary Toolchain Releases

arm-linux-gnueabihf 32-bit ARMv7 Cortex-A, hard-float, little-endian Release-Notes Binaries Source
armv8l-linux-gnueabihf 32-bit ARMv8 Cortex-A, hard-float, little-endian Release-Notes Binaries Source
aarch64-linux-gnu 64-bit ARMv8 Cortex-A, little-endian Release-Notes Binaries Source

Latest Bare-Metal Targeted Binary Toolchain Releases

arm-eabi 32-bit ARMv7 Cortex-A, soft-float, little-endian Release-Notes Binaries Source
aarch64-elf 64-bit ARMv8 Cortex-A, little-endian Release-Notes Binaries Source

 

十二、交叉編譯lrzsz實現arm串口xmodem,ymodem,zmodem協議的lrz和lsz數據收發

http://blog.chinaunix.net/uid-20564848-id-74714.html

 

十一、各類視音頻封裝格式分析

http://blog.csdn.net/leixiaohua1020/article/details/17934487

 

十、USB 調試工具(python2.7 + Tkinter + pyusb/pywinusb)

http://www.cnblogs.com/jakeyChen/p/4463530.html

 https://github.com/Qbicz/ChibiOS-mems-usb

 

九、串口調試工具(Python2.7+pyserial+Tkinter)

http://www.cnblogs.com/jakeyChen/p/4465281.html

 

八、在windows上用adb安裝android apk

 adb工具:http://files.cnblogs.com/files/dong1/adb1.0.32.zip

 

七、VIM安裝插件

1)sudo apt-get install ctags

2)ctags -R

 http://www.cnblogs.com/ynxf/p/5922661.html

http://www.cnblogs.com/zhaoyl/p/4078164.html

 

六、CheckTool:CRC校驗、累加和校驗、異或和校驗專業校驗工具V1.1

http://www.cnblogs.com/tdyizhen1314/archive/2012/10/10/2718808.html

 

五、keil mdk __attribute__用法

 

四、beyond compare 30天評估期到期

beyond compare 4你的30天評估期到期,那時候也打不開軟件,輸入不了註冊碼,而後也不想花過多時間搞這玩意,簡單,一步解決問題。

找到beyond Compare 4文件夾下面的BCUnrar.dll,將其刪掉或者重命名,再從新打開接着使用。windows下可行,linux沒試。

 

三、PL2303驅動

http://www.prolific.com.tw/US/ShowProduct.aspx?pcid=41&showlevel=0017-0037-0041

 

二、repo應用

下了好幾個repo都不靠譜,運行報錯

fatal: Cannot get https://gerrit.googlesource.com/git-repo/clone.bundle

fatal: error [Errno 101] Network is unreachable

 

解決方法,先單獨克隆repo,而後將git-repo裏面的repo文件複製到用戶根目錄下的bin目錄裏,在同步源碼的工做目錄新建.repo文件夾,把git-repo重命名爲repo複製到.repo目錄下:

git clone https://gerrit-googlesource.lug.ustc.edu.cn/git-repo

從新初始化:

repo init -u https://github.com/intel-ndg/manifest -b v4.1 -m default.xml

同步開始

repo sync -j5

 

一、代碼託管

1)github公共空間免費,私有空間收費。

2)gitlab徹底免費再加送整個系統

3)bitbucket比github更好用

 

git 一個分支徹底覆蓋另外一個分支

1)

git push origin develop:master -f
就能夠把本地的develop分支強制(-f)推送到遠程master

2)
git checkout master // 切換到舊的分支
git reset –hard develop // 將本地的舊分支 master 重置成 develop
git push origin master –force // 再推送到遠程倉庫

git合併分支

dong@ubuntu:~/z1/demo$ git branch
* aaa
dong@ubuntu:~/z1/demo$ git checkout -b xxx
切換到一個新分支 'xxx'
dong@ubuntu:~/z1/demo$ git branch
  aaa
* xxx
dong@ubuntu:~/z1/demo$ git merge aaa
Already up-to-date.
dong@ubuntu:~/z1/demo$ git branch -D aaa
已刪除分支 aaa(曾爲 439e803)。
dong@ubuntu:~/z1/demo$ git branch
* xxx
dong@ubuntu:~/z1/demo$ git push -u origin xxx
Counting objects: 62, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 781 bytes | 0 bytes/s, done.
Total 9 (delta 7), reused 0 (delta 0)
To git@172.16.23.76:/home/pi/workspace/git/demo.git
   e7b3d0c..439e803  xxx -> xxx
分支 xxx 設置爲跟蹤來自 origin 的遠程分支 xxx。
dong@ubuntu:~/z1/demo$ git log
commit 439e8034030ae75ba112740f3662769eded6c49b
Author: dong <15019442511@163.com>
Date:   Thu Sep 27 02:28:24 2018 -0700

    合併aaa分支

臨時合併分支
git checkout -b tmp
git branch --set-upstream-to=origin/tmp tmp
git pull

 

log:
dong@ubuntu:~/1/qbox10$ git checkout -b zdd
M    application/business_layer/src/bl_warn.c
切換到一個新分支 'zdd'
dong@ubuntu:~/1/qbox10$ git status
位於分支 zdd
還沒有暫存以備提交的變動:
  (使用 "git add <文件>..." 更新要提交的內容)
  (使用 "git checkout -- <文件>..." 丟棄工做區的改動)

    修改:         application/business_layer/src/bl_warn.c

未跟蹤的文件:
  (使用 "git add <文件>..." 以包含要提交的內容)

    lib/nmea/lib/libnmea_so.so
    source/rtklib/src/interface/libinterface.a
    source/rtklib/src/interface/libmain.a

修改還沒有加入提交(使用 "git add" 和/或 "git commit -a")
dong@ubuntu:~/1/qbox10$ git merge wwx
Already up-to-date.
dong@ubuntu:~/1/qbox10$ git add application/business_layer/src/bl_warn.c
dong@ubuntu:~/1/qbox10$ git commit -m "
> 適配服務器角色
> "
[zdd eb88d3a] 適配服務器角色
 1 file changed, 4 insertions(+), 4 deletions(-)
dong@ubuntu:~/1/qbox10$ git branch -D wwx
已刪除分支 wwx(曾爲 b1a4a13)。
dong@ubuntu:~/1/qbox10$ git branch
* zdd
dong@ubuntu:~/1/qbox10$ git push -u origin zdd
Counting objects: 54, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 531 bytes | 0 bytes/s, done.
Total 6 (delta 5), reused 0 (delta 0)
To git@172.16.23.248:/home/workspace/git/qbox10.git
   6141bb1..eb88d3a  zdd -> zdd
分支 zdd 設置爲跟蹤來自 origin 的遠程分支 zdd。
dong@ubuntu:~/1/qbox10$

 

合併分支

dong@ubuntu:~$ git clone -b merge git@172.16.xx.yyy:/home/workspace/git/project.git
正克隆到 'project'...
remote: Counting objects: 23917, done.
remote: Compressing objects: 100% (14341/14341), done.
remote: Total 23917 (delta 12822), reused 18505 (delta 8786)
接收對象中: 100% (23917/23917), 293.18 MiB | 11.13 MiB/s, done.
處理 delta 中: 100% (12822/12822), done.
檢查鏈接... 完成。
dong@ubuntu:~$ cd project/
dong@ubuntu:~/project$ git branch -a
* merge
  remotes/origin/HEAD -> origin/master
  remotes/origin/master
  remotes/origin/merge
  remotes/origin/zdd
dong@ubuntu:~/project$ git chekout zdd
git:'chekout' 不是一個 git 命令。參見 'git --help'。

您指的是這個麼?
    checkout
dong@ubuntu:~/project$ git checkout zdd
分支 zdd 設置爲跟蹤來自 origin 的遠程分支 zdd。
切換到一個新分支 'zdd'
dong@ubuntu:~/project$ git merge merge
更新 e9b175d..ffa355b
Fast-forward
 .gitignore                                         |    2 +
 CMakeLists.txt                                     |   24 +-

...

...
dong@ubuntu:~/project$ git push origin zdd
Total 0 (delta 0), reused 0 (delta 0)
To git@172.16.xx.yyy:/home/workspace/git/project.git
   e9b175d..ffa355b  zdd -> zdd
dong@ubuntu:~/project$

 

4步

git clone -b tmp git@172.16.xx.yyy:/home/workspace/git/project.git

git branch -a

git chekout zdd

git merge tmp

 

ssh key

https://blog.csdn.net/yunna520/article/details/83346207

相關文章
相關標籤/搜索