From 6d347954941e718c374c10402f1f86c5072e0683 Mon Sep 17 00:00:00 2001
From: "Richard Flay (Hyper)" <hyperreality.au+openpilot@gmail.com>
Date: Wed, 1 Aug 2012 19:53:59 +0930
Subject: [PATCH] Re-enabled simposix SDCard support, and removed obsolete
 SDCard alarm usage from System module

---
 flight/Modules/System/systemmod.c             |  9 ---------
 flight/SimPosix/System/inc/pios_config.h      |  1 +
 .../diagrams/default/system-health.svg        | 20 -------------------
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/flight/Modules/System/systemmod.c b/flight/Modules/System/systemmod.c
index 33bf462fb..715c26d72 100644
--- a/flight/Modules/System/systemmod.c
+++ b/flight/Modules/System/systemmod.c
@@ -463,15 +463,6 @@ static void updateSystemAlarms()
 		AlarmsClear(SYSTEMALARMS_ALARM_STACKOVERFLOW);
 	}
 
-#if defined(PIOS_INCLUDE_SDCARD)
-	// Check for SD card
-	if (PIOS_SDCARD_IsMounted() == 0) {
-		AlarmsSet(SYSTEMALARMS_ALARM_SDCARD, SYSTEMALARMS_ALARM_ERROR);
-	} else {
-		AlarmsClear(SYSTEMALARMS_ALARM_SDCARD);
-	}
-#endif
-
 	// Check for event errors
 	UAVObjGetStats(&objStats);
 	EventGetStats(&evStats);
diff --git a/flight/SimPosix/System/inc/pios_config.h b/flight/SimPosix/System/inc/pios_config.h
index 84d857f19..d4add3666 100644
--- a/flight/SimPosix/System/inc/pios_config.h
+++ b/flight/SimPosix/System/inc/pios_config.h
@@ -44,6 +44,7 @@
 //#define PIOS_INCLUDE_I2C
 #define PIOS_INCLUDE_IRQ
 #define PIOS_INCLUDE_LED
+#define PIOS_INCLUDE_SDCARD
 //#define PIOS_INCLUDE_IAP
 #define PIOS_INCLUDE_SERVO
 #define PIOS_INCLUDE_SPI
diff --git a/ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg b/ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg
index 2ec58bd37..fb82a980c 100644
--- a/ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg
+++ b/ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg
@@ -1385,26 +1385,6 @@
        id="Telemetry-Critical"
        style="fill:#cf0e0e;fill-opacity:1;stroke:#ffffff;stroke-width:0.29055119;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
   </g>
-  <g
-     style="display:inline"
-     inkscape:label="SDCard-OK"
-     id="layer1"
-     inkscape:groupmode="layer" />
-  <g
-     style="display:inline"
-     inkscape:label="SDCard-Warning"
-     id="layer6"
-     inkscape:groupmode="layer" />
-  <g
-     style="display:inline"
-     inkscape:label="SDCard-Error"
-     id="layer11"
-     inkscape:groupmode="layer" />
-  <g
-     style="display:inline"
-     inkscape:label="SDCard-Critical"
-     id="layer20"
-     inkscape:groupmode="layer" />
   <g
      style="display:none"
      inkscape:label="Memory-OK"