Skip to content

Fix compilation issues and warnings #23

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 18, 2021
Merged

Fix compilation issues and warnings #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion library.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=STM32duino VL53L1
version=2.0.1
version=2.0.2
author=SRA
maintainer=stm32duino
sentence=Allows controlling the VL53L1 (Time-of-Flight)
Expand Down
8 changes: 4 additions & 4 deletions src/vl53l1_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3830,7 +3830,7 @@ VL53L1_Error VL53L1::VL53L1_I2CWrite(uint8_t DeviceAddr, uint16_t RegisterAddr,
Serial.print("Writing port number ");
Serial.println(RegisterAddr);
#endif
const uint8_t buffer[2] {RegisterAddr >> 8, RegisterAddr & 0xFF };
const uint8_t buffer[2] {(uint8_t)(RegisterAddr >> 8), (uint8_t)(RegisterAddr & 0xFF)};
dev_i2c->write(buffer, 2);
for (int i = 0 ; i < NumByteToWrite ; i++) {
dev_i2c->write(pBuffer[i]);
Expand All @@ -3854,7 +3854,7 @@ VL53L1_Error VL53L1::VL53L1_I2CRead(uint8_t DeviceAddr, uint16_t RegisterAddr, u
Serial.print("Reading port number ");
Serial.println(RegisterAddr);
#endif
const uint8_t buffer[2] {RegisterAddr >> 8, RegisterAddr & 0xFF };
const uint8_t buffer[2] {(uint8_t)(RegisterAddr >> 8), (uint8_t)(RegisterAddr & 0xFF)};
dev_i2c->write(buffer, 2);
status = dev_i2c->endTransmission(false);
//Fix for some STM32 boards
Expand Down Expand Up @@ -3907,7 +3907,7 @@ VL53L1_Error VL53L1::VL53L1_WaitValueMaskEx(VL53L1_Dev_t *pdev, uint32_t timeout
*/

VL53L1_Error status = VL53L1_ERROR_NONE;
const auto start_time_ms = millis();
uint32_t start_time_ms = millis();
uint32_t polling_time_ms = 0;
uint8_t byte_value = 0;
uint8_t found = 0;
Expand Down Expand Up @@ -3942,7 +3942,7 @@ VL53L1_Error VL53L1::VL53L1_WaitValueMaskEx(VL53L1_Dev_t *pdev, uint32_t timeout

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

}

Expand Down
4 changes: 2 additions & 2 deletions src/vl53l1_wait.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ VL53L1_Error VL53L1::VL53L1_poll_for_firmware_ready(
VL53L1_Error status = VL53L1_ERROR_NONE;
VL53L1_LLDriverData_t *pdev = VL53L1DevStructGetLLDriverHandle(Dev);

const auto start_time_ms = millis();
uint32_t start_time_ms = millis();
int32_t poll_delay_ms = VL53L1_POLLING_DELAY_MS;
uint8_t fw_ready = 0;

Expand All @@ -451,7 +451,7 @@ VL53L1_Error VL53L1::VL53L1_poll_for_firmware_ready(


pdev->fw_ready_poll_duration_ms =
static_cast<std::uint32_t>(millis() - start_time_ms);
(uint32_t)(millis() - start_time_ms);
}

if (fw_ready == 0 && status == VL53L1_ERROR_NONE) {
Expand Down