Prefix LOG and CHECK with AOS_
This prepares us for introducing glog more widely and transitioning
things over where they make sense.
Change-Id: Ic6c208882407bc2153fe875ffc736d66f5c8ade5
diff --git a/y2019/jevois/camera/image_stream.cc b/y2019/jevois/camera/image_stream.cc
index 29a1513..44fd8e5 100644
--- a/y2019/jevois/camera/image_stream.cc
+++ b/y2019/jevois/camera/image_stream.cc
@@ -8,7 +8,7 @@
void ImageStreamEvent::ProcessHelper(
aos::vision::DataRef data, aos::monotonic_clock::time_point timestamp) {
if (data.size() < 300) {
- LOG(INFO, "got bad img of size(%d)\n", static_cast<int>(data.size()));
+ AOS_LOG(INFO, "got bad img of size(%d)\n", static_cast<int>(data.size()));
return;
}
ProcessImage(data, timestamp);
diff --git a/y2019/jevois/serial.cc b/y2019/jevois/serial.cc
index 7c49b4f..5febbb4 100644
--- a/y2019/jevois/serial.cc
+++ b/y2019/jevois/serial.cc
@@ -14,11 +14,12 @@
int open_via_terminos(const char *tty_name) {
int itsDev = ::open(tty_name, O_RDWR | O_NOCTTY | O_NONBLOCK);
if (itsDev == -1) {
- LOG(FATAL, "problem opening: %s\n", tty_name);
+ AOS_LOG(FATAL, "problem opening: %s\n", tty_name);
}
termios options = {};
- if (tcgetattr(itsDev, &options) == -1) LOG(FATAL, "Failed to get options");
+ if (tcgetattr(itsDev, &options) == -1)
+ AOS_LOG(FATAL, "Failed to get options");
// get raw input from the port
options.c_cflag |= (CLOCAL // ignore modem control lines
@@ -70,7 +71,7 @@
// options.c_cflag |= CRTSCTS;
if (tcsetattr(itsDev, TCSANOW, &options) == -1)
- LOG(FATAL, "Failed to set port options");
+ AOS_LOG(FATAL, "Failed to set port options");
return itsDev;
}
diff --git a/y2019/jevois/spi.cc b/y2019/jevois/spi.cc
index c695c89..b6a281e 100644
--- a/y2019/jevois/spi.cc
+++ b/y2019/jevois/spi.cc
@@ -5,8 +5,8 @@
#ifdef __linux__
#include "aos/logging/logging.h"
#else
-#define CHECK(...)
-#define CHECK_GE(...)
+#define AOS_CHECK(...)
+#define AOS_CHECK_GE(...)
#endif
// SPI transfer format (6x 8 bit frames):
@@ -175,11 +175,11 @@
crc = jevois_crc_update(crc, transfer.data(),
transfer.size() - remaining_space.size());
crc = jevois_crc_finalize(crc);
- CHECK_GE(static_cast<size_t>(remaining_space.size()), sizeof(crc));
+ AOS_CHECK_GE(static_cast<size_t>(remaining_space.size()), sizeof(crc));
memcpy(&remaining_space[0], &crc, sizeof(crc));
remaining_space = remaining_space.subspan(sizeof(crc));
}
- CHECK(remaining_space.empty());
+ AOS_CHECK(remaining_space.empty());
return transfer;
}
@@ -226,10 +226,11 @@
transfer.size() - remaining_input.size());
calculated_crc = jevois_crc_finalize(calculated_crc);
uint16_t received_crc;
- CHECK_GE(static_cast<size_t>(remaining_input.size()), sizeof(received_crc));
+ AOS_CHECK_GE(static_cast<size_t>(remaining_input.size()),
+ sizeof(received_crc));
memcpy(&received_crc, &remaining_input[0], sizeof(received_crc));
remaining_input = remaining_input.subspan(sizeof(received_crc));
- CHECK(remaining_input.empty());
+ AOS_CHECK(remaining_input.empty());
if (calculated_crc != received_crc) {
return tl::nullopt;
}
@@ -259,7 +260,7 @@
crc = jevois_crc_update(crc, transfer.data(),
transfer.size() - remaining_space.size());
crc = jevois_crc_finalize(crc);
- CHECK_GE(static_cast<size_t>(remaining_space.size()), sizeof(crc));
+ AOS_CHECK_GE(static_cast<size_t>(remaining_space.size()), sizeof(crc));
memcpy(&remaining_space[0], &crc, sizeof(crc));
remaining_space = remaining_space.subspan(sizeof(crc));
}
@@ -292,7 +293,8 @@
transfer.size() - remaining_input.size());
calculated_crc = jevois_crc_finalize(calculated_crc);
uint16_t received_crc;
- CHECK_GE(static_cast<size_t>(remaining_input.size()), sizeof(received_crc));
+ AOS_CHECK_GE(static_cast<size_t>(remaining_input.size()),
+ sizeof(received_crc));
memcpy(&received_crc, &remaining_input[0], sizeof(received_crc));
remaining_input = remaining_input.subspan(sizeof(received_crc));
if (calculated_crc != received_crc) {
diff --git a/y2019/jevois/uart.cc b/y2019/jevois/uart.cc
index 63138a8..6ebfe30 100644
--- a/y2019/jevois/uart.cc
+++ b/y2019/jevois/uart.cc
@@ -8,8 +8,8 @@
#ifdef __linux__
#include "aos/logging/logging.h"
#else
-#define CHECK(...)
-#define CHECK_GE(...)
+#define AOS_CHECK(...)
+#define AOS_CHECK_GE(...)
#endif
namespace frc971 {
@@ -43,11 +43,11 @@
crc = jevois_crc_update(crc, buffer.data(),
buffer.size() - remaining_space.size());
crc = jevois_crc_finalize(crc);
- CHECK_GE(static_cast<size_t>(remaining_space.size()), sizeof(crc));
+ AOS_CHECK_GE(static_cast<size_t>(remaining_space.size()), sizeof(crc));
memcpy(&remaining_space[0], &crc, sizeof(crc));
remaining_space = remaining_space.subspan(sizeof(crc));
}
- CHECK(remaining_space.empty());
+ AOS_CHECK(remaining_space.empty());
UartToTeensyBuffer result;
result.set_size(
CobsEncode<uart_to_teensy_size()>(buffer, result.mutable_backing_array())
@@ -91,10 +91,11 @@
buffer.size() - remaining_input.size());
calculated_crc = jevois_crc_finalize(calculated_crc);
uint16_t received_crc;
- CHECK_GE(static_cast<size_t>(remaining_input.size()), sizeof(received_crc));
+ AOS_CHECK_GE(static_cast<size_t>(remaining_input.size()),
+ sizeof(received_crc));
memcpy(&received_crc, &remaining_input[0], sizeof(received_crc));
remaining_input = remaining_input.subspan(sizeof(received_crc));
- CHECK(remaining_input.empty());
+ AOS_CHECK(remaining_input.empty());
if (calculated_crc != received_crc) {
return tl::nullopt;
}
@@ -129,11 +130,11 @@
crc = jevois_crc_update(crc, buffer.data(),
buffer.size() - remaining_space.size());
crc = jevois_crc_finalize(crc);
- CHECK_GE(static_cast<size_t>(remaining_space.size()), sizeof(crc));
+ AOS_CHECK_GE(static_cast<size_t>(remaining_space.size()), sizeof(crc));
memcpy(&remaining_space[0], &crc, sizeof(crc));
remaining_space = remaining_space.subspan(sizeof(crc));
}
- CHECK(remaining_space.empty());
+ AOS_CHECK(remaining_space.empty());
UartToCameraBuffer result;
result.set_size(
CobsEncode<uart_to_camera_size()>(buffer, result.mutable_backing_array())
@@ -180,10 +181,11 @@
buffer.size() - remaining_input.size());
calculated_crc = jevois_crc_finalize(calculated_crc);
uint16_t received_crc;
- CHECK_GE(static_cast<size_t>(remaining_input.size()), sizeof(received_crc));
+ AOS_CHECK_GE(static_cast<size_t>(remaining_input.size()),
+ sizeof(received_crc));
memcpy(&received_crc, &remaining_input[0], sizeof(received_crc));
remaining_input = remaining_input.subspan(sizeof(received_crc));
- CHECK(remaining_input.empty());
+ AOS_CHECK(remaining_input.empty());
if (calculated_crc != received_crc) {
return tl::nullopt;
}