Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Callbacks for interval change and FRC request #49

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/DataProvider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,9 @@ void DataProvider::onHistoryIntervalChange(int interval) {
_sampleHistory.reset();
_BLELibrary.characteristicSetValue(
NUMBER_OF_SAMPLES_UUID, _sampleHistory.numberOfSamplesInHistory());
if (_callbackHistoryIntervalChange != nullptr) {
_callbackHistoryIntervalChange(interval);
}
}

void DataProvider::onConnectionEvent() {
Expand All @@ -281,8 +284,12 @@ void DataProvider::onDownloadRequest() {
}

void DataProvider::onFRCRequest(uint16_t reference_co2_level) {
_frc_requested = true;
_reference_co2_level = reference_co2_level;
if (_callbackFRC != nullptr) {
_callbackFRC(reference_co2_level);
} else {
_frc_requested = true;
_reference_co2_level = reference_co2_level;
}
}

void DataProvider::onNrOfSamplesRequest(int nr_of_samples) {
Expand Down
8 changes: 8 additions & 0 deletions src/DataProvider.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,15 @@ class DataProvider: public IProviderCallbacks {
bool enableWifiSettings = false,
bool enableBatteryService = false,
bool enableFRCService = false,
void (*CallbackFRC)(uint16_t) = nullptr,
void (*CallbackHistoryIntervalChange)(int) = nullptr,
IWifiLibraryWrapper* pWifiLibrary = nullptr)
: _BLELibrary(libraryWrapper), _enableWifiSettings(enableWifiSettings),
_enableBatteryService(enableBatteryService),
_enableFRCService(enableFRCService), _enableAltDeviceName(false),
_sampleConfig(sampleConfigSelector.at(dataType)),
_callbackFRC(CallbackFRC),
_callbackHistoryIntervalChange(CallbackHistoryIntervalChange),
_pWifiLibaray(pWifiLibrary){};
~DataProvider(){};
void begin();
Expand Down Expand Up @@ -105,6 +109,10 @@ class DataProvider: public IProviderCallbacks {
uint64_t _latestHistoryTimeStampAtDownloadStart = 0;
IWifiLibraryWrapper* _pWifiLibaray;

// ExternalCallbacks
void (*_callbackFRC)(uint16_t);
void (*_callbackHistoryIntervalChange)(int);

// ProviderCallbacks
void onHistoryIntervalChange(int interval) override;
void onConnectionEvent() override;
Expand Down