From: Ace Zhao <ace@acezhao-mb2.tencent.com>
Date: Mon, 21 Jan 2019 11:34:17 +0000 (+0800)
Subject: ...
X-Git-Url: http://zhaoyanbai.com/repos/Bv9ARM.ch03.html?a=commitdiff_plain;h=e95f50b5d768da3e4da0911a8b91278a1306ad92;p=acecode.git

...
---

diff --git a/learn/doc/mac_bash_profile b/learn/doc/mac_bash_profile
index 3b0562a..2330121 100644
--- a/learn/doc/mac_bash_profile
+++ b/learn/doc/mac_bash_profile
@@ -5,10 +5,12 @@ HISTCONTROL=ignoreboth
 export PATH=/usr/local/sbin:$PATH
 export PATH=$HOME/.local/bin:$PATH
 export PATH=$PATH:$HOME/workspace/esp/xtensa-esp32-elf/bin
+export PATH=$PATH:$HOME/workspace/esp/xtensa-lx106-elf/bin
 export GOBIN=$HOME/.local/bin
 export IDF_PATH=$HOME/workspace/esp/esp-idf
 export PATH=$PATH:/Applications/Arduino.app/Contents/Java/hardware/tools/avr/bin/
 export PATH=$PATH:$HOME/Library/Arduino15/packages/arduino/tools/avrdude/6.0.1-arduino5/bin
+export PATH=$PATH:/usr/local/opt/go/libexec/bin
 #多个GOPATH用';'分隔 go get会存到第一个目录
 export GOPATH=$HOME/go
 export RTOS_PATH=$HOME/workspace/acecode/rtos/
diff --git a/learn/doc/vimrc b/learn/doc/vimrc
index 72f9f27..1e3f596 100644
--- a/learn/doc/vimrc
+++ b/learn/doc/vimrc
@@ -72,7 +72,6 @@ set tabstop=4     " TAB的宽度
 set shiftwidth=4
 set expandtab     " TAB用空格代替，否则可用 set noexpandtab
 set cursorline
-set paste
 
 "hi CursorLine ctermbg=lightcyan cterm=BOLD
 "set cursorcolumn
@@ -113,4 +112,8 @@ autocmd FileType asm set tabstop=4
 autocmd FileType asm set shiftwidth=4
 autocmd FileType asm set expandtab
 
-imap jj <esc> " 连续按两次jj表示按ESC，进入命令模式
+" 连续按两次jj表示按ESC，进入命令模式
+imap jj <Esc>
+
+" set paste 会使 imap jj <Esc>失效
+"set paste
diff --git a/tools/game/ksp_planet_transfer_calculator.go b/tools/game/ksp_planet_transfer_calculator.go
index a65cc0b..fce6ba9 100644
--- a/tools/game/ksp_planet_transfer_calculator.go
+++ b/tools/game/ksp_planet_transfer_calculator.go
@@ -52,7 +52,7 @@ var objects = map[string]AstronomicalObject {
 		320000,
 		20726155264,
 		0.06,
-		0.05,
+		0.051,
 		3.0136321e11,
 		47921949,
 	},
@@ -67,6 +67,17 @@ var objects = map[string]AstronomicalObject {
 		3.5315984e12,
 		84159271,
 	},
+    "Dress" :
+    {
+        "Dress",
+        "Kerbol",
+        138000,
+        40839348203,
+        5,
+        0.145,
+        2.1484489e10,
+        32832840,
+    },
 }
 
 func getAstronomicalObjectOrbitalPeriod(sma float64, u float64) float64 {
@@ -88,7 +99,7 @@ func main() {
 	// ===> PhaseAngle = Pi - Tt*Pi/Td 
 
 	aos := objects["Kerbin"]
-	aod := objects["Eve"]
+	aod := objects["Duna"]
 	if aos.parent != aod.parent || aos.parent == "" || aod.parent == "" {
 		fmt.Println("invalid astronomical object");
 		return