From dfb3e7a1d3cce1e0451759ea3294bf0ede84fd10 Mon Sep 17 00:00:00 2001
From: Richard Meadows <richardeoin@gmail.com>
Date: Tue, 6 Oct 2015 19:29:59 +0100
Subject: [PATCH] Move some altitude test data to python testcase

---
 firmware/src/altitude.c                 | 42 -------------------------
 firmware/test/tc/barometric_altitude.py |  6 ++++
 2 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/firmware/src/altitude.c b/firmware/src/altitude.c
index 53e4840..072a1b1 100644
--- a/firmware/src/altitude.c
+++ b/firmware/src/altitude.c
@@ -112,45 +112,3 @@ double pressure_to_altitude(double pr) {
 
   return (height * (RE * 1000)) / ((RE * 1000) - height);
 }
-
-/* #ifdef ALTITUDE_TEST */
-
-/* #include <stdio.h> */
-/* #include <stdlib.h> */
-
-/* #define MAX_ERROR 10 */
-
-/* void altitude_test(double altitude, uint32_t pressure) { */
-/*   double test_altitude = pressure_to_altitude(pressure); */
-
-/*   if (test_altitude > altitude - MAX_ERROR && */
-/*       test_altitude < altitude + MAX_ERROR) { // Success */
-/*     printf("%dPa = %gm (Expected %gm)\n", pressure, test_altitude, altitude); */
-/*   } else { // Fail */
-/*     printf("\nERROR:\n"); */
-/*     printf("%dPa = %gm (Expected %gm)\n", pressure, test_altitude, altitude); */
-/*     exit(1); */
-/*   } */
-/* } */
-
-/* int main(void) { */
-/*   printf("*** ALTITUDE_TEST ***\n\n"); */
-
-/*   printf("Data from Wolfram Alpha...\n\n"); */
-/*   altitude_test(-100, 102500); */
-/*   altitude_test(   0, 101300); */
-/*   altitude_test( 1000, 89880); */
-/*   altitude_test( 3000, 70120); */
-/*   altitude_test( 7000, 41110); */
-/*   altitude_test(11000, 22700); */
-/*   altitude_test(15000, 12110); */
-/*   altitude_test(20000,  5529); */
-/*   altitude_test(25000,  2549); */
-/*   altitude_test(30000,  1197); */
-/*   altitude_test(35000,   575); */
-/*   altitude_test(40000,   287); */
-
-/*   printf("\n*** DONE ***\n"); */
-/* } */
-
-/* #endif */
diff --git a/firmware/test/tc/barometric_altitude.py b/firmware/test/tc/barometric_altitude.py
index 82fe444..4e2ff6c 100644
--- a/firmware/test/tc/barometric_altitude.py
+++ b/firmware/test/tc/barometric_altitude.py
@@ -19,6 +19,12 @@ class barometric_altitude_tc:
         self.name = self.__class__.__name__
         self.iterations = 25
 
+        # Maybe use test data from Wolfram Alpha
+        self.test_pressures = [102500, 101300, 89880, 70120, 41110, 22700,
+                               12110, 5529, 2549, 1197, 575, 287]
+        self.test_altitudes = [-100, 0, 1000, 3000, 7000, 11000, 15000,
+                               20000, 25000, 30000, 35000, 40000]
+
 
     def get_test(self):
         """Returns some suitable test parameters"""