spacecruft
/
nopenpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ublox_msg.h: remove #define min (#19718)

pull/19723/head
Dean Lee 2021-01-11 18:59:14 +08:00 committed by GitHub
parent 24ce55c2c2
commit d34a690136
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
selfdrive/locationd/ublox_msg.cc
View File

@ -338,7 +338,7 @@ kj::Array<capnp::word> UbloxMsgParser::gen_mon_hw() {
bool UbloxMsgParser::add_data(const uint8_t *incoming_data, uint32_t incoming_data_len, size_t &bytes_consumed) {
int needed = needed_bytes();
if(needed > 0) {
bytes_consumed = min((size_t)needed, incoming_data_len );
bytes_consumed = std::min((uint32_t)needed, incoming_data_len );
// Add data to buffer
memcpy(msg_parse_buf + bytes_in_parse_buf, incoming_data, bytes_consumed);
bytes_in_parse_buf += bytes_consumed;

2
selfdrive/locationd/ublox_msg.h
View File

@ -3,8 +3,6 @@
#include <stdint.h>
#include "messaging.hpp"
#define min(x, y) ((x) <= (y) ? (x) : (y))
// NAV_PVT
typedef struct __attribute__((packed)) {
uint32_t iTOW;