Skip to content

Commit 1d9ec0b

Browse files
authored
支持gitee镜像 (#48)
* 去除重复的代码 * 修复windows下脚本权限问题 * 更新第三方库,添加国内镜像
1 parent a3dff58 commit 1d9ec0b

File tree

4 files changed

+70
-15
lines changed

4 files changed

+70
-15
lines changed

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[submodule "lib/host-protocol"]
22
path = lib/host-protocol
3-
url = https://github.com/Jiu-xiao/host-protocol.git
3+
url =https://github.com/xrobot-org/host-protocol.git
44
[submodule "stm32_cmsis"]
55
path = hw/mcu/st/cmsis_device_f4
66
url = https://github.com/STMicroelectronics/cmsis_device_f4.git
@@ -30,10 +30,10 @@
3030
url = https://github.com/STMicroelectronics/cmsis_device_f1.git
3131
[submodule "lib/Kconfiglib"]
3232
path = lib/Kconfiglib
33-
url = https://github.com/ulfalizer/Kconfiglib
33+
url = https://github.com/ulfalizer/Kconfiglib.git
3434
[submodule "lib/mini_shell"]
3535
path = lib/mini_shell
36-
url = https://gitee.com/jiu-xiao/mini_shell.git
36+
url = https://github.com/Jiu-xiao/mini_shell.git
3737
[submodule "hw/mcu/st/cmsis_device_f3"]
3838
path = hw/mcu/st/cmsis_device_f3
3939
url = https://github.com/STMicroelectronics/cmsis_device_f3.git

.gitmodules_cn

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
[submodule "lib/host-protocol"]
2+
path = lib/host-protocol
3+
url =https://gitee.com/x-robot/host-protocol.git
4+
[submodule "stm32_cmsis"]
5+
path = hw/mcu/st/cmsis_device_f4
6+
url = https://gitee.com/x-robot/cmsis_device_f4.git
7+
[submodule "stm32_hal"]
8+
path = hw/mcu/st/stm32f4xx_hal_driver
9+
url = https://gitee.com/x-robot/stm32f4xx_hal_driver.git
10+
[submodule "freertos"]
11+
path = lib/freertos
12+
url = https://gitee.com/x-robot/FreeRTOS-Kernel.git
13+
[submodule "arm_cmsis"]
14+
path = lib/cmsis_5
15+
url = https://gitee.com/x-robot/CMSIS_5.git
16+
[submodule "tinyusb"]
17+
path = lib/tinyusb
18+
url = https://gitee.com/x-robot/tinyusb.git
19+
[submodule "lib/one-message"]
20+
path = lib/one-message
21+
url = https://gitee.com/Jiu-xiao/OneMessageCPP.git
22+
[submodule "lib/cmsis_svd"]
23+
path = lib/cmsis_svd
24+
url = https://gitee.com/x-robot/cmsis-svd.git
25+
[submodule "hw/mcu/st/stm32f1xx_hal_driver"]
26+
path = hw/mcu/st/stm32f1xx_hal_driver
27+
url = https://gitee.com/x-robot/stm32f1xx_hal_driver.git
28+
[submodule "hw/mcu/st/cmsis_device_f1"]
29+
path = hw/mcu/st/cmsis_device_f1
30+
url = https://gitee.com/x-robot/cmsis_device_f1.git
31+
[submodule "lib/Kconfiglib"]
32+
path = lib/Kconfiglib
33+
url = https://gitee.com/x-robot/Kconfiglib.git
34+
[submodule "lib/mini_shell"]
35+
path = lib/mini_shell
36+
url = https://gitee.com/jiu-xiao/mini_shell.git
37+
[submodule "hw/mcu/st/cmsis_device_f3"]
38+
path = hw/mcu/st/cmsis_device_f3
39+
url = https://gitee.com/x-robot/cmsis_device_f3.git
40+
[submodule "hw/mcu/st/stm32f3xx_hal_driver"]
41+
path = hw/mcu/st/stm32f3xx_hal_driver
42+
url = https://gitee.com/x-robot/stm32f3xx_hal_driver.git
43+
[submodule "lib/magic_enum"]
44+
path = lib/magic_enum
45+
url = https://gitee.com/x-robot/magic_enum.git
46+
[submodule "hw/mcu/st/stm32g4xx_hal_driver"]
47+
path = hw/mcu/st/stm32g4xx_hal_driver
48+
url = https://gitee.com/x-robot/stm32g4xx_hal_driver.git
49+
[submodule "hw/mcu/st/cmsis_device_g4"]
50+
path = hw/mcu/st/cmsis_device_g4
51+
url = https://gitee.com/x-robot/cmsis_device_g4.git
52+
[submodule "lib/MiniFlashDB"]
53+
path = lib/MiniFlashDB
54+
url = https://gitee.com/jiu-xiao/MiniFlashDB.git
55+
[submodule "lib/printf"]
56+
path = lib/printf
57+
url = https://gitee.com/x-robot/printf.git
58+
[submodule "hw/mcu/st/stm32g0xx_hal_driver"]
59+
path = hw/mcu/st/stm32g0xx_hal_driver
60+
url = https://gitee.com/x-robot/stm32g0xx_hal_driver.git
61+
[submodule "hw/mcu/st/cmsis_device_g0"]
62+
path = hw/mcu/st/cmsis_device_g0
63+
url = https://gitee.com/x-robot/cmsis_device_g0.git

project.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/python3
1+
#!/usr/bin/env python3
22
import random
33
import sys
44
import os
@@ -545,7 +545,9 @@ def new_robot(name: str):
545545
elif cmd[1] == "list":
546546
list_target()
547547
elif cmd[1] == "init":
548-
os.system("sudo apt install cmake ninja-build python3-tk clang clangd")
548+
os.system("git submodule init && git submodule update")
549+
elif cmd[1] == "init-cn":
550+
os.system("mv .gitmodules .gitmodules_en && mv .gitmodules_cn .gitmodules && git submodule init && git submodule update")
549551
elif cmd[1] == "select":
550552
if cmd_len < 4:
551553
print("参数错误")

src/module/gimbal/mod_gimbal.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -159,16 +159,6 @@ void Gimbal::SetMode(Mode mode) {
159159
}
160160

161161
this->mode_ = mode;
162-
163-
memcpy(&(this->setpoint_.eulr_), &(this->eulr_),
164-
sizeof(this->setpoint_.eulr_)); /* 切换模式后重置设定值 */
165-
if (this->mode_ == RELAX) {
166-
if (mode == ABSOLUTE) {
167-
this->setpoint_.eulr_.yaw = this->eulr_.yaw;
168-
}
169-
}
170-
171-
this->mode_ = mode;
172162
}
173163

174164
void Gimbal::DrawUIStatic(Gimbal* gimbal) {

0 commit comments

Comments
 (0)