CCF_100
/
InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into pts-settings

main
Kieran Cawthray 2021-11-15 22:21:11 +07:00
parent 5a0cf8e348 624429b54c
commit 50406adc34
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
Unescape Escape View File

@ -1,5 +1,5 @@
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_CXX_STANDARD 14)

16
src/drivers/Cst816s.cpp
Unescape Escape View File

@ -32,17 +32,11 @@ bool Cst816S::Init() {
twiMaster.Read(twiAddress, 0xa7, &dummy, 1);
vTaskDelay(5);
static constexpr uint8_t maxRetries = 3;
bool isDeviceOk;
uint8_t retries = 0;
do {
isDeviceOk = CheckDeviceIds();
retries++;
} while (!isDeviceOk && retries < maxRetries);
if (!isDeviceOk) {
return false;
}
// TODO This function check that the device IDs from the controller are equal to the ones
// we expect. However, it seems to return false positive (probably in case of communication issue).
// Also, it seems that some users have pinetimes that works correctly but that report different device IDs
// Until we know more about this, we'll just read the IDs but not take any action in case they are not 'valid'
CheckDeviceIds();
/*
[2] EnConLR - Continuous operation can slide around