Browse Source

增加旧喷漆机器人

master
Lizongdi 2 days ago
parent
commit
7ae7d85d69
  1. 29
      CMakePresets.json
  2. 2
      robot

29
CMakePresets.json

@ -3,28 +3,26 @@
"configurePresets": [ "configurePresets": [
{ {
"name": "default-release", "name": "default-release",
"generator": "Ninja",
"toolchainFile": "${sourceDir}/gcc-arm-none-eabi.cmake",
"hidden": true, "hidden": true,
"displayName": "Default Release Build", "displayName": "Default Release Build",
"description": "Default Release Build", "description": "Default Release Build",
"binaryDir": "${sourceDir}/build", "binaryDir": "${sourceDir}/build",
"cacheVariables": { "cacheVariables": {
"CMAKE_BUILD_TYPE": "Release", "CMAKE_BUILD_TYPE": "Debug",
"A_BUILD_MAIN": "ON", "A_BUILD_MAIN": "ON",
"BUILD_COMMON": "ON", "BUILD_COMMON": "ON",
"MY_BUILD_STATIC": "ON" "A_BUILD_MAIN_AS_STATIC_LIB": "ON",
"MY_BUILD_STATIC": "OFF"
} }
}, },
{ {
"name": "Spool-end", "name": "rb-core",
"generator": "Ninja",
"toolchainFile": "${sourceDir}/gcc-arm-none-eabi.cmake",
"inherits": "default-release", "inherits": "default-release",
"cacheVariables": { "cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"BUILD_LUA": "ON", "BUILD_LUA": "ON",
"A_BUILD_MAIN_AS_STATIC_LIB": "ON",
"BUILD_LUA_STANDALONE": "OFF", "BUILD_LUA_STANDALONE": "OFF",
"MY_BUILD_STATIC": "OFF",
"BUILD_RINGBUFFER": "ON", "BUILD_RINGBUFFER": "ON",
"BUILD_PERIPHERAL": "ON", "BUILD_PERIPHERAL": "ON",
"BUILD_LIST": "ON", "BUILD_LIST": "ON",
@ -32,21 +30,28 @@
"MEM_POOL_TOTAL_SIZE": "46*1024", "MEM_POOL_TOTAL_SIZE": "46*1024",
"IOC_100PIN": true, "IOC_100PIN": true,
"USE_UART": true, "USE_UART": true,
"BUILD_RBCORE": "ON",
"USE_CAN": true "USE_CAN": true
} }
}, },
{ {
"name": "robot", "name": "paint_robot_new",
"inherits": "Spool-end", "inherits": "rb-core",
"cacheVariables": { "cacheVariables": {
"BUILD_RBCORE": "ON",
"BUILD_OPTIONAL": "ON", "BUILD_OPTIONAL": "ON",
"USE_LUA_ST": true, "USE_LUA_ST": true,
"USE_LUA_ST_CAN": true,
"USE_TALNET": true, "USE_TALNET": true,
"USE_LWIP": true, "USE_LWIP": true,
"USE_FREERTOS": true "USE_FREERTOS": true
} }
},
{
"name": "paint_robot_old",
"inherits": "default-release",
"cacheVariables": {
"BUILD_COMMON": "OFF",
"BUILD_PAINT_ROBOT_OLD": "ON"
}
} }
] ]
} }

2
robot

@ -1 +1 @@
Subproject commit 39516883b210d0aa525ce1872b49c4b35e6eb27b Subproject commit f0008394ad6df4007fcf65a61cbac7c386e0f1b6
Loading…
Cancel
Save