Refactoring

Author: danieleff

display_7segment.cpp

@@ -43,13 +43,21 @@ void Rocket7SegmentDisplay::loop() {
     write(data);
 
   } else {
+    launch_type *launch = settings.getLaunch();
+    if (launch == NULL) {
+        write("LOADING ");
+        return;
+    }
 
+    int32_t launch_time = atol(launch->launch_time);
+
+    int32_t time = launch_time - settings.time_downloaded - (millis() - httpClient.info_downloaded_millis) / 1000;
+
     if ((millis() - selected_launch_changed_millis) < 2000) {
-      write(data);
+      write(launch->rocket);
       return;
     }
 
-    int32_t time = launch_at_seconds - settings.time_downloaded - (millis() - httpClient.info_downloaded_millis) / 1000;
     boolean negative = false;
     if (time < 0) {
       negative = true;
@@ -62,11 +70,11 @@ void Rocket7SegmentDisplay::loop() {
     uint32_t days = (time / 60 / 60 / 24);
 
     if (seconds == 59) {
-      write(data);
+      write(launch->rocket);
       return;
     }
 
-    if (settings.launch.time_status == 'T') {
+    if (launch->time_status == 'T') {
       ledControl.setDigit(0, 0, seconds % 10, false);
       ledControl.setDigit(0, 1, seconds / 10, false);
 
@@ -118,11 +126,8 @@ void Rocket7SegmentDisplay::setMessage(const __FlashStringHelper *message8Chars)
   loop();
 }
 
-void Rocket7SegmentDisplay::setLaunch(int32_t launch_at_seconds, char* name8Chars) {
+void Rocket7SegmentDisplay::setLaunch() {
   show_launch = true;
-  
-  this->launch_at_seconds = launch_at_seconds;
-  memcpy(data, name8Chars, 8);
 }
 
 void Rocket7SegmentDisplay::write(char* message8Chars) {

displays.cpp

@@ -33,59 +33,40 @@ void Displays::loop() {
     rocket7SegmentDisplay.loop();
   #endif
 
-  int selected_current = -1;
+  int show_launch_id = -1;
 
   if (settings.selected_launch_id == SELECTED_IP) {
 
   } else if (settings.selected_launch_id == SELECTED_NEXT) {
 
-    selected_current = settings.launches[0].launch_id;
+    show_launch_id = settings.launches[0].launch_id;
 
   } else if (settings.selected_launch_id == SELECTED_CYCLE) {
 
-    selected_current = settings.launches[(millis() / SELECTED_CYCLE_DELAY_MILLIS) % settings.launch_count].launch_id;
+    show_launch_id = settings.launches[(millis() / SELECTED_CYCLE_DELAY_MILLIS) % settings.launch_count].launch_id;
 
   } else {
 
-    selected_current = settings.selected_launch_id;
+    show_launch_id = settings.selected_launch_id;
 
   }
 
-  if (settings.selected_launch != selected_current) {
-    settings.selected_launch = selected_current;
-    
+  if (settings.show_launch_id != show_launch_id) {
     selected_launch_changed_millis = millis();
 
-    settings.loadLaunch(settings.selected_launch);
+    settings.setLaunch(show_launch_id);
 
   }
 
-  int32_t launch_time = atol(settings.launch.launch_time);
-
-  int32_t seconds_left = launch_time - settings.time_downloaded - (millis() - httpClient.info_downloaded_millis) / 1000;
-
   if (settings.selected_launch_id == SELECTED_CYCLE && (millis() - button_menu_millis) < MENU_BUTTON_SHOW_MENU_MILLIS) {
     setMessage(F("CYCLE               "));
-    //show_seconds_left_digit_display(seconds_left, false);
 
   } else if (settings.selected_launch_id == SELECTED_NEXT && (millis() - button_menu_millis) < MENU_BUTTON_SHOW_MENU_MILLIS) {
     setMessage(F("UPCOMING            "));
-    //show_seconds_left_digit_display(seconds_left, false);
-    
-  } else if (
-        settings.launch.launch_time == 0
-        || seconds_left % 60 == 59 
-        || (millis() - selected_launch_changed_millis) < MENU_BUTTON_SHOW_NAME_MILLIS) {
-    //write(settings.launch.rocket);
-    
-    //show_seconds_left_digit_display(seconds_left, false);
 
-    rocket7SegmentDisplay.setLaunch(launch_time, settings.launch.rocket);
   } else {
-    
-    //show_seconds_left_digit_display(seconds_left, true);
-    
-    rocket7SegmentDisplay.setLaunch(launch_time, settings.launch.rocket);
+
+    rocket7SegmentDisplay.setLaunch();
   }
 
   //show_ip_digit_display();
@@ -108,14 +89,16 @@ void show_seconds_left_digit_display(int32_t time, boolean onDigitDisplay, char*
 
   //char buf[16 + 1] = {0};
 
+  /*
   if (settings.launch.time_status == TIME_STATUS_TIME) {
       sprintf(buf, "%2d days %02d:%02d:%02d", days, hours, minutes, seconds);
   } else if (settings.launch.time_status == TIME_STATUS_DAY) {
       sprintf(buf, "%2d days", days);
   } else if (settings.launch.time_status == TIME_STATUS_MONTH) {
       sprintf(buf, "%2d days", days); //TODO months
   }
-
+  */
+  
 }
 
 void Displays::setMessage(const __FlashStringHelper *string) {

displays.h

@@ -14,13 +14,12 @@ class Rocket7SegmentDisplay {
     void loop();
     void setMessage(char* message8Chars);
     void setMessage(const __FlashStringHelper *message8Chars);
-    void setLaunch(int32_t launch_at_seconds, char* name8Chars);
+    void setLaunch();
   private:
     LedControl ledControl;
     void write(char* message8Chars);
 
     char data[8];
-    int32_t launch_at_seconds;
     bool show_launch;
 
 };

http.cpp

@@ -44,7 +44,7 @@ static void http_client_got_response (uint8_t status, uint16_t off, uint16_t len
   //memcpy(settings.launches + offset, response + 1, len);
   httpClient.info_downloaded_millis = millis();
 
-  settings.loadLaunch(settings.selected_launch_id);
+  settings.setLaunch(settings.selected_launch_id);
   //Serial.println(settings.launch.rocket);
 
   httpClient.next_try_millis = millis() + SUCCESS_REQUEST_RATE;

launchtime.ino

@@ -39,10 +39,6 @@ void setup () {
     settings.loadFromEEPROM();
   }
 
-Serial.println("--");
-Serial.println(settings.selected_launch_id);
-Serial.println("--");
-  
   if (digitalRead(PIN_BUTTON_MENU) == LOW) {
     demo_mode = true;
   }
@@ -110,10 +106,11 @@ void process_buttons() {
       } else {
 
         int index = settings.getIndex(settings.selected_launch_id, settings.launch_count);
+        index++;
         if (index >= settings.launch_count) {
           settings.selected_launch_id = SELECTED_IP;
         } else {
-          settings.selected_launch_id = settings.launches[index + 1].launch_id;
+          settings.selected_launch_id = settings.launches[index].launch_id;
         }
 
       }

settings.cpp

@@ -86,15 +86,16 @@ int Settings::getIndex(int launch_id, int return_if_not_found) {
 
 }
 
-void Settings::loadLaunch(int launch_id) {
-  
+launch_type *Settings::getLaunch() {
   for(int i = 0; i < launch_count; i++) {
-    if (launches[i].launch_id == launch_id) {
-      launch = launches[i];
-      break;
+    if (launches[i].launch_id == show_launch_id) {
+      return &launches[i];
     }
   }
-  
+  return NULL;
 }
 
+void Settings::setLaunch(int launch_id) {
+  show_launch_id = launch_id;
+}
 

settings.h

@@ -14,15 +14,6 @@ const char TIME_STATUS_MONTH = 'M';
 const char TIME_STATUS_DAY = 'D';
 const char TIME_STATUS_TIME = 'T';
 
-
-
-/*
-struct launch_type {
-  int32_t seconds_left;
-  char name[9];
-};
-*/
-
 struct launch_type {
   char launch_id[6 + 1];
   char launch_status;
@@ -50,12 +41,12 @@ class Settings {
     //Things not to save
     uint8_t launch_count = 1;
 
-    launch_type launch;
     int getIndex(int launch_id, int return_if_not_found);
-    void loadLaunch(int index);
+    void setLaunch(int launch_id);
+    launch_type *getLaunch();
     void processApiResponse(int index, uint8_t data);
 
-    uint32_t selected_launch = 0; //selected launch index
+    int32_t show_launch_id = -1;
 
     uint32_t time_downloaded;