Various services improved (#110)
This commit is contained in:
committed by
GitHub
parent
36bb25deba
commit
d52fe52d96
@@ -13,7 +13,7 @@ namespace tt::app::power {
|
||||
#define TAG "power"
|
||||
|
||||
extern const AppManifest manifest;
|
||||
static void on_timer(TT_UNUSED void* context);
|
||||
static void on_timer(TT_UNUSED std::shared_ptr<void> context);
|
||||
|
||||
struct Data {
|
||||
std::unique_ptr<Timer> update_timer = std::unique_ptr<Timer>(new Timer(Timer::TypePeriodic, &on_timer, nullptr));
|
||||
|
||||
@@ -54,7 +54,7 @@ static void onConnect(const service::wifi::settings::WifiApSettings* ap_settings
|
||||
}
|
||||
|
||||
WifiConnect::WifiConnect() {
|
||||
PubSub* wifi_pubsub = service::wifi::getPubsub();
|
||||
auto wifi_pubsub = service::wifi::getPubsub();
|
||||
wifiSubscription = tt_pubsub_subscribe(wifi_pubsub, &eventCallback, this);
|
||||
bindings = (Bindings) {
|
||||
.onConnectSsid = onConnect,
|
||||
@@ -63,7 +63,7 @@ WifiConnect::WifiConnect() {
|
||||
}
|
||||
|
||||
WifiConnect::~WifiConnect() {
|
||||
PubSub* pubsub = service::wifi::getPubsub();
|
||||
auto pubsub = service::wifi::getPubsub();
|
||||
tt_pubsub_unsubscribe(pubsub, wifiSubscription);
|
||||
}
|
||||
|
||||
|
||||
@@ -108,7 +108,7 @@ static void wifiManageEventCallback(const void* message, void* context) {
|
||||
}
|
||||
|
||||
void WifiManage::onShow(AppContext& app, lv_obj_t* parent) {
|
||||
PubSub* wifi_pubsub = service::wifi::getPubsub();
|
||||
auto wifi_pubsub = service::wifi::getPubsub();
|
||||
wifiSubscription = tt_pubsub_subscribe(wifi_pubsub, &wifiManageEventCallback, this);
|
||||
|
||||
// State update (it has its own locking)
|
||||
@@ -128,6 +128,7 @@ void WifiManage::onShow(AppContext& app, lv_obj_t* parent) {
|
||||
bool can_scan = radio_state == service::wifi::WIFI_RADIO_ON ||
|
||||
radio_state == service::wifi::WIFI_RADIO_CONNECTION_PENDING ||
|
||||
radio_state == service::wifi::WIFI_RADIO_CONNECTION_ACTIVE;
|
||||
TT_LOG_I(TAG, "%d %d", radio_state, service::wifi::isScanning());
|
||||
if (can_scan && !service::wifi::isScanning()) {
|
||||
service::wifi::scan();
|
||||
}
|
||||
@@ -135,7 +136,7 @@ void WifiManage::onShow(AppContext& app, lv_obj_t* parent) {
|
||||
|
||||
void WifiManage::onHide(TT_UNUSED AppContext& app) {
|
||||
lock();
|
||||
PubSub* wifi_pubsub = service::wifi::getPubsub();
|
||||
auto wifi_pubsub = service::wifi::getPubsub();
|
||||
tt_pubsub_unsubscribe(wifi_pubsub, wifiSubscription);
|
||||
wifiSubscription = nullptr;
|
||||
isViewEnabled = false;
|
||||
|
||||
Reference in New Issue
Block a user