From 7cfcf9fbab7b029443ccbe5aba29fdf26d3a047f Mon Sep 17 00:00:00 2001
From: "David J. Fiddes" <35607151+davefiddes@users.noreply.github.com>
Date: Tue, 19 Nov 2024 12:03:56 +0000
Subject: [PATCH] Remove duplicate unit tests from libopeninv (#47)

As libopeninv now has unit tests remove the
duplicates.

Update the Makefile and Code::Blocks project to
reference the new libopeninv tests and add missing
files.

Update the GitHub Action workflow to run both sets
of tests.
---
 .github/workflows/CI-build.yml |   8 +-
 Makefile                       |   6 +-
 libopeninv                     |   2 +-
 sinus.cbp                      |  55 +++
 test/Makefile                  |   2 +-
 test/test_canmap.cpp           | 862 ---------------------------------
 test/test_fp.cpp               |  33 +-
 7 files changed, 68 insertions(+), 900 deletions(-)
 delete mode 100644 test/test_canmap.cpp

diff --git a/.github/workflows/CI-build.yml b/.github/workflows/CI-build.yml
index 36850ce..ca891c9 100644
--- a/.github/workflows/CI-build.yml
+++ b/.github/workflows/CI-build.yml
@@ -54,8 +54,12 @@ jobs:
 
       - name: Build unit tests on host
         run: |
-          make -C test
+          make Test
 
-      - name: Run unit tests on host
+      - name: Run stm32-sine unit tests on host
         run: |
           test/test_sine
+
+      - name: Run libopeninv unit tests on host
+        run: |
+          libopeninv/test/test_libopeninv
diff --git a/Makefile b/Makefile
index 633d69a..8127eb6 100644
--- a/Makefile
+++ b/Makefile
@@ -159,6 +159,8 @@ get-deps:
 	$(Q)${MAKE} -C libopencm3
 
 Test:
-	cd test && $(MAKE)
+	$(MAKE) -C test
+	$(MAKE) -C libopeninv/test
 cleanTest:
-	cd test && $(MAKE) clean
+	$(MAKE) -C test clean
+	$(MAKE) -C libopeninv/test clean
diff --git a/libopeninv b/libopeninv
index decbdfb..93e9bcd 160000
--- a/libopeninv
+++ b/libopeninv
@@ -1 +1 @@
-Subproject commit decbdfb21705234771cd8f0d3f6bce16574e26f7
+Subproject commit 93e9bcdf730fddcf098a6dfd449ce42badf0a8f1
diff --git a/sinus.cbp b/sinus.cbp
index 62c95c7..94cd215 100644
--- a/sinus.cbp
+++ b/sinus.cbp
@@ -58,6 +58,15 @@
 					<Add directory="include" />
 				</Compiler>
 			</Target>
+			<Target title="Test libopeninv">
+				<Option output="libopeninv/test/test_libopeninv" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="libopeninv/test" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add directory="include" />
+				</Compiler>
+			</Target>
 		</Build>
 		<Unit filename="Makefile">
 			<Option target="SlipControl" />
@@ -77,6 +86,7 @@
 		<Unit filename="libopeninv/include/anain.h" />
 		<Unit filename="libopeninv/include/canhardware.h" />
 		<Unit filename="libopeninv/include/canmap.h" />
+		<Unit filename="libopeninv/include/canobd2.h" />
 		<Unit filename="libopeninv/include/cansdo.h" />
 		<Unit filename="libopeninv/include/crc8.h" />
 		<Unit filename="libopeninv/include/delay.h" />
@@ -101,6 +111,7 @@
 		<Unit filename="libopeninv/src/anain.cpp" />
 		<Unit filename="libopeninv/src/canhardware.cpp" />
 		<Unit filename="libopeninv/src/canmap.cpp" />
+		<Unit filename="libopeninv/src/canobd2.cpp" />
 		<Unit filename="libopeninv/src/cansdo.cpp" />
 		<Unit filename="libopeninv/src/crc8.cpp" />
 		<Unit filename="libopeninv/src/digio.cpp" />
@@ -125,6 +136,40 @@
 		<Unit filename="libopeninv/src/stm32scheduler.cpp" />
 		<Unit filename="libopeninv/src/terminal.cpp" />
 		<Unit filename="libopeninv/src/terminalcommands.cpp" />
+		<Unit filename="libopeninv/test/Makefile">
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/stub_canhardware.cpp">
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/stub_canhardware.h">
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/stub_libopencm3.c">
+			<Option compilerVar="CC" />
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/test-include/hwdefs.h">
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/test-include/param_prj.h">
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/test.h">
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/test_canmap.cpp">
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/test_fp.cpp">
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/test_fu.cpp">
+			<Option target="Test libopeninv" />
+		</Unit>
+		<Unit filename="libopeninv/test/test_main.cpp">
+			<Option target="Test libopeninv" />
+		</Unit>
 		<Unit filename="src/hwinit.cpp" />
 		<Unit filename="src/inc_encoder.cpp" />
 		<Unit filename="src/pwmgeneration-foc.cpp" />
@@ -142,6 +187,16 @@
 		<Unit filename="test/Makefile">
 			<Option target="Test" />
 		</Unit>
+		<Unit filename="test/stub_canhardware.cpp">
+			<Option target="Test" />
+		</Unit>
+		<Unit filename="test/stub_canhardware.h">
+			<Option target="Test" />
+		</Unit>
+		<Unit filename="test/stub_libopencm3.c">
+			<Option compilerVar="CC" />
+			<Option target="Test" />
+		</Unit>
 		<Unit filename="test/test.h">
 			<Option target="Test" />
 		</Unit>
diff --git a/test/Makefile b/test/Makefile
index e030ea4..8ed3409 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -7,7 +7,7 @@ CPPFLAGS    = -ggdb -DSTM32F1 -DCTRL_FOC=1 -DCTRL_SINE=0 -DCTRL=CTRL_FOC -I../in
 LDFLAGS     = -g
 BINARY		= test_sine
 OBJS		= test_main.o fu.o test_fu.o test_fp.o test_vcu.o my_fp.o my_string.o params.o vehiclecontrol.o \
-			  test_throttle.o throttle.o sine_core.o temp_meas.o stub_canhardware.o test_canmap.o canmap.o \
+			  test_throttle.o throttle.o sine_core.o temp_meas.o stub_canhardware.o \
 			  stub_libopencm3.o
 VPATH = ../src ../libopeninv/src
 
diff --git a/test/test_canmap.cpp b/test/test_canmap.cpp
deleted file mode 100644
index 9899092..0000000
--- a/test/test_canmap.cpp
+++ /dev/null
@@ -1,862 +0,0 @@
-/*
- * This file is part of the stm32-sine project.
- *
- * Copyright (C) 2024 David J. Fiddes <D.J@fiddes.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "canhardware.h"
-#include "canmap.h"
-#include "params.h"
-#include "stub_canhardware.h"
-#include "test.h"
-
-#include <array>
-#include <cstdint>
-#include <iomanip>
-#include <iostream>
-#include <iterator>
-#include <memory>
-#include <string>
-
-class CanMapTest : public UnitTest
-{
-public:
-    explicit CanMapTest(const std::list<VoidFunction>* cases) : UnitTest(cases)
-    {
-    }
-    virtual void TestCaseSetup();
-};
-
-std::unique_ptr<CanStub> canStub;
-std::unique_ptr<CanMap>  canMap;
-
-void CanMapTest::TestCaseSetup()
-{
-    canStub = std::make_unique<CanStub>();
-    canMap = std::make_unique<CanMap>(canStub.get(), false);
-    Param::LoadDefaults();
-}
-
-const uint32_t CanId = 0x123;
-
-std::ostream& operator<<(std::ostream& o, const std::array<uint8_t, 8>& data)
-{
-    for (const auto& element : data)
-    {
-        o << "0x" << std::setfill('0') << std::setw(2) << std::hex
-          << (int)element << " ";
-    }
-    return o;
-}
-
-bool FrameMatches(const std::array<uint8_t, 8>& expected)
-{
-    if (canStub->m_canId != CanId)
-    {
-        std::cout << "CAN ID doesn't match. Expected: " << CanId
-                  << " Actual: " << canStub->m_canId << "\n";
-        return false;
-    }
-
-    if (canStub->m_len != 8)
-    {
-        std::cout << "CAN frame length doesn't match. Expected: 8 "
-                  << "Actual: " << canStub->m_len << "\n";
-        return false;
-    }
-
-    if (canStub->m_data != expected)
-    {
-        std::cout << "CAN frame data doesn't match.\n"
-                  << "Actual  : " << canStub->m_data << "\n"
-                  << "Expected: " << expected << "\n";
-
-        return false;
-    }
-
-    return true;
-}
-
-static void SendFrame(const std::array<uint8_t, 8>& frame)
-{
-    canStub->HandleRx(CanId, (uint32_t*)&frame[0], 8);
-}
-
-static void send_map_little_endian_byte_in_first_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 0, 8, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, 0x42);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0x42, 0, 0, 0, 0, 0, 0, 0 }));
-}
-
-static void send_map_little_endian_16_bit_in_first_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 0, 16, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, 0x42);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0x42, 0, 0, 0, 0, 0, 0, 0 }));
-}
-
-static void send_map_little_endian_32_bit_in_first_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 0, 32, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, 0x42);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0x42, 0, 0, 0, 0, 0, 0, 0 }));
-}
-
-static void send_map_little_endian_32_bit_in_second_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 32, 32, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, 0x42);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0, 0, 0, 0x42, 0, 0, 0 }));
-}
-
-static void send_map_little_endian_negative_number_16_bit_in_first_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 0, 16, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0xfe, 0xff, 0, 0, 0, 0, 0, 0 }));
-}
-
-static void send_map_little_endian_negative_number_24_bit_in_first_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 0, 24, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0xfe, 0xff, 0xff, 0, 0, 0, 0, 0 }));
-}
-
-static void send_map_little_endian_negative_number_32_bit_in_first_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 0, 32, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0xfe, 0xff, 0xff, 0xff, 0, 0, 0, 0 }));
-}
-
-static void send_map_little_endian_negative_number_32_bit_in_second_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 32, 32, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0, 0, 0, 0xfe, 0xff, 0xff, 0xff }));
-}
-
-static void send_map_little_endian_negative_number_32_bit_spanning_both_words()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 16, 32, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0, 0xfe, 0xff, 0xff, 0xff, 0, 0 }));
-}
-
-static void send_map_little_endian_negative_number_32_bit_mostly_in_first_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 8, 32, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0xfe, 0xff, 0xff, 0xff, 0, 0, 0 }));
-}
-
-static void
-send_map_little_endian_negative_number_32_bit_mostly_in_second_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 24, 32, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0, 0, 0xfe, 0xff, 0xff, 0xff, 0 }));
-}
-
-static void send_map_little_endian_negative_number_16_bit_at_end_of_frame()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 48, 16, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0, 0, 0, 0, 0, 0xfe, 0xff }));
-}
-
-static void send_map_big_endian_byte_in_first_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 7, -8, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, 0x42);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0x42, 0, 0, 0, 0, 0, 0, 0 }));
-}
-
-static void send_map_big_endian_16_bit_in_first_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 23, -16, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, 0x42);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0, 0x42, 0, 0, 0, 0, 0 }));
-}
-
-static void send_map_big_endian_32_bit_in_first_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 31, -32, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, 0x42);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0, 0, 0x42, 0, 0, 0, 0 }));
-}
-
-static void send_map_big_endian_negative_byte_in_first_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 7, -8, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0xfe, 0, 0, 0, 0, 0, 0, 0 }));
-}
-
-static void send_map_big_endian_negative_16_bit_in_first_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 23, -16, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0xff, 0xfe, 0, 0, 0, 0, 0 }));
-}
-
-static void send_map_big_endian_negative_24_bit_in_first_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 23, -24, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0xff, 0xff, 0xfe, 0, 0, 0, 0, 0 }));
-}
-
-static void send_map_big_endian_negative_32_bit_in_first_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 31, -32, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0xff, 0xff, 0xff, 0xfe, 0, 0, 0, 0 }));
-}
-
-static void send_map_big_endian_negative_byte_in_second_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 39, -8, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0, 0, 0, 0xfe, 0, 0, 0 }));
-}
-
-static void send_map_big_endian_negative_16_bit_in_second_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 47, -16, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0, 0, 0, 0xff, 0xfe, 0, 0 }));
-}
-
-static void send_map_big_endian_negative_24_bit_in_second_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 55, -24, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0, 0, 0, 0xff, 0xff, 0xfe, 0 }));
-}
-
-static void send_map_big_endian_negative_32_bit_in_second_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 63, -32, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xfe }));
-}
-
-static void send_map_big_endian_negative_number_24_bit_at_end_of_frame()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 63, -24, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0, 0, 0, 0, 0xff, 0xff, 0xfe }));
-}
-
-static void send_map_big_endian_negative_16_bit_spanning_both_words()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 39, -16, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0, 0, 0xff, 0xfe, 0, 0, 0 }));
-}
-
-static void send_map_big_endian_negative_32_bit_spanning_both_words()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 47, -32, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0, 0xff, 0xff, 0xff, 0xfe, 0, 0 }));
-}
-
-static void send_map_big_endian_negative_32_bit_mostly_in_first_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 39, -32, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0xff, 0xff, 0xff, 0xfe, 0, 0, 0 }));
-}
-
-static void send_map_big_endian_negative_32_bit_mostly_in_second_word()
-{
-    canMap->AddSend(Param::ocurlim, CanId, 55, -32, 1.0, 0);
-    Param::SetFloat(Param::ocurlim, -2);
-
-    canMap->SendAll();
-
-    ASSERT(FrameMatches({ 0, 0, 0, 0xff, 0xff, 0xff, 0xfe, 0 }));
-}
-
-static void receive_map_little_endian_byte_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 0, 8, 1.0, 0);
-
-    SendFrame({ 42, 0, 0, 0, 0, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == 42);
-}
-
-static void receive_map_little_endian_16_bit_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 0, 16, 1.0, 0);
-
-    SendFrame({ 42, 0, 0, 0, 0, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == 42);
-}
-
-static void receive_map_little_endian_32_bit_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 0, 32, 1.0, 0);
-
-    SendFrame({ 42, 0, 0, 0, 0, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == 42);
-}
-
-static void receive_map_little_endian_32_bit_in_second_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 32, 32, 1.0, 0);
-
-    SendFrame({ 0, 0, 0, 0, 42, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == 42);
-}
-
-static void receive_map_little_endian_negative_number_16_bit_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 0, 16, 1.0, 0);
-
-    SendFrame({ 0xfe, 0xff, 0, 0, 0, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_little_endian_negative_number_24_bit_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 0, 24, 1.0, 0);
-
-    SendFrame({ 0xfe, 0xff, 0xff, 0, 0, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_little_endian_negative_number_31_bit_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 1, 31, 1.0, 0);
-
-    SendFrame({ 0xfc, 0xff, 0xff, 0xff, 0, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_little_endian_negative_number_32_bit_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 0, 32, 1.0, 0);
-
-    SendFrame({ 0xfe, 0xff, 0xff, 0xff, 0, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_little_endian_negative_number_32_bit_in_second_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 32, 32, 1.0, 0);
-
-    SendFrame({ 0, 0, 0, 0, 0xfe, 0xff, 0xff, 0xff });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void
-receive_map_little_endian_negative_number_32_bit_spanning_both_words()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 16, 32, 1.0, 0);
-
-    SendFrame({ 0, 0, 0xfe, 0xff, 0xff, 0xff, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void
-receive_map_little_endian_negative_number_32_bit_mostly_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 8, 32, 1.0, 0);
-
-    SendFrame({ 0, 0xfe, 0xff, 0xff, 0xff, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void
-receive_map_little_endian_negative_number_32_bit_mostly_in_second_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 24, 32, 1.0, 0);
-
-    SendFrame({ 0, 0, 0, 0xfe, 0xff, 0xff, 0xff, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_little_endian_negative_number_16_bit_at_end_of_frame()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 48, 16, 1.0, 0);
-
-    SendFrame({ 0, 0, 0, 0, 0, 0, 0xfe, 0xff });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_big_endian_byte_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 7, -8, 1.0, 0);
-
-    SendFrame({ 42, 0, 0, 0, 0, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == 42);
-}
-
-static void receive_map_big_endian_16_bit_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 23, -16, 1.0, 0);
-
-    SendFrame({ 0, 0, 42, 0, 0, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == 42);
-}
-
-static void receive_map_big_endian_31_bit_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 31, -31, 1.0, 0);
-
-    SendFrame({ 0x80, 0, 0, 42, 0x80, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == 42);
-}
-
-static void receive_map_big_endian_32_bit_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 31, -32, 1.0, 0);
-
-    SendFrame({ 0, 0, 0, 42, 0, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == 42);
-}
-
-static void receive_map_big_endian_negative_byte_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 7, -8, 1.0, 0);
-
-    SendFrame({ 0xfe, 0, 0, 0, 0, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_big_endian_negative_16_bit_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 23, -16, 1.0, 0);
-
-    SendFrame({ 0, 0xff, 0xfe, 0, 0, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_big_endian_negative_24_bit_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 23, -24, 1.0, 0);
-
-    SendFrame({ 0xff, 0xff, 0xfe, 0, 0, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_big_endian_negative_31_bit_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 31, -31, 1.0, 0);
-
-    SendFrame({ 0x7f, 0xff, 0xff, 0xfe, 0, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_big_endian_negative_32_bit_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 31, -32, 1.0, 0);
-
-    SendFrame({ 0xff, 0xff, 0xff, 0xfe, 0, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_big_endian_negative_byte_in_second_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 39, -8, 1.0, 0);
-
-    SendFrame({ 0, 0, 0, 0, 0xfe, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_big_endian_negative_16_bit_in_second_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 47, -16, 1.0, 0);
-
-    SendFrame({ 0, 0, 0, 0, 0xff, 0xfe, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_big_endian_negative_24_bit_in_second_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 55, -24, 1.0, 0);
-
-    SendFrame({ 0, 0, 0, 0, 0xff, 0xff, 0xfe, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_big_endian_negative_32_bit_in_second_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 63, -32, 1.0, 0);
-
-    SendFrame({ 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xfe });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_big_endian_negative_number_24_bit_at_end_of_frame()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 63, -24, 1.0, 0);
-
-    SendFrame({ 0, 0, 0, 0, 0, 0xff, 0xff, 0xfe });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_big_endian_negative_16_bit_spanning_both_words()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 39, -16, 1.0, 0);
-
-    SendFrame({ 0, 0, 0, 0xff, 0xfe, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_big_endian_negative_32_bit_spanning_both_words()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 47, -32, 1.0, 0);
-
-    SendFrame({ 0, 0, 0xff, 0xff, 0xff, 0xfe, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_big_endian_negative_32_bit_mostly_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 39, -32, 1.0, 0);
-
-    SendFrame({ 0, 0xff, 0xff, 0xff, 0xfe, 0, 0, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_big_endian_negative_32_bit_mostly_in_second_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 55, -32, 1.0, 0);
-
-    SendFrame({ 0, 0, 0, 0xff, 0xff, 0xff, 0xfe, 0 });
-
-    ASSERT(Param::GetInt(Param::ocurlim) == -2);
-}
-
-static void receive_map_little_endian_single_bit_first_bit()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 0, 1, 1.0, 0);
-
-    SendFrame({ 0x1, 0, 0, 0, 0, 0, 0, 0 });
-    ASSERT(Param::GetBool(Param::ocurlim));
-
-    SendFrame({ 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff });
-    ASSERT(!Param::GetBool(Param::ocurlim));
-}
-
-static void receive_map_big_endian_single_bit_first_bit()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 0, -1, 1.0, 0);
-
-    SendFrame({ 0x80, 0, 0, 0, 0, 0, 0, 0 });
-    ASSERT(Param::GetBool(Param::ocurlim));
-
-    SendFrame({ 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff });
-    ASSERT(!Param::GetBool(Param::ocurlim));
-}
-
-static void receive_map_little_endian_single_bit_last_bit()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 63, 1, 1.0, 0);
-
-    SendFrame({ 0, 0, 0, 0, 0, 0, 0, 0x80 });
-    ASSERT(Param::GetBool(Param::ocurlim));
-
-    SendFrame({ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f });
-    ASSERT(!Param::GetBool(Param::ocurlim));
-}
-
-static void receive_map_big_endian_single_bit_last_bit()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 63, -1, 1.0, 0);
-
-    SendFrame({ 0, 0, 0, 0, 0, 0, 0, 1 });
-    ASSERT(Param::GetBool(Param::ocurlim));
-
-    SendFrame({ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe });
-    ASSERT(!Param::GetBool(Param::ocurlim));
-}
-
-static void receive_map_little_endian_single_bit_in_first_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 21, 1, 1.0, 0);
-
-    SendFrame({ 0, 0, 0x20, 0, 0, 0, 0, 0 });
-    ASSERT(Param::GetBool(Param::ocurlim));
-
-    SendFrame({ 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff });
-    ASSERT(!Param::GetBool(Param::ocurlim));
-}
-
-static void receive_map_little_endian_single_bit_in_second_word()
-{
-    canMap->AddRecv(Param::ocurlim, CanId, 53, 1, 1.0, 0);
-
-    SendFrame({ 0, 0, 0, 0, 0, 0, 0x20, 0 });
-    ASSERT(Param::GetBool(Param::ocurlim));
-
-    SendFrame({ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff });
-    ASSERT(!Param::GetBool(Param::ocurlim));
-}
-
-static void fail_to_map_with_invalid_can_id()
-{
-    ASSERT(
-        canMap->AddSend(Param::amp, 0x800, 0, 16, 1.0) == CAN_ERR_INVALID_ID);
-
-    ASSERT(
-        canMap->AddSend(Param::amp, 0x40000000, 0, 16, 1.0) ==
-        CAN_ERR_INVALID_ID);
-}
-
-static void fail_to_map_with_invalid_little_endian_offset()
-{
-    ASSERT(
-        canMap->AddSend(Param::amp, 0x123, -1, 1, 1.0) == CAN_ERR_INVALID_OFS);
-    ASSERT(
-        canMap->AddSend(Param::amp, 0x123, 64, 1, 1.0) == CAN_ERR_INVALID_OFS);
-}
-
-static void fail_to_map_with_invalid_little_endian_length()
-{
-    ASSERT(
-        canMap->AddSend(Param::amp, 0x123, 0, 0, 1.0) == CAN_ERR_INVALID_LEN);
-    ASSERT(
-        canMap->AddSend(Param::amp, 0x123, 0, 33, 1.0) == CAN_ERR_INVALID_LEN);
-}
-
-static void fail_to_map_with_invalid_little_endian_total_struct_offset()
-{
-    ASSERT(
-        canMap->AddSend(Param::amp, 0x123, 63, 2, 1.0) == CAN_ERR_INVALID_OFS);
-    ASSERT(
-        canMap->AddSend(Param::amp, 0x123, 49, 16, 1.0) == CAN_ERR_INVALID_OFS);
-}
-
-static void fail_to_map_with_invalid_big_endian_offset()
-{
-    ASSERT(
-        canMap->AddSend(Param::amp, 0x123, -1, -1, 1.0) == CAN_ERR_INVALID_OFS);
-    ASSERT(
-        canMap->AddSend(Param::amp, 0x123, 64, -1, 1.0) == CAN_ERR_INVALID_OFS);
-}
-
-static void fail_to_map_with_invalid_big_endian_length()
-{
-    ASSERT(
-        canMap->AddSend(Param::amp, 0x123, 0, -33, 1.0) == CAN_ERR_INVALID_LEN);
-}
-
-static void fail_to_map_with_invalid_big_endian_total_struct_offset()
-{
-    ASSERT(
-        canMap->AddSend(Param::amp, 0x123, 0, -2, 1.0) == CAN_ERR_INVALID_OFS);
-    ASSERT(
-        canMap->AddSend(Param::amp, 0x123, 14, -16, 1.0) ==
-        CAN_ERR_INVALID_OFS);
-    ASSERT(
-        canMap->AddSend(Param::amp, 0x123, 7, -32, 1.0) ==
-        CAN_ERR_INVALID_OFS);
-    ASSERT(
-        canMap->AddSend(Param::amp, 0x123, 30, -32, 1.0) ==
-        CAN_ERR_INVALID_OFS);
-}
-
-REGISTER_TEST(
-    CanMapTest,
-    send_map_little_endian_byte_in_first_word,
-    send_map_little_endian_16_bit_in_first_word,
-    send_map_little_endian_32_bit_in_first_word,
-    send_map_little_endian_32_bit_in_second_word,
-    send_map_little_endian_negative_number_16_bit_in_first_word,
-    send_map_little_endian_negative_number_24_bit_in_first_word,
-    send_map_little_endian_negative_number_32_bit_in_first_word,
-    send_map_little_endian_negative_number_32_bit_in_second_word,
-    send_map_little_endian_negative_number_32_bit_spanning_both_words,
-    send_map_little_endian_negative_number_32_bit_mostly_in_first_word,
-    send_map_little_endian_negative_number_32_bit_mostly_in_second_word,
-    send_map_little_endian_negative_number_16_bit_at_end_of_frame,
-    send_map_big_endian_byte_in_first_word,
-    send_map_big_endian_16_bit_in_first_word,
-    send_map_big_endian_32_bit_in_first_word,
-    send_map_big_endian_negative_byte_in_first_word,
-    send_map_big_endian_negative_16_bit_in_first_word,
-    send_map_big_endian_negative_24_bit_in_first_word,
-    send_map_big_endian_negative_32_bit_in_first_word,
-    send_map_big_endian_negative_byte_in_second_word,
-    send_map_big_endian_negative_16_bit_in_second_word,
-    send_map_big_endian_negative_24_bit_in_second_word,
-    send_map_big_endian_negative_32_bit_in_second_word,
-    send_map_big_endian_negative_number_24_bit_at_end_of_frame,
-    send_map_big_endian_negative_16_bit_spanning_both_words,
-    send_map_big_endian_negative_32_bit_spanning_both_words,
-    send_map_big_endian_negative_32_bit_mostly_in_first_word,
-    send_map_big_endian_negative_32_bit_mostly_in_second_word,
-    receive_map_little_endian_byte_in_first_word,
-    receive_map_little_endian_16_bit_in_first_word,
-    receive_map_little_endian_32_bit_in_first_word,
-    receive_map_little_endian_32_bit_in_second_word,
-    receive_map_little_endian_negative_number_16_bit_in_first_word,
-    receive_map_little_endian_negative_number_24_bit_in_first_word,
-    receive_map_little_endian_negative_number_31_bit_in_first_word,
-    receive_map_little_endian_negative_number_32_bit_in_first_word,
-    receive_map_little_endian_negative_number_32_bit_in_second_word,
-    receive_map_little_endian_negative_number_32_bit_spanning_both_words,
-    receive_map_little_endian_negative_number_32_bit_mostly_in_first_word,
-    receive_map_little_endian_negative_number_32_bit_mostly_in_second_word,
-    receive_map_little_endian_negative_number_16_bit_at_end_of_frame,
-    receive_map_big_endian_byte_in_first_word,
-    receive_map_big_endian_16_bit_in_first_word,
-    receive_map_big_endian_31_bit_in_first_word,
-    receive_map_big_endian_32_bit_in_first_word,
-    receive_map_big_endian_negative_byte_in_first_word,
-    receive_map_big_endian_negative_16_bit_in_first_word,
-    receive_map_big_endian_negative_24_bit_in_first_word,
-    receive_map_big_endian_negative_31_bit_in_first_word,
-    receive_map_big_endian_negative_32_bit_in_first_word,
-    receive_map_big_endian_negative_byte_in_second_word,
-    receive_map_big_endian_negative_16_bit_in_second_word,
-    receive_map_big_endian_negative_24_bit_in_second_word,
-    receive_map_big_endian_negative_32_bit_in_second_word,
-    receive_map_big_endian_negative_number_24_bit_at_end_of_frame,
-    receive_map_big_endian_negative_16_bit_spanning_both_words,
-    receive_map_big_endian_negative_32_bit_spanning_both_words,
-    receive_map_big_endian_negative_32_bit_mostly_in_first_word,
-    receive_map_big_endian_negative_32_bit_mostly_in_second_word,
-    receive_map_little_endian_single_bit_first_bit,
-    receive_map_big_endian_single_bit_first_bit,
-    receive_map_little_endian_single_bit_last_bit,
-    receive_map_big_endian_single_bit_last_bit,
-    receive_map_little_endian_single_bit_in_first_word,
-    receive_map_little_endian_single_bit_in_second_word,
-    fail_to_map_with_invalid_can_id,
-    fail_to_map_with_invalid_little_endian_offset,
-    fail_to_map_with_invalid_little_endian_length,
-    fail_to_map_with_invalid_little_endian_total_struct_offset,
-    fail_to_map_with_invalid_big_endian_offset,
-    fail_to_map_with_invalid_big_endian_length,
-    fail_to_map_with_invalid_big_endian_total_struct_offset);
diff --git a/test/test_fp.cpp b/test/test_fp.cpp
index 30c553d..a57f163 100644
--- a/test/test_fp.cpp
+++ b/test/test_fp.cpp
@@ -31,37 +31,6 @@ class FPTest: public UnitTest
       FPTest(const std::list<VoidFunction>* cases): UnitTest(cases) {}
 };
 
-static void TestMacros()
-{
-   ASSERT(FP_MUL(FP_FROMFLT(5.5), FP_FROMFLT(2.03125)) == FP_FROMFLT(5.5 * 2.03125));
-   ASSERT(FP_MUL(FP_FROMFLT(5.5), FP_FROMFLT(2.03225)) == FP_FROMFLT(5.5 * 2.03125));
-   ASSERT(FP_DIV(FP_FROMFLT(5.5), FP_FROMFLT(2.03125)) == FP_FROMFLT(5.5 / 2.03125));
-}
-
-static void TestItoa()
-{
-   char buf[10];
-   ASSERT(strcmp(fp_itoa(buf, FP_FROMFLT(2.03125)), "2.03") == 0);
-   ASSERT(strcmp(fp_itoa(buf, FP_FROMFLT(-2.125)), "-2.12") == 0);
-   ASSERT(strcmp(fp_itoa(buf, FP_FROMFLT(2.15624)), "2.12") == 0);
-   ASSERT(strcmp(fp_itoa(buf, FP_FROMFLT(2.15625)), "2.15") == 0);
-}
-
-static void TestAtoi()
-{
-   ASSERT(fp_atoi("-2.5", 5) == FP_FROMFLT(-2.5));
-   ASSERT(fp_atoi("2.155", 5) == FP_FROMFLT(2.16));
-}
-
-static void TestMedian3()
-{
-   ASSERT(MEDIAN3(1,2,3) == 2);
-   ASSERT(MEDIAN3(3,2,1) == 2);
-   ASSERT(MEDIAN3(1,3,2) == 2);
-   ASSERT(MEDIAN3(2,3,1) == 2);
-   ASSERT(MEDIAN3(2,1,3) == 2);
-}
-
 static void TestAtan2()
 {
    uint16_t res;
@@ -73,6 +42,6 @@ static void TestAtan2()
 }
 
 //This line registers the test
-REGISTER_TEST(FPTest, TestMacros, TestItoa, TestAtoi, TestMedian3, TestAtan2);
+REGISTER_TEST(FPTest, TestAtan2);