Teensy 35 test fixes (speeduino#1343)

* Avoid division by zero

* Unit tests: compile fixes for teensy 3.5

* Compile warning: use fixed size array parameters

Author: adbancroft

speeduino/maths.h

@@ -372,7 +372,7 @@ static inline int16_t LOW_PASS_FILTER(int16_t input, uint8_t alpha, int16_t prio
  */
 static inline uint8_t scale(const uint8_t from, const uint8_t fromRange, const uint8_t toRange) {
   // Using uint16_t to avoid overflow when calculating the result
-  return (((uint16_t)from * (uint16_t)toRange) / (uint16_t)fromRange);
+  return fromRange==0U ? 0U : (((uint16_t)from * (uint16_t)toRange) / (uint16_t)fromRange);
 }
 
 /**

test/test_math/test_fast_map.cpp

@@ -15,7 +15,7 @@ static void test_fast_map_edge_cases(void) {
     TEST_ASSERT_EQUAL_UINT8(0, fast_map(10, 10, 20, 0, 100));
     // Input equals end of range
     TEST_ASSERT_EQUAL_UINT8(100, fast_map(20, 10, 20, 0, 100));
-    // Single point range
+    // // Single point range
     TEST_ASSERT_EQUAL_UINT8(50, fast_map(10, 10, 10, 50, 50));
 }
 

test/test_math/test_low_pass_filter.cpp

@@ -4,34 +4,34 @@
 
 static void test_U16_min(void) {
     // Passing zero for the filter value should return the input value
-    TEST_ASSERT_EQUAL_UINT16(0,     LOW_PASS_FILTER(0U,    0U, 0U));
-    TEST_ASSERT_EQUAL_UINT16(1234U, LOW_PASS_FILTER(1234U, 0U, 0U));
-    TEST_ASSERT_EQUAL_UINT16(1234U, LOW_PASS_FILTER(1234U, 0U, 9999U));
+    TEST_ASSERT_EQUAL_UINT16(0,     LOW_PASS_FILTER(0U,    0U, (uint16_t)0));
+    TEST_ASSERT_EQUAL_UINT16(1234U, LOW_PASS_FILTER(1234U, 0U, (uint16_t)0));
+    TEST_ASSERT_EQUAL_UINT16(1234U, LOW_PASS_FILTER(1234U, 0U, (uint16_t)9999));
 }
 
 static void test_U16_max(void) {
     // Passing UINT8_MAX for the filter value should make the input close to the previous value
-    TEST_ASSERT_EQUAL_UINT16(0,     LOW_PASS_FILTER(0U,    UINT8_MAX, 0U));
-    TEST_ASSERT_EQUAL_UINT16(4U,    LOW_PASS_FILTER(1234U, UINT8_MAX, 0U));
-    TEST_ASSERT_EQUAL_UINT16(9964U, LOW_PASS_FILTER(1234U, UINT8_MAX, 9999U));
+    TEST_ASSERT_EQUAL_UINT16(0,     LOW_PASS_FILTER((uint16_t)0,    UINT8_MAX, (uint16_t)0));
+    TEST_ASSERT_EQUAL_UINT16(4U,    LOW_PASS_FILTER((uint16_t)1234, UINT8_MAX, (uint16_t)0));
+    TEST_ASSERT_EQUAL_UINT16(9964U, LOW_PASS_FILTER((uint16_t)1234, UINT8_MAX, (uint16_t)9999));
 }
 
 static void test_S16_min(void) {
     // Passing zero for the filter value should return the input value
-    TEST_ASSERT_EQUAL_INT16(0,    LOW_PASS_FILTER(0,   0U, 0));
-    TEST_ASSERT_EQUAL_INT16(1234, LOW_PASS_FILTER(1234, 0U, 0));
-    TEST_ASSERT_EQUAL_INT16(-1234, LOW_PASS_FILTER(-1234, 0U, 0));
-    TEST_ASSERT_EQUAL_INT16(1234, LOW_PASS_FILTER(1234, 0U, 9999));
-    TEST_ASSERT_EQUAL_INT16(-1234, LOW_PASS_FILTER(-1234, 0U, 9999));
+    TEST_ASSERT_EQUAL_INT16(0,    LOW_PASS_FILTER((int16_t)0,   0U, (int16_t)0));
+    TEST_ASSERT_EQUAL_INT16(1234, LOW_PASS_FILTER((int16_t)1234, 0U, (int16_t)0));
+    TEST_ASSERT_EQUAL_INT16(-1234, LOW_PASS_FILTER((int16_t)-1234, 0U, (int16_t)0));
+    TEST_ASSERT_EQUAL_INT16(1234, LOW_PASS_FILTER((int16_t)1234, 0U, (int16_t)9999));
+    TEST_ASSERT_EQUAL_INT16(-1234, LOW_PASS_FILTER((int16_t)-1234, 0U, (int16_t)9999));
 }
 
 static void test_S16_max(void) {
     // Passing UINT8_MAX for the filter value should make the input close to the previous value
-    TEST_ASSERT_EQUAL_INT16(0,    LOW_PASS_FILTER(0,   UINT8_MAX, 0));
-    TEST_ASSERT_EQUAL_INT16(4,    LOW_PASS_FILTER(1234, UINT8_MAX, 0));
-    TEST_ASSERT_EQUAL_INT16(-4,    LOW_PASS_FILTER(-1234, UINT8_MAX, 0));
-    TEST_ASSERT_EQUAL_INT16(9964, LOW_PASS_FILTER(1234, UINT8_MAX, 9999));
-    TEST_ASSERT_EQUAL_INT16(-9964, LOW_PASS_FILTER(-1234, UINT8_MAX, -9999));
+    TEST_ASSERT_EQUAL_INT16(0,    LOW_PASS_FILTER((int16_t)0,   UINT8_MAX, (int16_t)0));
+    TEST_ASSERT_EQUAL_INT16(4,    LOW_PASS_FILTER((int16_t)1234, UINT8_MAX, (int16_t)0));
+    TEST_ASSERT_EQUAL_INT16(-4,    LOW_PASS_FILTER((int16_t)-1234, UINT8_MAX, (int16_t)0));
+    TEST_ASSERT_EQUAL_INT16(9964, LOW_PASS_FILTER((int16_t)1234, UINT8_MAX, (int16_t)9999));
+    TEST_ASSERT_EQUAL_INT16(-9964, LOW_PASS_FILTER((int16_t)-1234, UINT8_MAX, (int16_t)-9999));
 }
 
 void test_LOW_PASS_FILTER(void) {

test/test_utils.h

@@ -143,7 +143,7 @@ static inline void populate_2dtable(table2D<axis_t, value_t, sizeT> *pTable, val
 }
 
 template <typename axis_t, typename value_t, uint8_t sizeT>
-static inline void populate_2dtable(table2D<axis_t, value_t, sizeT> *pTable, const value_t values[], const axis_t bins[]) {
+static inline void populate_2dtable(table2D<axis_t, value_t, sizeT> *pTable, const value_t (&values)[sizeT], const axis_t (&bins)[sizeT]) {
   memcpy((void*)pTable->axis, bins, sizeT * sizeof(axis_t));
   memcpy((void*)pTable->values, values, sizeT * sizeof(value_t));
   pTable->cache.cacheTime = UINT8_MAX;
@@ -152,7 +152,7 @@ static inline void populate_2dtable(table2D<axis_t, value_t, sizeT> *pTable, con
 // Populate a 2d table (from PROGMEM if available)
 // You would typically declare the 2 source arrays using TEST_DATA_P
 template <typename axis_t, typename value_t, uint8_t sizeT>
-static inline void populate_2dtable_P(table2D<axis_t, value_t, sizeT> *pTable, const value_t values[], const axis_t bins[]) {
+static inline void populate_2dtable_P(table2D<axis_t, value_t, sizeT> *pTable, const value_t (&values)[sizeT], const axis_t (&bins)[sizeT]) {
 #if defined(PROGMEM)
   memcpy_P((void*)pTable->axis, bins, sizeT * sizeof(axis_t));
   memcpy_P((void*)pTable->values, values, sizeT * sizeof(value_t));

test/timer.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <inttypes.h>
+#include <stdio.h>
 
 #if defined(__AVR__)
 #include <Arduino.h>