From 93ca2436b1360aff7226d0dfdb5f62147a3de84a Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Wed, 13 Feb 2013 06:58:31 +0000
Subject: [PATCH] Companion9x didn't simulate a single the model in ModelEdit
 (open9x / sky9x board)

---
 src/open9x.cpp      | 4 ++--
 src/simpgmspace.cpp | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/open9x.cpp b/src/open9x.cpp
index 68432d306..0d345a945 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -3505,7 +3505,7 @@ inline void open9xInit(OPEN9X_INIT_ARGS)
 
   if (UNEXPECTED_SHUTDOWN()) {
     unexpectedShutdown = 1;
-#if defined(CPUARM)
+#if defined(PCBSKY9X)
     eeLoadModel(g_eeGeneral.currModel);
 #endif
   }
@@ -3518,7 +3518,7 @@ inline void open9xInit(OPEN9X_INIT_ARGS)
     }
 #endif
 
-#if defined(CPUARM)
+#if defined(PCBSKY9X)
     eeLoadModel(g_eeGeneral.currModel);
 #endif
 
diff --git a/src/simpgmspace.cpp b/src/simpgmspace.cpp
index 16ba0d583..015ae9261 100644
--- a/src/simpgmspace.cpp
+++ b/src/simpgmspace.cpp
@@ -281,13 +281,18 @@ void *main_thread(void *)
       doSplash();
 #endif
 
-#if defined(CPUARM)
+#if defined(PCBSKY9X)
       eeLoadModel(g_eeGeneral.currModel);
 #endif
 
-      checkAlarm();
+      checkAlarm(); // TODO why not in checkAll()
       checkAll();
     }
+    else {
+#if defined(PCBSKY9X)
+      eeLoadModel(g_eeGeneral.currModel);
+#endif
+    }
 
     s_current_protocol = 0;