Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Scripting: move and rename CAN Driver_Type enumeration

This commit is contained in:
Peter Barker 2023-04-18 18:04:51 +10:00 committed by Peter Barker
parent 7461dffb89
commit b167e19bb6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Scripting/AP_Scripting_CANSensor.h
View File

@ -25,7 +25,7 @@ class ScriptingCANBuffer;
class ScriptingCANSensor : public CANSensor { class ScriptingCANSensor : public CANSensor {
public: public:
ScriptingCANSensor(AP_CANManager::Driver_Type dtype) ScriptingCANSensor(AP_CAN::Protocol dtype)
: CANSensor("Script") { : CANSensor("Script") {
register_driver(dtype); register_driver(dtype);
} }

4
libraries/AP_Scripting/lua_bindings.cpp
View File

@ -464,7 +464,7 @@ int lua_get_CAN_device(lua_State *L) {
auto *scripting = AP::scripting(); auto *scripting = AP::scripting();
if (scripting->_CAN_dev == nullptr) { if (scripting->_CAN_dev == nullptr) {
scripting->_CAN_dev = new ScriptingCANSensor(AP_CANManager::Driver_Type::Driver_Type_Scripting); scripting->_CAN_dev = new ScriptingCANSensor(AP_CAN::Protocol::Scripting);
if (scripting->_CAN_dev == nullptr) { if (scripting->_CAN_dev == nullptr) {
return luaL_argerror(L, 1, "CAN device nullptr"); return luaL_argerror(L, 1, "CAN device nullptr");
} }
@ -489,7 +489,7 @@ int lua_get_CAN_device2(lua_State *L) {
auto *scripting = AP::scripting(); auto *scripting = AP::scripting();
if (scripting->_CAN_dev2 == nullptr) { if (scripting->_CAN_dev2 == nullptr) {
scripting->_CAN_dev2 = new ScriptingCANSensor(AP_CANManager::Driver_Type::Driver_Type_Scripting2); scripting->_CAN_dev2 = new ScriptingCANSensor(AP_CAN::Protocol::Scripting2);
if (scripting->_CAN_dev2 == nullptr) { if (scripting->_CAN_dev2 == nullptr) {
return luaL_argerror(L, 1, "CAN device nullptr"); return luaL_argerror(L, 1, "CAN device nullptr");
} }