Merge remote-tracking branch 'upstream/develop' into pts-settings
This commit is contained in:
commit
50406adc34
|
@ -1,5 +1,5 @@
|
||||||
cmake_minimum_required(VERSION 3.10)
|
cmake_minimum_required(VERSION 3.10)
|
||||||
project(pinetime VERSION 1.7.0 LANGUAGES C CXX ASM)
|
project(pinetime VERSION 1.7.1 LANGUAGES C CXX ASM)
|
||||||
|
|
||||||
set(CMAKE_C_STANDARD 99)
|
set(CMAKE_C_STANDARD 99)
|
||||||
set(CMAKE_CXX_STANDARD 14)
|
set(CMAKE_CXX_STANDARD 14)
|
||||||
|
|
|
@ -32,17 +32,11 @@ bool Cst816S::Init() {
|
||||||
twiMaster.Read(twiAddress, 0xa7, &dummy, 1);
|
twiMaster.Read(twiAddress, 0xa7, &dummy, 1);
|
||||||
vTaskDelay(5);
|
vTaskDelay(5);
|
||||||
|
|
||||||
static constexpr uint8_t maxRetries = 3;
|
// TODO This function check that the device IDs from the controller are equal to the ones
|
||||||
bool isDeviceOk;
|
// we expect. However, it seems to return false positive (probably in case of communication issue).
|
||||||
uint8_t retries = 0;
|
// Also, it seems that some users have pinetimes that works correctly but that report different device IDs
|
||||||
do {
|
// Until we know more about this, we'll just read the IDs but not take any action in case they are not 'valid'
|
||||||
isDeviceOk = CheckDeviceIds();
|
CheckDeviceIds();
|
||||||
retries++;
|
|
||||||
} while (!isDeviceOk && retries < maxRetries);
|
|
||||||
|
|
||||||
if (!isDeviceOk) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
[2] EnConLR - Continuous operation can slide around
|
[2] EnConLR - Continuous operation can slide around
|
||||||
|
|
Loading…
Reference in a new issue