Adding Metadata to Viewsonic controller

+ Includes code cleanup
+ Removed redundant function
This commit is contained in:
Chris
2023-02-04 10:08:27 +11:00
parent 0b78d81c4e
commit fed086e0c2
3 changed files with 58 additions and 52 deletions

View File

@@ -8,65 +8,75 @@
#include <string>
/**------------------------------------------------------------------*\
@name Viewsonic Monitor
@category Accessory
@type USB
@save :x:
@direct :x:
@effects :white_check_mark:
@detectors DetectViewSonic
@comment
\*-------------------------------------------------------------------*/
RGBController_XG270QG::RGBController_XG270QG(VS_XG270QG_Controller* controller_ptr)
{
controller = controller_ptr;
name = "ViewSonic Elite XG270QG";
vendor = "ViewSonic";
version = controller->GetVersion();
type = DEVICE_TYPE_UNKNOWN;
type = DEVICE_TYPE_ACCESSORY;
description = "ViewSonic Monitor";
location = controller->GetLocation();
serial = controller->GetSerial();
mode Off;
Off.name = "Off";
Off.value = VS_MODE_OFF;
Off.color_mode = MODE_COLORS_NONE;
Off.name = "Off";
Off.value = VS_MODE_OFF;
Off.color_mode = MODE_COLORS_NONE;
modes.push_back(Off);
mode StaticColor;
StaticColor.name = "Static";
StaticColor.value = VS_MODE_STATIC;
StaticColor.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE;
StaticColor.colors_min = 1;
StaticColor.colors_max = 1;
StaticColor.color_mode = MODE_COLORS_MODE_SPECIFIC;
StaticColor.name = "Static";
StaticColor.value = VS_MODE_STATIC;
StaticColor.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE;
StaticColor.colors_min = 1;
StaticColor.colors_max = 1;
StaticColor.color_mode = MODE_COLORS_MODE_SPECIFIC;
StaticColor.colors.resize(1);
modes.push_back(StaticColor);
mode Rainbow;
Rainbow.name = "Rainbow Wave";
Rainbow.value = VS_MODE_RAINBOW;
Rainbow.flags = MODE_FLAG_AUTOMATIC_SAVE;
Rainbow.color_mode = MODE_COLORS_NONE;
Rainbow.name = "Rainbow Wave";
Rainbow.value = VS_MODE_RAINBOW;
Rainbow.flags = MODE_FLAG_AUTOMATIC_SAVE;
Rainbow.color_mode = MODE_COLORS_NONE;
modes.push_back(Rainbow);
mode Breath;
Breath.name = "Breathing";
Breath.value = VS_MODE_BREATHING;
Breath.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE;
Breath.colors_min = 1;
Breath.colors_max = 1;
Breath.color_mode = MODE_COLORS_MODE_SPECIFIC;
Breath.name = "Breathing";
Breath.value = VS_MODE_BREATHING;
Breath.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE;
Breath.colors_min = 1;
Breath.colors_max = 1;
Breath.color_mode = MODE_COLORS_MODE_SPECIFIC;
Breath.colors.resize(1);
modes.push_back(Breath);
mode Waterfall;
Waterfall.name = "Waterfall";
Waterfall.value = VS_MODE_WATERFALL;
Waterfall.flags = MODE_FLAG_AUTOMATIC_SAVE;
Waterfall.color_mode = MODE_COLORS_NONE;
Waterfall.name = "Waterfall";
Waterfall.value = VS_MODE_WATERFALL;
Waterfall.flags = MODE_FLAG_AUTOMATIC_SAVE;
Waterfall.color_mode = MODE_COLORS_NONE;
modes.push_back(Waterfall);
mode Elite;
Elite.name = "Elite";
Elite.value = VS_MODE_ELITE;
Elite.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE;
Elite.colors_min = 1;
Elite.colors_max = 1;
Elite.color_mode = MODE_COLORS_MODE_SPECIFIC;
Elite.name = "Elite";
Elite.value = VS_MODE_ELITE;
Elite.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE;
Elite.colors_min = 1;
Elite.colors_max = 1;
Elite.color_mode = MODE_COLORS_MODE_SPECIFIC;
Elite.colors.resize(1);
modes.push_back(Elite);
@@ -94,27 +104,29 @@ RGBController_XG270QG::RGBController_XG270QG(VS_XG270QG_Controller* controller_p
void RGBController_XG270QG::SetupZones()
{
zone back_circle;
back_circle.name = "back circle";
back_circle.type = ZONE_TYPE_SINGLE;
back_circle.leds_min = 1;
back_circle.leds_max = 1;
back_circle.leds_count = 1;
back_circle.name = "Back Circle";
back_circle.type = ZONE_TYPE_SINGLE;
back_circle.leds_min = 1;
back_circle.leds_max = 1;
back_circle.leds_count = 1;
zones.push_back(back_circle);
zone down;
down.name = "down stuff";
down.type = ZONE_TYPE_SINGLE;
down.leds_min = 1;
down.leds_max = 1;
down.leds_count = 1;
down.name = "Down Stuff";
down.type = ZONE_TYPE_SINGLE;
down.leds_min = 1;
down.leds_max = 1;
down.leds_count = 1;
zones.push_back(down);
led back;
back.name = "back";
back.value = 0x00;
back.name = "Back";
back.value = 0x00;
leds.push_back(back);
led d;
d.name = "down";
d.value = 0x01;
d.name = "Down";
d.value = 0x01;
leds.push_back(d);
SetupColors();
@@ -156,4 +168,4 @@ void RGBController_XG270QG::DeviceUpdateMode()
b = RGBGetBValue(modes[active_mode].colors[0]);
}
controller->SetMode(modes[active_mode].value, r, g, b);
}
}

View File

@@ -19,11 +19,6 @@ VS_XG270QG_Controller::~VS_XG270QG_Controller()
hid_close(dev);
}
std::string VS_XG270QG_Controller::GetVersion()
{
return "?";
}
std::string VS_XG270QG_Controller::GetLocation()
{
return location;

View File

@@ -35,7 +35,6 @@ public:
VS_XG270QG_Controller(hid_device* device, const char* path);
~VS_XG270QG_Controller();
std::string GetVersion();
std::string GetLocation();
std::string GetSerial();