Merge branch 'master' into 2.2-working-changes

This commit is contained in:
Ben Meadors
2023-07-30 07:54:11 -05:00
committed by GitHub
27 changed files with 704 additions and 100 deletions

View File

@@ -1,6 +1,7 @@
#include "configuration.h"
#include "input/InputBroker.h"
#include "input/RotaryEncoderInterruptImpl1.h"
#include "input/TrackballInterruptImpl1.h"
#include "input/UpDownInterruptImpl1.h"
#include "input/cardKbI2cImpl.h"
#include "modules/AdminModule.h"
@@ -62,6 +63,10 @@ void setupModules()
cardKbI2cImpl = new CardKbI2cImpl();
cardKbI2cImpl->init();
#endif
#if HAS_TRACKBALL
trackballInterruptImpl1 = new TrackballInterruptImpl1();
trackballInterruptImpl1->init();
#endif
#if HAS_SCREEN
cannedMessageModule = new CannedMessageModule();
#endif