Skip to content

Commit c66e7a6

Browse files
authored
Merge pull request #23 from cparata/main
Fix compilation issues and warnings
2 parents d831eda + fd4224f commit c66e7a6

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=STM32duino VL53L1
2-
version=2.0.1
2+
version=2.0.2
33
author=SRA
44
maintainer=stm32duino
55
sentence=Allows controlling the VL53L1 (Time-of-Flight)

src/vl53l1_class.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3830,7 +3830,7 @@ VL53L1_Error VL53L1::VL53L1_I2CWrite(uint8_t DeviceAddr, uint16_t RegisterAddr,
38303830
Serial.print("Writing port number ");
38313831
Serial.println(RegisterAddr);
38323832
#endif
3833-
const uint8_t buffer[2] {RegisterAddr >> 8, RegisterAddr & 0xFF };
3833+
const uint8_t buffer[2] {(uint8_t)(RegisterAddr >> 8), (uint8_t)(RegisterAddr & 0xFF)};
38343834
dev_i2c->write(buffer, 2);
38353835
for (int i = 0 ; i < NumByteToWrite ; i++) {
38363836
dev_i2c->write(pBuffer[i]);
@@ -3854,7 +3854,7 @@ VL53L1_Error VL53L1::VL53L1_I2CRead(uint8_t DeviceAddr, uint16_t RegisterAddr, u
38543854
Serial.print("Reading port number ");
38553855
Serial.println(RegisterAddr);
38563856
#endif
3857-
const uint8_t buffer[2] {RegisterAddr >> 8, RegisterAddr & 0xFF };
3857+
const uint8_t buffer[2] {(uint8_t)(RegisterAddr >> 8), (uint8_t)(RegisterAddr & 0xFF)};
38583858
dev_i2c->write(buffer, 2);
38593859
status = dev_i2c->endTransmission(false);
38603860
//Fix for some STM32 boards
@@ -3907,7 +3907,7 @@ VL53L1_Error VL53L1::VL53L1_WaitValueMaskEx(VL53L1_Dev_t *pdev, uint32_t timeout
39073907
*/
39083908

39093909
VL53L1_Error status = VL53L1_ERROR_NONE;
3910-
const auto start_time_ms = millis();
3910+
uint32_t start_time_ms = millis();
39113911
uint32_t polling_time_ms = 0;
39123912
uint8_t byte_value = 0;
39133913
uint8_t found = 0;
@@ -3942,7 +3942,7 @@ VL53L1_Error VL53L1::VL53L1_WaitValueMaskEx(VL53L1_Dev_t *pdev, uint32_t timeout
39423942

39433943
/* Update polling time (Compare difference rather than absolute to
39443944
negate 32bit wrap around issue) */
3945-
polling_time_ms = static_cast<std::uint32_t>(millis() - start_time_ms);
3945+
polling_time_ms = (uint32_t)(millis() - start_time_ms);
39463946

39473947
}
39483948

src/vl53l1_wait.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ VL53L1_Error VL53L1::VL53L1_poll_for_firmware_ready(
425425
VL53L1_Error status = VL53L1_ERROR_NONE;
426426
VL53L1_LLDriverData_t *pdev = VL53L1DevStructGetLLDriverHandle(Dev);
427427

428-
const auto start_time_ms = millis();
428+
uint32_t start_time_ms = millis();
429429
int32_t poll_delay_ms = VL53L1_POLLING_DELAY_MS;
430430
uint8_t fw_ready = 0;
431431

@@ -451,7 +451,7 @@ VL53L1_Error VL53L1::VL53L1_poll_for_firmware_ready(
451451

452452

453453
pdev->fw_ready_poll_duration_ms =
454-
static_cast<std::uint32_t>(millis() - start_time_ms);
454+
(uint32_t)(millis() - start_time_ms);
455455
}
456456

457457
if (fw_ready == 0 && status == VL53L1_ERROR_NONE) {

0 commit comments

Comments
 (0)