Merge remote-tracking branch 'origin/next' into Horus

# Conflicts:
#	companion/src/CMakeLists.txt
#	companion/src/firmwares/opentx/opentxinterface.cpp
#	companion/src/firmwares/opentx/simulator/CMakeLists.txt
#	companion/src/firmwares/opentx/stamp-opentx.h.in
#	radio/src/Makefile
#	radio/src/cli.cpp
#	radio/src/gui/Taranis/helpers.cpp
#	radio/src/gui/Taranis/lcd.cpp
#	radio/src/gui/Taranis/menu_model_setup.cpp
#	radio/src/gui/Taranis/view_main.cpp
#	radio/src/lua_api.cpp
#	radio/src/main_avr.cpp
#	radio/src/myeeprom.h
#	radio/src/opentx.cpp
#	radio/src/pulses/pxx_arm.cpp
#	radio/src/storage/eeprom_conversions.cpp
#	radio/src/targets/Horus/adc_driver.cpp
#	radio/src/targets/Horus/board_horus.cpp
#	radio/src/targets/Horus/board_horus.h
#	radio/src/targets/Horus/diskio.cpp
#	radio/src/targets/Horus/hal.h
#	radio/src/targets/Horus/haptic_driver.cpp
#	radio/src/targets/Horus/i2c_driver.cpp
#	radio/src/targets/Horus/keys_driver.cpp
#	radio/src/targets/Horus/lcd_driver.cpp
#	radio/src/targets/Horus/led_driver.cpp
#	radio/src/targets/Horus/pulses_driver.cpp
#	radio/src/targets/Horus/pwr_driver.c
#	radio/src/targets/Horus/sdio_sd.c
#	radio/src/targets/Horus/sdio_sd.h
#	radio/src/targets/Horus/serial2_driver.cpp
#	radio/src/targets/Horus/telemetry_driver.cpp
#	radio/src/targets/Horus/usb_conf.h
#	radio/src/targets/Horus/usbd_desc.c
#	radio/src/targets/Horus/usbd_storage_msd.cpp

companion/src/simulation/simulatorinterface.cpp

@@ -6,6 +6,9 @@
 #include <QMap>
 #include <QMessageBox>
 #include "version.h"
+#if defined WIN32 || !defined __GNUC__
+  #include <windows.h>
+#endif
 
 QMap<QString, SimulatorFactory *> registered_simulators;
 
@@ -47,10 +50,15 @@ void registerSimulators()
     simulatorsFound = true;
   }
 
-#if defined(__APPLE__) || !( (!defined __GNUC__) || (defined __CYGWIN__) )
   if (!simulatorsFound) {
 #if defined(__APPLE__)
     dir = QLibraryInfo::location(QLibraryInfo::PrefixPath) + "/Resources";
+#elif (!defined __GNUC__) 
+    char name[MAX_PATH];
+    GetModuleFileName(NULL, name, MAX_PATH);
+	QString path(name);
+	path.truncate(path.lastIndexOf('\\'));
+	dir.setPath(path);
 #else
     dir = SIMULATOR_LIB_SEARCH_PATH;
 #endif
@@ -59,7 +67,6 @@ void registerSimulators()
       simulatorsFound = true;
     }
   }
-#endif
 }
 
 SimulatorFactory *getSimulatorFactory(const QString &name)
@@ -81,3 +88,9 @@ SimulatorFactory *getSimulatorFactory(const QString &name)
   return NULL;
 }
 
+void unregisterSimulators()
+{
+  foreach(SimulatorFactory *factory, registered_simulators) {
+    delete factory;
+  }
+}

companion/src/simulation/simulatorinterface.h

@@ -118,6 +118,7 @@ class SimulatorFactory {
 };
 
 void registerSimulators();
+void unregisterSimulators();
 SimulatorFactory *getSimulatorFactory(const QString &name);
 extern QMap<QString, SimulatorFactory *> registered_simulators;