Reworked data types, part II
This commit is contained in:
@@ -10,34 +10,17 @@ BCCanDriver::BCCanDriver(QObject* parent )
|
||||
|
||||
}
|
||||
|
||||
BCCanDriver::dState BCCanDriver::getState()
|
||||
BCCanDriver::DriverState BCCanDriver::getState() const
|
||||
{
|
||||
return _driverState;
|
||||
}
|
||||
|
||||
void BCCanDriver::setState( dState newState )
|
||||
void BCCanDriver::setState( DriverState newState )
|
||||
{
|
||||
_driverState = newState;
|
||||
}
|
||||
|
||||
QString BCCanDriver::stateLabel( dState state )
|
||||
{
|
||||
switch( (int) state )
|
||||
{
|
||||
case sDriverError:
|
||||
return stDriverError;
|
||||
|
||||
case sIdle:
|
||||
return stIdle;
|
||||
|
||||
case sLoaded:
|
||||
return stLoaded;
|
||||
|
||||
case sReady:
|
||||
return stReady;
|
||||
};
|
||||
|
||||
}
|
||||
/**
|
||||
*
|
||||
* @brief Der Slot, der das Initialisieren des Treibers auslöst.
|
||||
@@ -56,7 +39,7 @@ void BCCanDriver::onStartDriver()
|
||||
{
|
||||
|
||||
// erstmal die Dll Laden: State::sIdle -> State::sLoaded
|
||||
if( BCCanDriver::sIdle == _driverState )
|
||||
if( _driverState == DriverState::NotPresent)
|
||||
_driverState = loadDriver();
|
||||
|
||||
emit stateChanged( (int) _driverState );
|
||||
|
||||
Reference in New Issue
Block a user