Browse Source

Use LEDLightBezel instead of separate LEDBezel and LEDBezelLight.

tags/v2.0.1
Andrew Belt 3 years ago
parent
commit
e09da574ee
2 changed files with 20 additions and 42 deletions
  1. +10
    -21
      src/Mutes.cpp
  2. +10
    -21
      src/Pulses.cpp

+ 10
- 21
src/Mutes.cpp View File

@@ -111,16 +111,16 @@ struct MutesWidget : ModuleWidget {
addChild(createWidget<ScrewSilver>(Vec(15, 365)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365)));

addParam(createParam<LEDBezel>(mm2px(Vec(16.57, 18.165)), module, Mutes::MUTE_PARAMS + 0));
addParam(createParam<LEDBezel>(mm2px(Vec(16.57, 28.164)), module, Mutes::MUTE_PARAMS + 1));
addParam(createParam<LEDBezel>(mm2px(Vec(16.57, 38.164)), module, Mutes::MUTE_PARAMS + 2));
addParam(createParam<LEDBezel>(mm2px(Vec(16.57, 48.165)), module, Mutes::MUTE_PARAMS + 3));
addParam(createParam<LEDBezel>(mm2px(Vec(16.57, 58.164)), module, Mutes::MUTE_PARAMS + 4));
addParam(createParam<LEDBezel>(mm2px(Vec(16.57, 68.165)), module, Mutes::MUTE_PARAMS + 5));
addParam(createParam<LEDBezel>(mm2px(Vec(16.57, 78.164)), module, Mutes::MUTE_PARAMS + 6));
addParam(createParam<LEDBezel>(mm2px(Vec(16.57, 88.164)), module, Mutes::MUTE_PARAMS + 7));
addParam(createParam<LEDBezel>(mm2px(Vec(16.57, 98.165)), module, Mutes::MUTE_PARAMS + 8));
addParam(createParam<LEDBezel>(mm2px(Vec(16.57, 108.166)), module, Mutes::MUTE_PARAMS + 9));
addParam(createLightParam<LEDLightBezel<GreenLight>>(mm2px(Vec(16.57, 18.165)), module, Mutes::MUTE_PARAMS + 0, Mutes::MUTE_LIGHTS + 0));
addParam(createLightParam<LEDLightBezel<GreenLight>>(mm2px(Vec(16.57, 28.164)), module, Mutes::MUTE_PARAMS + 1, Mutes::MUTE_LIGHTS + 1));
addParam(createLightParam<LEDLightBezel<GreenLight>>(mm2px(Vec(16.57, 38.164)), module, Mutes::MUTE_PARAMS + 2, Mutes::MUTE_LIGHTS + 2));
addParam(createLightParam<LEDLightBezel<GreenLight>>(mm2px(Vec(16.57, 48.165)), module, Mutes::MUTE_PARAMS + 3, Mutes::MUTE_LIGHTS + 3));
addParam(createLightParam<LEDLightBezel<GreenLight>>(mm2px(Vec(16.57, 58.164)), module, Mutes::MUTE_PARAMS + 4, Mutes::MUTE_LIGHTS + 4));
addParam(createLightParam<LEDLightBezel<GreenLight>>(mm2px(Vec(16.57, 68.165)), module, Mutes::MUTE_PARAMS + 5, Mutes::MUTE_LIGHTS + 5));
addParam(createLightParam<LEDLightBezel<GreenLight>>(mm2px(Vec(16.57, 78.164)), module, Mutes::MUTE_PARAMS + 6, Mutes::MUTE_LIGHTS + 6));
addParam(createLightParam<LEDLightBezel<GreenLight>>(mm2px(Vec(16.57, 88.164)), module, Mutes::MUTE_PARAMS + 7, Mutes::MUTE_LIGHTS + 7));
addParam(createLightParam<LEDLightBezel<GreenLight>>(mm2px(Vec(16.57, 98.165)), module, Mutes::MUTE_PARAMS + 8, Mutes::MUTE_LIGHTS + 8));
addParam(createLightParam<LEDLightBezel<GreenLight>>(mm2px(Vec(16.57, 108.166)), module, Mutes::MUTE_PARAMS + 9, Mutes::MUTE_LIGHTS + 9));

addInput(createInput<PJ301MPort>(mm2px(Vec(4.214, 17.81)), module, Mutes::IN_INPUTS + 0));
addInput(createInput<PJ301MPort>(mm2px(Vec(4.214, 27.809)), module, Mutes::IN_INPUTS + 1));
@@ -143,17 +143,6 @@ struct MutesWidget : ModuleWidget {
addOutput(createOutput<PJ301MPort>(mm2px(Vec(28.214, 87.81)), module, Mutes::OUT_OUTPUTS + 7));
addOutput(createOutput<PJ301MPort>(mm2px(Vec(28.214, 97.809)), module, Mutes::OUT_OUTPUTS + 8));
addOutput(createOutput<PJ301MPort>(mm2px(Vec(28.214, 107.809)), module, Mutes::OUT_OUTPUTS + 9));

addChild(createLight<LEDBezelLight<GreenLight>>(mm2px(Vec(17.32, 18.915)), module, Mutes::MUTE_LIGHTS + 0));
addChild(createLight<LEDBezelLight<GreenLight>>(mm2px(Vec(17.32, 28.916)), module, Mutes::MUTE_LIGHTS + 1));
addChild(createLight<LEDBezelLight<GreenLight>>(mm2px(Vec(17.32, 38.915)), module, Mutes::MUTE_LIGHTS + 2));
addChild(createLight<LEDBezelLight<GreenLight>>(mm2px(Vec(17.32, 48.915)), module, Mutes::MUTE_LIGHTS + 3));
addChild(createLight<LEDBezelLight<GreenLight>>(mm2px(Vec(17.32, 58.916)), module, Mutes::MUTE_LIGHTS + 4));
addChild(createLight<LEDBezelLight<GreenLight>>(mm2px(Vec(17.32, 68.916)), module, Mutes::MUTE_LIGHTS + 5));
addChild(createLight<LEDBezelLight<GreenLight>>(mm2px(Vec(17.32, 78.915)), module, Mutes::MUTE_LIGHTS + 6));
addChild(createLight<LEDBezelLight<GreenLight>>(mm2px(Vec(17.32, 88.916)), module, Mutes::MUTE_LIGHTS + 7));
addChild(createLight<LEDBezelLight<GreenLight>>(mm2px(Vec(17.32, 98.915)), module, Mutes::MUTE_LIGHTS + 8));
addChild(createLight<LEDBezelLight<GreenLight>>(mm2px(Vec(17.32, 108.915)), module, Mutes::MUTE_LIGHTS + 9));
}
};



+ 10
- 21
src/Pulses.cpp View File

@@ -56,16 +56,16 @@ struct PulsesWidget : ModuleWidget {
addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));

addParam(createParamCentered<LEDBezel>(mm2px(Vec(8.32, 21.505)), module, Pulses::TAP_PARAMS + 0));
addParam(createParamCentered<LEDBezel>(mm2px(Vec(8.32, 31.504)), module, Pulses::TAP_PARAMS + 1));
addParam(createParamCentered<LEDBezel>(mm2px(Vec(8.32, 41.505)), module, Pulses::TAP_PARAMS + 2));
addParam(createParamCentered<LEDBezel>(mm2px(Vec(8.32, 51.505)), module, Pulses::TAP_PARAMS + 3));
addParam(createParamCentered<LEDBezel>(mm2px(Vec(8.32, 61.505)), module, Pulses::TAP_PARAMS + 4));
addParam(createParamCentered<LEDBezel>(mm2px(Vec(8.32, 71.505)), module, Pulses::TAP_PARAMS + 5));
addParam(createParamCentered<LEDBezel>(mm2px(Vec(8.32, 81.505)), module, Pulses::TAP_PARAMS + 6));
addParam(createParamCentered<LEDBezel>(mm2px(Vec(8.32, 91.504)), module, Pulses::TAP_PARAMS + 7));
addParam(createParamCentered<LEDBezel>(mm2px(Vec(8.32, 101.505)), module, Pulses::TAP_PARAMS + 8));
addParam(createParamCentered<LEDBezel>(mm2px(Vec(8.32, 111.505)), module, Pulses::TAP_PARAMS + 9));
addParam(createLightParamCentered<LEDLightBezel<GreenLight>>(mm2px(Vec(8.32, 21.505)), module, Pulses::TAP_PARAMS + 0, Pulses::TAP_LIGHTS + 0));
addParam(createLightParamCentered<LEDLightBezel<GreenLight>>(mm2px(Vec(8.32, 31.504)), module, Pulses::TAP_PARAMS + 1, Pulses::TAP_LIGHTS + 1));
addParam(createLightParamCentered<LEDLightBezel<GreenLight>>(mm2px(Vec(8.32, 41.505)), module, Pulses::TAP_PARAMS + 2, Pulses::TAP_LIGHTS + 2));
addParam(createLightParamCentered<LEDLightBezel<GreenLight>>(mm2px(Vec(8.32, 51.505)), module, Pulses::TAP_PARAMS + 3, Pulses::TAP_LIGHTS + 3));
addParam(createLightParamCentered<LEDLightBezel<GreenLight>>(mm2px(Vec(8.32, 61.505)), module, Pulses::TAP_PARAMS + 4, Pulses::TAP_LIGHTS + 4));
addParam(createLightParamCentered<LEDLightBezel<GreenLight>>(mm2px(Vec(8.32, 71.505)), module, Pulses::TAP_PARAMS + 5, Pulses::TAP_LIGHTS + 5));
addParam(createLightParamCentered<LEDLightBezel<GreenLight>>(mm2px(Vec(8.32, 81.505)), module, Pulses::TAP_PARAMS + 6, Pulses::TAP_LIGHTS + 6));
addParam(createLightParamCentered<LEDLightBezel<GreenLight>>(mm2px(Vec(8.32, 91.504)), module, Pulses::TAP_PARAMS + 7, Pulses::TAP_LIGHTS + 7));
addParam(createLightParamCentered<LEDLightBezel<GreenLight>>(mm2px(Vec(8.32, 101.505)), module, Pulses::TAP_PARAMS + 8, Pulses::TAP_LIGHTS + 8));
addParam(createLightParamCentered<LEDLightBezel<GreenLight>>(mm2px(Vec(8.32, 111.505)), module, Pulses::TAP_PARAMS + 9, Pulses::TAP_LIGHTS + 9));

addOutput(createOutputCentered<PJ301MPort>(mm2px(Vec(20.319, 21.504)), module, Pulses::TRIG_OUTPUTS + 0));
addOutput(createOutputCentered<PJ301MPort>(mm2px(Vec(32.319, 21.504)), module, Pulses::GATE_OUTPUTS + 0));
@@ -87,17 +87,6 @@ struct PulsesWidget : ModuleWidget {
addOutput(createOutputCentered<PJ301MPort>(mm2px(Vec(32.319, 101.504)), module, Pulses::GATE_OUTPUTS + 8));
addOutput(createOutputCentered<PJ301MPort>(mm2px(Vec(20.319, 111.504)), module, Pulses::TRIG_OUTPUTS + 9));
addOutput(createOutputCentered<PJ301MPort>(mm2px(Vec(32.319, 111.504)), module, Pulses::GATE_OUTPUTS + 9));

addChild(createLightCentered<LEDBezelLight<GreenLight>>(mm2px(Vec(8.32, 21.505)), module, Pulses::TAP_LIGHTS + 0));
addChild(createLightCentered<LEDBezelLight<GreenLight>>(mm2px(Vec(8.32, 31.504)), module, Pulses::TAP_LIGHTS + 1));
addChild(createLightCentered<LEDBezelLight<GreenLight>>(mm2px(Vec(8.32, 41.505)), module, Pulses::TAP_LIGHTS + 2));
addChild(createLightCentered<LEDBezelLight<GreenLight>>(mm2px(Vec(8.32, 51.505)), module, Pulses::TAP_LIGHTS + 3));
addChild(createLightCentered<LEDBezelLight<GreenLight>>(mm2px(Vec(8.32, 61.505)), module, Pulses::TAP_LIGHTS + 4));
addChild(createLightCentered<LEDBezelLight<GreenLight>>(mm2px(Vec(8.32, 71.505)), module, Pulses::TAP_LIGHTS + 5));
addChild(createLightCentered<LEDBezelLight<GreenLight>>(mm2px(Vec(8.32, 81.505)), module, Pulses::TAP_LIGHTS + 6));
addChild(createLightCentered<LEDBezelLight<GreenLight>>(mm2px(Vec(8.32, 91.504)), module, Pulses::TAP_LIGHTS + 7));
addChild(createLightCentered<LEDBezelLight<GreenLight>>(mm2px(Vec(8.32, 101.505)), module, Pulses::TAP_LIGHTS + 8));
addChild(createLightCentered<LEDBezelLight<GreenLight>>(mm2px(Vec(8.32, 111.505)), module, Pulses::TAP_LIGHTS + 9));
}
};



Loading…
Cancel
Save