Migrates residual Lts sources to generated rtiddsgen API
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
1 parent
5485a90385
commit
881d44f4dd
512 files changed
+6887
-6426
No files matched your search
+8
-8
@@ -54,14 +54,14 @@ public:
|
||||
// TODO: raus, String soll gepublished werden
|
||||
static QString groupEnumToGroupName(const Core::ServiceGroupType &type)
|
||||
{
|
||||
QMap<QString, Core::ServiceGroupType_def::type> groupNameMapping;
|
||||
groupNameMapping.insert(QLatin1String("Master"), Core::ServiceGroupType_def::Master);
|
||||
groupNameMapping.insert(QLatin1String("Core"), Core::ServiceGroupType_def::Core);
|
||||
groupNameMapping.insert(QLatin1String("ExercisePreparation"), Core::ServiceGroupType_def::ExercisePreparation);
|
||||
groupNameMapping.insert(QLatin1String("ExerciseExecution"), Core::ServiceGroupType_def::ExerciseExecution);
|
||||
groupNameMapping.insert(QLatin1String("ExercisePaused"), Core::ServiceGroupType_def::ExercisePaused);
|
||||
groupNameMapping.insert(QLatin1String("ExerciseAfterActionReview"), Core::ServiceGroupType_def::ExerciseAfterActionReview);
|
||||
groupNameMapping.insert(QLatin1String("Playback"), Core::ServiceGroupType_def::Playback);
|
||||
QMap<QString, Core::ServiceGroupType> groupNameMapping;
|
||||
groupNameMapping.insert(QLatin1String("Master"), Core::ServiceGroupType::Master);
|
||||
groupNameMapping.insert(QLatin1String("Core"), Core::ServiceGroupType::Core);
|
||||
groupNameMapping.insert(QLatin1String("ExercisePreparation"), Core::ServiceGroupType::ExercisePreparation);
|
||||
groupNameMapping.insert(QLatin1String("ExerciseExecution"), Core::ServiceGroupType::ExerciseExecution);
|
||||
groupNameMapping.insert(QLatin1String("ExercisePaused"), Core::ServiceGroupType::ExercisePaused);
|
||||
groupNameMapping.insert(QLatin1String("ExerciseAfterActionReview"), Core::ServiceGroupType::ExerciseAfterActionReview);
|
||||
groupNameMapping.insert(QLatin1String("Playback"), Core::ServiceGroupType::Playback);
|
||||
|
||||
return groupNameMapping.key(type.underlying());
|
||||
}
|
||||
|
||||
+7
-7
@@ -74,25 +74,25 @@ void ServiceWidget::setState(Core::RunningState state)
|
||||
switch (state.underlying())
|
||||
{
|
||||
// STARTING
|
||||
case Core::RunningState::inner_enum::Starting:
|
||||
case Core::RunningState::Starting:
|
||||
status = ServiceWidget::STARTING;
|
||||
break;
|
||||
|
||||
// STARTED
|
||||
case Core::RunningState::inner_enum::Running:
|
||||
case Core::RunningState::Running:
|
||||
status = ServiceWidget::STARTED;
|
||||
break;
|
||||
|
||||
// STOPPING
|
||||
case Core::RunningState::inner_enum::Stopping:
|
||||
case Core::RunningState::Stopping:
|
||||
status = ServiceWidget::STOPPING;
|
||||
break;
|
||||
|
||||
// STOPPED
|
||||
case Core::RunningState::inner_enum::StartingError:
|
||||
case Core::RunningState::inner_enum::NotYetStarted:
|
||||
case Core::RunningState::inner_enum::StoppedNormally:
|
||||
case Core::RunningState::inner_enum::StoppedError: // FIXME: how does that look like? was STARTED but is not stoppable and still STARTED?
|
||||
case Core::RunningState::StartingError:
|
||||
case Core::RunningState::NotYetStarted:
|
||||
case Core::RunningState::StoppedNormally:
|
||||
case Core::RunningState::StoppedError: // FIXME: how does that look like? was STARTED but is not stoppable and still STARTED?
|
||||
status = ServiceWidget::STOPPED;
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user