ClientKernel: prefix members with m_
Now m_isUpdatingFromKernel P.S. I'm tired of rebasing!
Dieser Commit ist enthalten in:
Ursprung
45cbc58c2a
Commit
39eef0f273
@ -241,24 +241,24 @@ void ClientKernel::receive(const Message& message)
|
||||
|
||||
if(has(changes, DecoderChangeFlags::EmergencyStop))
|
||||
{
|
||||
isUpdatingDecoderFromKernel = true;
|
||||
m_isUpdatingDecoderFromKernel = true;
|
||||
decoder->emergencyStop = isEStop;
|
||||
}
|
||||
|
||||
if(has(changes, DecoderChangeFlags::Direction))
|
||||
{
|
||||
isUpdatingDecoderFromKernel = true;
|
||||
m_isUpdatingDecoderFromKernel = true;
|
||||
decoder->direction = dir;
|
||||
}
|
||||
|
||||
if(has(changes, DecoderChangeFlags::Throttle | DecoderChangeFlags::SpeedSteps))
|
||||
{
|
||||
isUpdatingDecoderFromKernel = true;
|
||||
m_isUpdatingDecoderFromKernel = true;
|
||||
decoder->throttle = throttle;
|
||||
}
|
||||
|
||||
//Reset flag guard at end
|
||||
isUpdatingDecoderFromKernel = false;
|
||||
m_isUpdatingDecoderFromKernel = false;
|
||||
|
||||
//Function get always updated because we do not store a copy in cache
|
||||
//so there is no way to tell in advance if they changed
|
||||
@ -504,7 +504,7 @@ void ClientKernel::decoderChanged(const Decoder& decoder, DecoderChangeFlags cha
|
||||
if(const auto& f = decoder.getFunction(functionNumber))
|
||||
funcVal = toTriState(f->value);
|
||||
|
||||
if(isUpdatingDecoderFromKernel)
|
||||
if(m_isUpdatingDecoderFromKernel)
|
||||
{
|
||||
//This change was caused by Z21 message so there is not point
|
||||
//on informing back Z21 with another message
|
||||
@ -512,7 +512,7 @@ void ClientKernel::decoderChanged(const Decoder& decoder, DecoderChangeFlags cha
|
||||
//at a new value (EventLoop is slower to process callbacks)
|
||||
//But reset the guard to allow Train and other parts of code
|
||||
//to react to this change and further edit decoder state
|
||||
isUpdatingDecoderFromKernel = false;
|
||||
m_isUpdatingDecoderFromKernel = false;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -128,7 +128,7 @@ class ClientKernel final : public Kernel
|
||||
};
|
||||
|
||||
std::unordered_map<uint16_t, LocoCache> m_locoCache;
|
||||
bool isUpdatingDecoderFromKernel = false;
|
||||
bool m_isUpdatingDecoderFromKernel = false;
|
||||
|
||||
InputController* m_inputController = nullptr;
|
||||
std::array<TriState, rbusAddressMax - rbusAddressMin + 1> m_rbusFeedbackStatus;
|
||||
|
||||
Laden…
x
In neuem Issue referenzieren
Einen Benutzer sperren