keyboard/mouse control for native

This commit is contained in:
mverch67 2024-05-28 14:46:49 +02:00
parent 77ad95e30a
commit b8b8e47eaa
4 changed files with 9 additions and 3 deletions

@ -1 +1 @@
Subproject commit a4994c751897ef52d872098c441cdb98a1b5967e Subproject commit 901020302a8e6b174142488d117eb916e5212781

View File

@ -665,8 +665,9 @@ void setup()
#ifdef PORTDUINO #ifdef PORTDUINO
if (settingsMap[displayPanel] != no_screen) { if (settingsMap[displayPanel] != no_screen) {
DisplayDriverConfig displayConfig; DisplayDriverConfig displayConfig;
char *panels[] = {"NOSCREEN", "X11", "ST7789", "ST7735", "ST7735S", "ST7796", "ILI9341", "ILI9486", "ILI9488", "HX8357D"}; static char *panels[] = {"NOSCREEN", "X11", "ST7789", "ST7735", "ST7735S",
char *touch[] = {"NOTOUCH", "XPT2046", "STMPE610", "GT911", "FT5x06"}; "ST7796", "ILI9341", "ILI9486", "ILI9488", "HX8357D"};
static char *touch[] = {"NOTOUCH", "XPT2046", "STMPE610", "GT911", "FT5x06"};
#ifdef USE_X11 #ifdef USE_X11
if (settingsMap[displayPanel] == x11) { if (settingsMap[displayPanel] == x11) {
if (settingsMap[displayWidth] && settingsMap[displayHeight]) if (settingsMap[displayWidth] && settingsMap[displayHeight])
@ -696,6 +697,8 @@ void setup()
.spi{.pin_dc = (int8_t)settingsMap[displayDC], .spi{.pin_dc = (int8_t)settingsMap[displayDC],
.use_lock = true, .use_lock = true,
.spi_host = (uint16_t)settingsMap[displayspidev]}}) .spi_host = (uint16_t)settingsMap[displayspidev]}})
.input(DisplayDriverConfig::input_config_t{.keyboardDevice = settingsStrings[keyboardDevice],
.pointerDevice = settingsStrings[pointerDevice]})
.light(DisplayDriverConfig::light_config_t{.pin_bl = (int16_t)settingsMap[displayBacklight], .light(DisplayDriverConfig::light_config_t{.pin_bl = (int16_t)settingsMap[displayBacklight],
.pwm_channel = (int8_t)settingsMap[displayBacklightPWMChannel], .pwm_channel = (int8_t)settingsMap[displayBacklightPWMChannel],
.invert = (bool)settingsMap[displayBacklightInvert]}); .invert = (bool)settingsMap[displayBacklightInvert]});

View File

@ -93,6 +93,7 @@ void portduinoSetup()
std::string gpioChipName = "gpiochip"; std::string gpioChipName = "gpiochip";
settingsStrings[i2cdev] = ""; settingsStrings[i2cdev] = "";
settingsStrings[keyboardDevice] = ""; settingsStrings[keyboardDevice] = "";
settingsStrings[pointerDevice] = "";
settingsStrings[webserverrootpath] = ""; settingsStrings[webserverrootpath] = "";
settingsStrings[spidev] = ""; settingsStrings[spidev] = "";
settingsStrings[displayspidev] = ""; settingsStrings[displayspidev] = "";
@ -270,6 +271,7 @@ void portduinoSetup()
} }
if (yamlConfig["Input"]) { if (yamlConfig["Input"]) {
settingsStrings[keyboardDevice] = (yamlConfig["Input"]["KeyboardDevice"]).as<std::string>(""); settingsStrings[keyboardDevice] = (yamlConfig["Input"]["KeyboardDevice"]).as<std::string>("");
settingsStrings[pointerDevice] = (yamlConfig["Input"]["PointerDevice"]).as<std::string>("");
} }
if (yamlConfig["Webserver"]) { if (yamlConfig["Webserver"]) {

View File

@ -45,6 +45,7 @@ enum configNames {
displayOffsetY, displayOffsetY,
displayInvert, displayInvert,
keyboardDevice, keyboardDevice,
pointerDevice,
logoutputlevel, logoutputlevel,
webserver, webserver,
webserverport, webserverport,