From 0f54f9126371af5cfcd411dbdfebdb71109144cc Mon Sep 17 00:00:00 2001 From: LiamSmego Date: Mon, 22 Mar 2021 08:59:32 -0400 Subject: [PATCH] cleanup --- main/main.ino | 47 ----------------------------------------------- main/matrix.cpp | 4 ++++ main/matrix.hh | 2 +- 3 files changed, 5 insertions(+), 48 deletions(-) diff --git a/main/main.ino b/main/main.ino index 92e767d..a3c36a7 100644 --- a/main/main.ino +++ b/main/main.ino @@ -132,12 +132,6 @@ void loop() { if (change_mode_to_countdown(millis()>ws.next_mode_time)) { - Serial.println(" "); - Serial.print("----------------------- "); - Serial.print(ws.mode); - Serial.print("t"); - Serial.print(" -----------------------"); - Serial.println(" "); transition_to_countdown(); ws.next_mode_time=millis()+COUNTDOWN_PERIOD*KILO_I; ws.mode = COUNTDOWN; @@ -152,19 +146,9 @@ void loop() { if (change_mode_to_final_countdown(millis()>ws.next_mode_time)) { - Serial.println(" "); - Serial.print("----------------------- "); - Serial.print(ws.mode); - Serial.print("t"); - Serial.print(" -----------------------"); - Serial.println(" "); - transition_to_final_countdown(); - Serial.println("here"); ws.next_mode_time=millis()+FINAL_COUNTDOWN_PERIOD*KILO_I; - Serial.println("here"); ws.mode = FINAL_COUNTDOWN; - Serial.println("here"); } else { @@ -177,12 +161,6 @@ void loop() { if (change_mode_to_prep_tvc(millis()>ws.next_mode_time)) { - Serial.println(" "); - Serial.print("----------------------- "); - Serial.print(ws.mode); - Serial.print("t"); - Serial.print(" -----------------------"); - Serial.println(" "); transition_to_prep_tvc(); ws.next_mode_time=millis()+PREP_TVC_PERIOD*KILO_I; ws.mode = PREP_TVC; @@ -234,31 +212,6 @@ void loop() } } - - - //count++; - //if(count%150==0) - //{ - //main_display_matrix(ws.y); - //main_display_matrix(ws.x); - Serial.println(millis()); - Serial.println(ws.next_mode_time); - Serial.println(); - //Serial.print(ws.theta_0[0]); - //Serial.print(" "); - //Serial.print(ws.theta_0[1]); - //Serial.print(" "); - //Serial.println(ws.theta_0[2]); - - //Serial.print(ws.theta_1[0]); - //Serial.print(" "); - //Serial.print(ws.theta_1[1]); - //Serial.print(" "); - //Serial.println(ws.theta_1[2]); - //Serial.println(" "); - //} - - //Serial.println(ws.dt); // TODO: add data record // TODO: add (somewhere else) data struct } diff --git a/main/matrix.cpp b/main/matrix.cpp index acd72be..8bec628 100644 --- a/main/matrix.cpp +++ b/main/matrix.cpp @@ -10,6 +10,7 @@ float * m_sub_helper(float * A, float * B, int elements) { for (int i = 0; i < elements; i++) { C[i] = A[i] - B[i]; } + //delete C; return C; } @@ -20,6 +21,7 @@ float * s_mult_helper(float * A, float rho, int elements) { for (int i = 0; i < elements; i++) { C[i] = A[i] * rho; } + //delete C; return C; } @@ -38,6 +40,7 @@ float * m_mult_helper(float * A, float * B, int m, int n, int p) { } } } + //delete C; return C; } @@ -48,6 +51,7 @@ float * m_add_helper(float * A, float * B, int elements) { for (int i = 0; i < elements; i++) { C[i] = A[i] + B[i]; } + //delete C; return C; } diff --git a/main/matrix.hh b/main/matrix.hh index d83f627..0124176 100644 --- a/main/matrix.hh +++ b/main/matrix.hh @@ -35,4 +35,4 @@ class Matrix string display_matrix(Matrix); -#endif // __MODING_HH__ +#endif