Fixes and cleanup (#266)
- Fix issue with GT911 driver: fixed a crash and an init issue - Cleanup of unused code
This commit is contained in:
committed by
GitHub
parent
3f1bfee3f5
commit
eb4e9f9649
@@ -2,7 +2,7 @@
|
||||
#include "Tactility/lvgl/LvglSync.h"
|
||||
#include "Tactility/lvgl/Statusbar.h"
|
||||
#include "Tactility/lvgl/Style.h"
|
||||
#include "Tactility/service/loader/Loader_i.h"
|
||||
#include "Tactility/service/loader/Loader.h"
|
||||
|
||||
#include <Tactility/Tactility.h>
|
||||
#include <Tactility/RtosCompat.h>
|
||||
|
||||
@@ -1,10 +1,14 @@
|
||||
#include "Tactility/service/loader/Loader.h"
|
||||
#include "Tactility/app/AppInstance.h"
|
||||
#include "Tactility/app/AppManifest.h"
|
||||
#include "Tactility/app/ManifestRegistry.h"
|
||||
#include "Tactility/service/loader/Loader_i.h"
|
||||
|
||||
#include <Tactility/RtosCompat.h>
|
||||
#include <Tactility/DispatcherThread.h>
|
||||
#include <Tactility/service/ServiceManifest.h>
|
||||
#include <Tactility/service/ServiceRegistry.h>
|
||||
#include <Tactility/RtosCompat.h>
|
||||
|
||||
#include <stack>
|
||||
|
||||
#ifdef ESP_PLATFORM
|
||||
#include <Tactility/TactilityHeadless.h>
|
||||
@@ -252,7 +256,6 @@ void LoaderService::transitionAppToState(const std::shared_ptr<app::AppInstance>
|
||||
}
|
||||
|
||||
void LoaderService::startApp(const std::string& id, std::shared_ptr<const Bundle> parameters) {
|
||||
auto message = std::make_shared<LoaderMessageAppStart>(id, std::move(parameters));
|
||||
dispatcherThread->dispatch([this, id, parameters]() {
|
||||
onStartAppMessage(id, parameters);
|
||||
});
|
||||
|
||||
@@ -844,7 +844,6 @@ static void dispatchDisconnectButKeepActive(std::shared_ptr<Wifi> wifi) {
|
||||
static bool shouldScanForAutoConnect(std::shared_ptr<Wifi> wifi) {
|
||||
auto lock = wifi->dataMutex.asScopedLock();
|
||||
if (!lock.lock(100)) {
|
||||
TT_LOG_W(TAG, "Auto-connect can't lock");
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -853,7 +852,6 @@ static bool shouldScanForAutoConnect(std::shared_ptr<Wifi> wifi) {
|
||||
!wifi->pause_auto_connect;
|
||||
|
||||
if (!is_radio_in_scannable_state) {
|
||||
TT_LOG_W(TAG, "Auto-connect: radio state not ok (%d, %d, %d)", (int)wifi->getRadioState(), wifi->isScanActive(), wifi->pause_auto_connect);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -862,7 +860,6 @@ static bool shouldScanForAutoConnect(std::shared_ptr<Wifi> wifi) {
|
||||
bool no_recent_scan = (current_time - wifi->last_scan_time) > (AUTO_SCAN_INTERVAL / portTICK_PERIOD_MS);
|
||||
|
||||
if (!scan_time_has_looped && !no_recent_scan) {
|
||||
TT_LOG_W(TAG, "Auto-connect: scan time looped = %d, no recent scan = %d", scan_time_has_looped, no_recent_scan);
|
||||
}
|
||||
|
||||
return scan_time_has_looped || no_recent_scan;
|
||||
|
||||
Reference in New Issue
Block a user