Merge pull request #14 from floripasat/dev

Dev: Version 1.0.0 (Flight Model)

Author: mgm8

firmware/fsat_beacon_msp430/drivers/antenna/isis_antenna.c

@@ -25,7 +25,7 @@
  * 
  * \author Gabriel Mariano Marcelino <gabriel.mm8@gmail.com>
  * 
- * \version 0.5.16
+ * \version 0.5.17
  * 
  * \date 20/09/2017
  * 
@@ -48,8 +48,9 @@ void isis_antenna_init()
 
     isis_antenna_status_t status = isis_antenna_read_deployment_status();
 
+    uint16_t temp_val = isis_antenna_get_temperature();
     debug_print_event_from_module(DEBUG_INFO, ISIS_ANTENNA_MODULE_NAME, "Temperature raw data = ");
-    debug_print_dec(isis_antenna_get_temperature());
+    debug_print_dec(temp_val);
     debug_print_msg("\n\r");
 
     debug_print_event_from_module(DEBUG_INFO, ISIS_ANTENNA_MODULE_NAME, "Deployment status (code=");
@@ -59,7 +60,7 @@ void isis_antenna_init()
     // Antenna 1
     debug_print_event_from_module(DEBUG_INFO, ISIS_ANTENNA_MODULE_NAME, "\t- Antenna 1: ");
 
-    if (status.antenna_1.status)
+    if (!status.antenna_1.status)
     {
         debug_print_msg("DEPLOYED\n\r");
     }
@@ -71,7 +72,7 @@ void isis_antenna_init()
     // Antenna 2
     debug_print_event_from_module(DEBUG_INFO, ISIS_ANTENNA_MODULE_NAME, "\t- Antenna 2: ");
 
-    if (status.antenna_2.status)
+    if (!status.antenna_2.status)
     {
         debug_print_msg("DEPLOYED\n\r");
     }
@@ -83,7 +84,7 @@ void isis_antenna_init()
     // Antenna 3
     debug_print_event_from_module(DEBUG_INFO, ISIS_ANTENNA_MODULE_NAME, "\t- Antenna 3: ");
 
-    if (status.antenna_3.status)
+    if (!status.antenna_3.status)
     {
         debug_print_msg("DEPLOYED\n\r");
     }
@@ -95,7 +96,7 @@ void isis_antenna_init()
     // Antenna 4
     debug_print_event_from_module(DEBUG_INFO, ISIS_ANTENNA_MODULE_NAME, "\t- Antenna 4: ");
 
-    if (status.antenna_4.status)
+    if (!status.antenna_4.status)
     {
         debug_print_msg("DEPLOYED\n\r");
     }

firmware/fsat_beacon_msp430/hal/antenna/antenna.c

@@ -25,7 +25,7 @@
  * 
  * \author Gabriel Mariano Marcelino <gabriel.mm8@gmail.com>
  * 
- * \version 0.5.15
+ * \version 0.5.19
  * 
  * \date 15/06/2017
  * 
@@ -72,6 +72,8 @@ void antenna_deploy()
         if (isis_antenna_arm())
         {
             debug_print_event_from_module(DEBUG_INFO, ANTENNA_MODULE_NAME, "The antenna module is armed!\n\r");
+
+            break;
         }
         else
         {

firmware/fsat_beacon_msp430/hal/antenna/antenna_config.h

@@ -25,7 +25,7 @@
  * 
  * \author Gabriel Mariano Marcelino <gabriel.mm8@gmail.com>
  * 
- * \version 0.5.15
+ * \version 0.5.18
  * 
  * \date 23/02/2019
  * 
@@ -47,7 +47,7 @@
 #define ANTENNA_ARMING_TIMEOUT_MS                   (ANTENNA_ARMING_TIMEOUT_S*1000)
 #define ANTENNA_ARMING_ATTEMPTS                     5
 
-#define ANTENNA_INDEPENDENT_DEPLOYMENT_BURN_TIME_S  6
+#define ANTENNA_INDEPENDENT_DEPLOYMENT_BURN_TIME_S  10
 #define ANTENNA_INDEPENDENT_DEPLOYMENT_BURN_TIME_MS (ANTENNA_INDEPENDENT_DEPLOYMENT_BURN_TIME_S*1000)
 
 #define ANTENNA_SEQUENTIAL_DEPLOYMENT_BURN_TIME_S   (4*ANTENNA_OVERRIDE_DEPLOYMENT_BURN_TIME_S)

firmware/fsat_beacon_msp430/version.h

@@ -25,7 +25,7 @@
  * 
  * \author Gabriel Mariano Marcelino <gabriel.mm8@gmail.com>
  * 
- * \version 0.5.16
+ * \version 1.0.0
  * 
  * \date 08/02/2019
  * 
@@ -36,9 +36,9 @@
 #ifndef VERSION_H_
 #define VERSION_H_
 
-#define FIRMWARE_VERSION        "0.5.16"
+#define FIRMWARE_VERSION        "1.0.0"
 
-#define FIRMWARE_STATUS         "Testing"
+#define FIRMWARE_STATUS         "Production"
 
 #define FIRMWARE_AUTHOR_NAME    "Gabriel Mariano Marcelino"
 #define FIRMWARE_AUTHOR_EMAIL   "gabriel.mm8@gmail.com"