Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
LiamSmego committed Mar 22, 2021
1 parent 8e685c5 commit 0f54f91
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 48 deletions.
47 changes: 0 additions & 47 deletions main/main.ino
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
{
Expand All @@ -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;
Expand Down Expand Up @@ -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
}
4 changes: 4 additions & 0 deletions main/matrix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand All @@ -38,6 +40,7 @@ float * m_mult_helper(float * A, float * B, int m, int n, int p) {
}
}
}
//delete C;
return C;
}

Expand All @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion main/matrix.hh
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ class Matrix

string display_matrix(Matrix);

#endif // __MODING_HH__
#endif

0 comments on commit 0f54f91

Please sign in to comment.