fixed merge conflicts

2021-07-23 17:48:11 +02:00
parent 0cc454d891 62fe0571b1
commit a2e62b28c3
70 changed files with 1597 additions and 606 deletions
--- a/bsp_q7s/core/obsw.cpp
+++ b/bsp_q7s/core/obsw.cpp
@ -7,7 +7,7 @@

 int obsw::obsw() {
    std::cout << "-- EIVE OBSW --" << std::endl;
-#if TE0720 == 0
+#if BOARD_TE0720 == 0
    std::cout << "-- Compiled for Linux (Xiphos Q7S) --" << std::endl;
 #else
    std::cout << "-- Compiled for Linux (TE0720) --" << std::endl;