Rename all the flux and image types to prefix the enums, due to them being in

the global namespace now.
This commit is contained in:
David Given
2023-07-24 02:18:53 +02:00
parent 9867f8c302
commit b9ef5b7db8
47 changed files with 181 additions and 187 deletions

View File

@@ -10,31 +10,31 @@ std::unique_ptr<FluxSource> FluxSource::create(const FluxSourceProto& config)
{
switch (config.type())
{
case FluxSourceSinkType::DRIVE:
case FLUXTYPE_DRIVE:
return createHardwareFluxSource(config.drive());
case FluxSourceSinkType::ERASE:
case FLUXTYPE_ERASE:
return createEraseFluxSource(config.erase());
case FluxSourceSinkType::KRYOFLUX:
case FLUXTYPE_KRYOFLUX:
return createKryofluxFluxSource(config.kryoflux());
case FluxSourceSinkType::TEST_PATTERN:
case FLUXTYPE_TEST_PATTERN:
return createTestPatternFluxSource(config.test_pattern());
case FluxSourceSinkType::SCP:
case FLUXTYPE_SCP:
return createScpFluxSource(config.scp());
case FluxSourceSinkType::A2R:
case FLUXTYPE_A2R:
return createA2rFluxSource(config.a2r());
case FluxSourceSinkType::CWF:
case FLUXTYPE_CWF:
return createCwfFluxSource(config.cwf());
case FluxSourceSinkType::FLUX:
case FLUXTYPE_FLUX:
return createFl2FluxSource(config.fl2());
case FluxSourceSinkType::FLX:
case FLUXTYPE_FLX:
return createFlxFluxSource(config.flx());
default:

View File

@@ -41,7 +41,8 @@ message FlxFluxSourceProto {
// NEXT: 12
message FluxSourceProto {
optional FluxSourceSinkType type = 9 [default = NOT_SET, (help) = "flux source type"];
optional FluxSourceSinkType type = 9
[default = FLUXTYPE_NOT_SET, (help) = "flux source type"];
optional A2rFluxSourceProto a2r = 11;
optional CwfFluxSourceProto cwf = 7;