Skip to content

Fix #382: [-Wsign-compare] #385

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

Merged
merged 1 commit into from
Nov 8, 2019
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,10 @@ BLEUuid uuid = BLEUuid(CUSTOM_UUID);
/* This struct is used to track detected nodes */
typedef struct node_record_s
{
uint8_t addr[6]; // Six byte device address
int8_t rssi; // RSSI value
int32_t timestamp; // Timestamp for invalidation purposes
int8_t reserved; // Padding for word alignment
uint8_t addr[6]; // Six byte device address
int8_t rssi; // RSSI value
uint32_t timestamp; // Timestamp for invalidation purposes
int8_t reserved; // Padding for word alignment
} node_record_t;

node_record_t records[ARRAY_SIZE];
Expand Down Expand Up @@ -530,7 +530,7 @@ int invalidateRecords(void)
{
if (records[i].timestamp) // Ignore zero"ed records
{
if (records[i].timestamp <= millis() - TIMEOUT_MS)
if (millis() - records[i].timestamp >= TIMEOUT_MS)
{
/* Record has expired, zero it out */
memset(&records[i], 0, sizeof(node_record_t));
Expand Down