Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Notify: use simulated toshiba LED for display rather than directly

Browse Source
This commit is contained in:
Peter Barker 2023-02-27 12:20:09 +11:00 committed by Andrew Tridgell
parent 8f7f0d5e72
commit abd7fa11c1
2 changed files with 6 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libraries/AP_Notify/SITL_SFML_LED.cpp
View File

@ -25,14 +25,6 @@
#include "SITL_SFML_LED.h" #include "SITL_SFML_LED.h"
SITL_SFML_LED::SITL_SFML_LED():
RGBLed((uint8_t)brightness::LED_OFF,
(uint8_t)brightness::LED_HIGH,
(uint8_t)brightness::LED_MEDIUM,
(uint8_t)brightness::LED_LOW)
{
}
/* /*
return layout size for a LED layout scheme return layout size for a LED layout scheme
*/ */
@ -176,37 +168,9 @@ void SITL_SFML_LED::update_serial_LEDs()
void SITL_SFML_LED::update_thread(void) void SITL_SFML_LED::update_thread(void)
{ {
sf::RenderWindow *w = nullptr;
{
WITH_SEMAPHORE(AP::notify().sf_window_mutex);
w = new sf::RenderWindow(sf::VideoMode(width, height), "LED");
}
if (!w) {
AP_HAL::panic("Unable to create RGBLed window");
}
while (true) { while (true) {
{ {
WITH_SEMAPHORE(AP::notify().sf_window_mutex); WITH_SEMAPHORE(AP::notify().sf_window_mutex);
sf::Event event;
while (w->pollEvent(event)) {
if (event.type == sf::Event::Closed) {
w->close();
break;
}
}
if (!w->isOpen()) {
break;
}
const uint32_t colour = red<<16 | green<<8 | blue;
if (colour != last_colour) {
last_colour = colour;
w->clear(sf::Color(red, green, blue, 255));
w->display();
}
update_serial_LEDs(); update_serial_LEDs();
} }
usleep(10000); usleep(10000);
@ -227,12 +191,9 @@ bool SITL_SFML_LED::init()
return true; return true;
} }
bool SITL_SFML_LED::hw_set_rgb(uint8_t _red, uint8_t _green, uint8_t _blue) void SITL_SFML_LED::update()
{ {
red = _red; // all updates are done in the thread
green = _green;
blue = _blue;
return true;
} }
#endif #endif

26
libraries/AP_Notify/SITL_SFML_LED.h
View File

@ -31,22 +31,18 @@
#ifdef WITH_SITL_RGBLED #ifdef WITH_SITL_RGBLED
#include "RGBLed.h"
#ifdef HAVE_SFML_GRAPHICS_H #ifdef HAVE_SFML_GRAPHICS_H
#include <SFML/Graphics.h> #include <SFML/Graphics.h>
#else #else
#include <SFML/Graphics.hpp> #include <SFML/Graphics.hpp>
#endif #endif
class SITL_SFML_LED: public RGBLed class SITL_SFML_LED : public NotifyDevice
{ {
public: public:
SITL_SFML_LED(); SITL_SFML_LED() {}
bool init(void) override; bool init(void) override;
void update() override;
protected:
bool hw_set_rgb(uint8_t r, uint8_t g, uint8_t b) override;
private: private:
@ -55,24 +51,8 @@ private:
void update_serial_LEDs(void); void update_serial_LEDs(void);
static void *update_thread_start(void *obj); static void *update_thread_start(void *obj);
static constexpr uint8_t height = 50;
static constexpr uint8_t width = height;
static constexpr uint8_t serialLED_size = 16; static constexpr uint8_t serialLED_size = 16;
enum class brightness {
LED_LOW = 0x33,
LED_MEDIUM = 0x7F,
LED_HIGH = 0xFF,
LED_OFF = 0x00
};
uint32_t last_colour;
uint8_t red;
uint8_t green;
uint8_t blue;
static const uint8_t MAX_LEDS = 64; static const uint8_t MAX_LEDS = 64;
// LED layout control // LED layout control