mirror of
https://github.com/lumapu/ahoy.git
synced 2025-07-26 12:47:18 +02:00
Merge branch 'development03' into hms
This commit is contained in:
commit
4d735924ef
29 changed files with 614 additions and 400 deletions
|
@ -1,6 +1,6 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
// 2023 Ahoy, https://ahoydtu.de
|
||||
// Creative Commons - http://creativecommons.org/licenses/by-nc-sa/3.0/de/
|
||||
// Creative Commons - https://creativecommons.org/licenses/by-nc-sa/4.0/deed
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#include "app.h"
|
||||
|
@ -96,7 +96,7 @@ void app::setup() {
|
|||
|
||||
// Plugins
|
||||
if (mConfig->plugin.display.type != 0)
|
||||
mDisplay.setup(&mConfig->plugin.display, &mSys, &mTimestamp, 0xff, mVersion);
|
||||
mDisplay.setup(&mConfig->plugin.display, &mSys, &mTimestamp, mVersion);
|
||||
|
||||
mPubSerial.setup(mConfig, &mSys, &mTimestamp);
|
||||
|
||||
|
@ -436,6 +436,8 @@ void app::resetSystem(void) {
|
|||
mSendLastIvId = 0;
|
||||
mShowRebootRequest = false;
|
||||
mIVCommunicationOn = true;
|
||||
mSavePending = false;
|
||||
mSaveReboot = false;
|
||||
|
||||
memset(&mStat, 0, sizeof(statistics_t));
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue