update article

L8LiLiang · Nov 22, 2023 · 44dff24 · 44dff24
1 parent 0cb3749
commit 44dff24
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/_posts/2020-04-05-Linux_Schell_Scripting_Cookbook-6.md b/_posts/2020-04-05-Linux_Schell_Scripting_Cookbook-6.md
@@ -123,6 +123,8 @@ Git鼓励大量使用分支：
 创建+切换分支：git checkout -b name
 合并某分支到当前分支：git merge name
 删除分支：git branch -d name
+删除分支：git branch -D name //即使分支还没merge也强制删除
+删除远程分支：git push origin --delete devel
 开发一个新feature，最好新建一个分支；
 如果要丢弃一个没有被合并过的分支，可以通过git branch -D <name>强行删除。
 ```

diff --git a/_posts/2023-08-23-synce-dpll.md b/_posts/2023-08-23-synce-dpll.md
@@ -646,3 +646,13 @@ Again DPLL status and RCLKA pin should be valid now,
 turn off SW pin of dpll , it'll trigger DNU for quality signal and ext QL = 255 or 0xff
 # echo 0 0 > synce
 ```
+
+## ts2phc
+```
+-s generic 
+  Use the key word "generic" for an external 1-PPS without ToD information.
+  1PPS to DPLL
+-s nmea
+  Use the key word "nmea" for an external 1-PPS from a GPS providing ToD information via the RMC NMEA sentence.
+  就是GNSS console ToD
+```