Merge pull request #126 from UWARG/DMA-Arming-Bug

Fixed DMA bug when armed
UWARG · Apr 30, 2017 · 4ccbb14 · 4ccbb14
2 parents 125acdf + 19629ee
commit 4ccbb14
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Autopilot/AttitudeManager/StateMachine.c b/Autopilot/AttitudeManager/StateMachine.c
@@ -48,7 +48,7 @@ void StateMachine(char entryLocation){
         // If there's new IMU data, run flight control.
         flightUpdate = true;
     }
-    else if(newInterchipData() && checkDMA()){
+    if(newInterchipData() && checkDMA()){
         // if we have new interchip data (heading, etc), run flight control
         flightUpdate = true;
     }

diff --git a/Autopilot/GPS/nbproject/configurations.xml b/Autopilot/GPS/nbproject/configurations.xml
@@ -51,7 +51,7 @@
         <targetPluginBoard></targetPluginBoard>
         <platformTool>ICD3PlatformTool</platformTool>
         <languageToolchain>XC16</languageToolchain>
-        <languageToolchainVersion>1.26</languageToolchainVersion>
+        <languageToolchainVersion>1.31</languageToolchainVersion>
         <platform>3</platform>
       </toolsSet>
       <compileType>
@@ -66,6 +66,8 @@
           <parseOnProdLoad>true</parseOnProdLoad>
           <alternateLoadableFile></alternateLoadableFile>
         </loading>
+        <subordinates>
+        </subordinates>
       </compileType>
       <makeCustomizationType>
         <makeCustomizationPreStepEnabled>false</makeCustomizationPreStepEnabled>
@@ -118,8 +120,6 @@
       <C30-AR>
         <property key="additional-options-chop-files" value="false"/>
       </C30-AR>
-      <C30-AS>
-      </C30-AS>
       <C30-LD>
         <property key="additional-options-use-response-files" value="false"/>
         <property key="boot-eeprom" value="no_eeprom"/>

diff --git a/Autopilot/GPS/nbproject/project.xml b/Autopilot/GPS/nbproject/project.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://www.netbeans.org/ns/project/1">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
     <type>com.microchip.mplab.nbide.embedded.makeproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/make-project/1">