From 09b272b8409edd3feac61399ae9302a7ba202bff Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 10 Feb 2020 14:11:40 +1100 Subject: [PATCH] SITL: added SIM_LED_LAYOUT parameter for layout of simulated LEDs --- libraries/SITL/SITL.cpp | 5 +++-- libraries/SITL/SITL.h | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libraries/SITL/SITL.cpp b/libraries/SITL/SITL.cpp index 5d6ce86fb8..2b1bfd75de 100644 --- a/libraries/SITL/SITL.cpp +++ b/libraries/SITL/SITL.cpp @@ -219,15 +219,16 @@ const AP_Param::GroupInfo SITL::var_info2[] = { const AP_Param::GroupInfo SITL::var_info3[] = { AP_GROUPINFO("ODOM_ENABLE", 1, SITL, odom_enable, 0), AP_GROUPINFO("GPS2_POS", 2, SITL, gps_pos_offset[1], 0), - AP_GROUPINFO("MAG1_DEVID", 3, SITL, mag_devid[0], 97539), + AP_GROUPINFO("MAG1_DEVID", 3, SITL, mag_devid[0], 97539), AP_GROUPINFO("MAG2_DEVID", 4, SITL, mag_devid[1], 131874), AP_GROUPINFO("MAG3_DEVID", 5, SITL, mag_devid[2], 263178), AP_GROUPINFO("MAG4_DEVID", 6, SITL, mag_devid[3], 97283), AP_GROUPINFO("MAG5_DEVID", 7, SITL, mag_devid[4], 97795), AP_GROUPINFO("MAG6_DEVID", 8, SITL, mag_devid[5], 98051), AP_GROUPINFO("MAG7_DEVID", 9, SITL, mag_devid[6], 0), - AP_GROUPINFO("MAG8_DEVID", 10, SITL, mag_devid[7], 0), + AP_GROUPINFO("MAG8_DEVID", 10, SITL, mag_devid[7], 0), + AP_GROUPINFO("LED_LAYOUT", 11, SITL, led_layout, 0), AP_GROUPEND }; diff --git a/libraries/SITL/SITL.h b/libraries/SITL/SITL.h index 59b647980f..fc7461d381 100644 --- a/libraries/SITL/SITL.h +++ b/libraries/SITL/SITL.h @@ -19,6 +19,11 @@ namespace SITL { +enum class LedLayout { + ROWS=0, + LUMINOUSBEE=1, +}; + struct vector3f_array { uint16_t length; Vector3f *data; @@ -348,6 +353,8 @@ public: } led; EFI_MegaSquirt efi_ms; + + AP_Int8 led_layout; }; } // namespace SITL