diff --git a/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.cpp b/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.cpp index c0aedd793..c35625273 100644 --- a/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.cpp +++ b/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.cpp @@ -29,140 +29,140 @@ RGBController_ZalmanZSync::RGBController_ZalmanZSync(ZalmanZSyncController* cont Direct.color_mode = MODE_COLORS_PER_LED; modes.push_back(Direct); - mode RainbowWave; - RainbowWave.name = "Rainbow Wave"; - RainbowWave.value = ZALMAN_Z_SYNC_MODE_RAINBOW_WAVE; - RainbowWave.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR; - RainbowWave.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; - RainbowWave.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; - RainbowWave.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; - RainbowWave.direction = MODE_DIRECTION_RIGHT; - RainbowWave.color_mode = MODE_COLORS_NONE; - modes.push_back(RainbowWave); + // mode RainbowWave; + // RainbowWave.name = "Rainbow Wave"; + // RainbowWave.value = ZALMAN_Z_SYNC_MODE_RAINBOW_WAVE; + // RainbowWave.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR; + // RainbowWave.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; + // RainbowWave.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; + // RainbowWave.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; + // RainbowWave.direction = MODE_DIRECTION_RIGHT; + // RainbowWave.color_mode = MODE_COLORS_NONE; + // modes.push_back(RainbowWave); - mode ColorShift; - ColorShift.name = "Color Shift"; - ColorShift.value = ZALMAN_Z_SYNC_MODE_COLOR_SHIFT; - ColorShift.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; - ColorShift.colors_min = 2; - ColorShift.colors_max = 2; - ColorShift.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; - ColorShift.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; - ColorShift.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; - ColorShift.color_mode = MODE_COLORS_MODE_SPECIFIC; - ColorShift.colors.resize(2); - modes.push_back(ColorShift); + // mode ColorShift; + // ColorShift.name = "Color Shift"; + // ColorShift.value = ZALMAN_Z_SYNC_MODE_COLOR_SHIFT; + // ColorShift.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; + // ColorShift.colors_min = 2; + // ColorShift.colors_max = 2; + // ColorShift.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; + // ColorShift.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; + // ColorShift.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; + // ColorShift.color_mode = MODE_COLORS_MODE_SPECIFIC; + // ColorShift.colors.resize(2); + // modes.push_back(ColorShift); - mode ColorPulse; - ColorPulse.name = "Color Pulse"; - ColorPulse.value = ZALMAN_Z_SYNC_MODE_COLOR_PULSE; - ColorPulse.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; - ColorPulse.colors_min = 2; - ColorPulse.colors_max = 2; - ColorPulse.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; - ColorPulse.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; - ColorPulse.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; - ColorPulse.color_mode = MODE_COLORS_MODE_SPECIFIC; - ColorPulse.colors.resize(2); - modes.push_back(ColorPulse); + // mode ColorPulse; + // ColorPulse.name = "Color Pulse"; + // ColorPulse.value = ZALMAN_Z_SYNC_MODE_COLOR_PULSE; + // ColorPulse.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; + // ColorPulse.colors_min = 2; + // ColorPulse.colors_max = 2; + // ColorPulse.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; + // ColorPulse.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; + // ColorPulse.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; + // ColorPulse.color_mode = MODE_COLORS_MODE_SPECIFIC; + // ColorPulse.colors.resize(2); + // modes.push_back(ColorPulse); - mode ColorWave; - ColorWave.name = "Color Wave"; - ColorWave.value = ZALMAN_Z_SYNC_MODE_COLOR_WAVE; - ColorWave.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; - ColorWave.colors_min = 2; - ColorWave.colors_max = 2; - ColorWave.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; - ColorWave.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; - ColorWave.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; - ColorWave.direction = MODE_DIRECTION_RIGHT; - ColorWave.color_mode = MODE_COLORS_MODE_SPECIFIC; - ColorWave.colors.resize(2); - modes.push_back(ColorWave); + // mode ColorWave; + // ColorWave.name = "Color Wave"; + // ColorWave.value = ZALMAN_Z_SYNC_MODE_COLOR_WAVE; + // ColorWave.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; + // ColorWave.colors_min = 2; + // ColorWave.colors_max = 2; + // ColorWave.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; + // ColorWave.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; + // ColorWave.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; + // ColorWave.direction = MODE_DIRECTION_RIGHT; + // ColorWave.color_mode = MODE_COLORS_MODE_SPECIFIC; + // ColorWave.colors.resize(2); + // modes.push_back(ColorWave); - mode Static; - Static.name = "Static"; - Static.value = ZALMAN_Z_SYNC_MODE_STATIC; - Static.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR; - Static.colors_min = 1; - Static.colors_max = 1; - Static.color_mode = MODE_COLORS_MODE_SPECIFIC; - Static.colors.resize(1); - modes.push_back(Static); + // mode Static; + // Static.name = "Static"; + // Static.value = ZALMAN_Z_SYNC_MODE_STATIC; + // Static.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR; + // Static.colors_min = 1; + // Static.colors_max = 1; + // Static.color_mode = MODE_COLORS_MODE_SPECIFIC; + // Static.colors.resize(1); + // modes.push_back(Static); - mode Temperature; - Temperature.name = "Temperature"; - Temperature.value = ZALMAN_Z_SYNC_MODE_TEMPERATURE; - Temperature.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR; - Temperature.colors_min = 3; - Temperature.colors_max = 3; - Temperature.color_mode = MODE_COLORS_MODE_SPECIFIC; - Temperature.colors.resize(3); - modes.push_back(Temperature); + // mode Temperature; + // Temperature.name = "Temperature"; + // Temperature.value = ZALMAN_Z_SYNC_MODE_TEMPERATURE; + // Temperature.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR; + // Temperature.colors_min = 3; + // Temperature.colors_max = 3; + // Temperature.color_mode = MODE_COLORS_MODE_SPECIFIC; + // Temperature.colors.resize(3); + // modes.push_back(Temperature); - mode Visor; - Visor.name = "Visor"; - Visor.value = ZALMAN_Z_SYNC_MODE_VISOR; - Visor.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; - Visor.colors_min = 2; - Visor.colors_max = 2; - Visor.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; - Visor.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; - Visor.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; - Visor.color_mode = MODE_COLORS_MODE_SPECIFIC; - Visor.colors.resize(2); - modes.push_back(Visor); + // mode Visor; + // Visor.name = "Visor"; + // Visor.value = ZALMAN_Z_SYNC_MODE_VISOR; + // Visor.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; + // Visor.colors_min = 2; + // Visor.colors_max = 2; + // Visor.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; + // Visor.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; + // Visor.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; + // Visor.color_mode = MODE_COLORS_MODE_SPECIFIC; + // Visor.colors.resize(2); + // modes.push_back(Visor); - mode Marquee; - Marquee.name = "Marquee"; - Marquee.value = ZALMAN_Z_SYNC_MODE_MARQUEE; - Marquee.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; - Marquee.colors_min = 1; - Marquee.colors_max = 1; - Marquee.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; - Marquee.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; - Marquee.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; - Marquee.direction = MODE_DIRECTION_RIGHT; - Marquee.color_mode = MODE_COLORS_MODE_SPECIFIC; - Marquee.colors.resize(1); - modes.push_back(Marquee); + // mode Marquee; + // Marquee.name = "Marquee"; + // Marquee.value = ZALMAN_Z_SYNC_MODE_MARQUEE; + // Marquee.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; + // Marquee.colors_min = 1; + // Marquee.colors_max = 1; + // Marquee.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; + // Marquee.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; + // Marquee.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; + // Marquee.direction = MODE_DIRECTION_RIGHT; + // Marquee.color_mode = MODE_COLORS_MODE_SPECIFIC; + // Marquee.colors.resize(1); + // modes.push_back(Marquee); - mode Blink; - Blink.name = "Blink"; - Blink.value = ZALMAN_Z_SYNC_MODE_BLINK; - Blink.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; - Blink.colors_min = 2; - Blink.colors_max = 2; - Blink.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; - Blink.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; - Blink.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; - Blink.color_mode = MODE_COLORS_MODE_SPECIFIC; - Blink.colors.resize(2); - modes.push_back(Blink); + // mode Blink; + // Blink.name = "Blink"; + // Blink.value = ZALMAN_Z_SYNC_MODE_BLINK; + // Blink.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; + // Blink.colors_min = 2; + // Blink.colors_max = 2; + // Blink.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; + // Blink.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; + // Blink.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; + // Blink.color_mode = MODE_COLORS_MODE_SPECIFIC; + // Blink.colors.resize(2); + // modes.push_back(Blink); - mode Sequential; - Sequential.name = "Sequential"; - Sequential.value = ZALMAN_Z_SYNC_MODE_SEQUENTIAL; - Sequential.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; - Sequential.colors_min = 1; - Sequential.colors_max = 1; - Sequential.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; - Sequential.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; - Sequential.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; - Sequential.direction = MODE_DIRECTION_RIGHT; - Sequential.color_mode = MODE_COLORS_MODE_SPECIFIC; - Sequential.colors.resize(1); - modes.push_back(Sequential); + // mode Sequential; + // Sequential.name = "Sequential"; + // Sequential.value = ZALMAN_Z_SYNC_MODE_SEQUENTIAL; + // Sequential.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; + // Sequential.colors_min = 1; + // Sequential.colors_max = 1; + // Sequential.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; + // Sequential.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; + // Sequential.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; + // Sequential.direction = MODE_DIRECTION_RIGHT; + // Sequential.color_mode = MODE_COLORS_MODE_SPECIFIC; + // Sequential.colors.resize(1); + // modes.push_back(Sequential); - mode Rainbow; - Rainbow.name = "Rainbow"; - Rainbow.value = ZALMAN_Z_SYNC_MODE_RAINBOW; - Rainbow.flags = MODE_FLAG_HAS_SPEED; - Rainbow.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; - Rainbow.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; - Rainbow.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; - Rainbow.color_mode = MODE_COLORS_NONE; - modes.push_back(Rainbow); + // mode Rainbow; + // Rainbow.name = "Rainbow"; + // Rainbow.value = ZALMAN_Z_SYNC_MODE_RAINBOW; + // Rainbow.flags = MODE_FLAG_HAS_SPEED; + // Rainbow.speed_min = ZALMAN_Z_SYNC_SPEED_SLOW; + // Rainbow.speed_max = ZALMAN_Z_SYNC_SPEED_FAST; + // Rainbow.speed = ZALMAN_Z_SYNC_SPEED_MEDIUM; + // Rainbow.color_mode = MODE_COLORS_NONE; + // modes.push_back(Rainbow); SetupZones(); } @@ -300,21 +300,21 @@ void RGBController_ZalmanZSync::DeviceUpdateMode() } } - controller->SetChannelEffect(channel, - zones[channel].leds_count, - modes[active_mode].value, - modes[active_mode].speed, - direction, - random, - mode_colors[0], - mode_colors[1], - mode_colors[2], - mode_colors[3], - mode_colors[4], - mode_colors[5], - mode_colors[6], - mode_colors[7], - mode_colors[8]); + // controller->SetChannelEffect(channel, + // zones[channel].leds_count, + // modes[active_mode].value, + // modes[active_mode].speed, + // direction, + // random, + // mode_colors[0], + // mode_colors[1], + // mode_colors[2], + // mode_colors[3], + // mode_colors[4], + // mode_colors[5], + // mode_colors[6], + // mode_colors[7], + // mode_colors[8]); } } } diff --git a/Controllers/ZalmanZSyncController/ZalmanZSyncController.cpp b/Controllers/ZalmanZSyncController/ZalmanZSyncController.cpp index 6fcc00654..7d6a22c07 100644 --- a/Controllers/ZalmanZSyncController/ZalmanZSyncController.cpp +++ b/Controllers/ZalmanZSyncController/ZalmanZSyncController.cpp @@ -156,7 +156,7 @@ void ZalmanZSyncController::SetChannelLEDs(unsigned char channel, RGBColor * col /*-----------------------------------------------------*\ | Send Port State packet | \*-----------------------------------------------------*/ - SendPortState(channel, ZALMAN_Z_SYNC_PORT_STATE_SOFTWARE); + //SendPortState(channel, ZALMAN_Z_SYNC_PORT_STATE_SOFTWARE); /*-----------------------------------------------------*\ | Loop through colors and send 50 at a time | diff --git a/Controllers/ZalmanZSyncController/ZalmanZSyncController.h b/Controllers/ZalmanZSyncController/ZalmanZSyncController.h index d81f7abd3..83243956e 100644 --- a/Controllers/ZalmanZSyncController/ZalmanZSyncController.h +++ b/Controllers/ZalmanZSyncController/ZalmanZSyncController.h @@ -67,7 +67,7 @@ enum ZALMAN_Z_SYNC_CHANNEL_6 = 0x05, /* Channel 6 */ ZALMAN_Z_SYNC_CHANNEL_7 = 0x06, /* Channel 7 */ ZALMAN_Z_SYNC_CHANNEL_8 = 0x07, /* Channel 8 */ - ZALMAN_Z_SYNC_NUM_CHANNELS = 0x08, /* Number of channels */ + ZALMAN_Z_SYNC_NUM_CHANNELS = 0x04, /* Number of channels */ }; enum