fixed usb pump thread prio

added better way for connect/disconnect USB

4 files changed, 129 insertions, 5 deletions

diff --git a/software/mpu/board-F405/board-utils.c b/software/mpu/board-F405/board-utils.c
new file mode 100644
index 0000000..4928bb6
--- /dev/null
+++ b/software/mpu/board-F405/board-utils.c
@@ -0,0 +1,82 @@
+/*
+ *
+ *  mur.sat
+ *
+ *  Somewhen in the year 2012, mur.at will have a nano satellite launched
+ *  into a low earth orbit (310 km above the surface of our planet). The
+ *  satellite itself is a TubeSat personal satellite kit, developed and
+ *  launched by interorbital systems. mur.sat is a joint venture of mur.at,
+ *  ESC im Labor and realraum.
+ *
+ *  Please visit the project hompage at sat.mur.at for further information.
+ *
+ *
+ *  Copyright (C) 2013 Christian Pointner <equinox@mur.at>
+ *
+ *  This file is part of mur.sat.
+ *
+ *  mur.sat is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  mur.sat is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with mur.sat. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ch.h"
+#include "hal.h"
+
+#include "board-utils.h"
+
+#if HAL_USE_USB
+
+int usbConnect(USBDriver* usbp)
+{
+//  usbConnectBus(usbp);  // on F405 this only enables VBUS sensing - not needed
+
+#if STM32_USB_USE_OTG1
+  if(usbp == &USBD1) {
+    palClearPad(GPIOA, GPIOA_USB_DISC);
+    return 0;
+  }
+#endif
+
+#if STM32_USB_USE_OTG2
+  if(usbp == &USBD2) {
+    palClearPad(GPIO, GPIO_USB2_DISC);
+    return 0;
+  }
+#endif
+
+  return 1;
+}
+
+int usbDisconnect(USBDriver* usbp)
+{
+//  usbDisconnectBus(usbp); // on F405 this only disables VBUS sensing - not needed
+
+#if STM32_USB_USE_OTG1
+  if(usbp == &USBD1) {
+    palSetPad(GPIOA, GPIOA_USB_DISC);
+    return 0;
+  }
+#endif
+
+#if STM32_USB_USE_OTG2
+  if(usbp == &USBD2) {
+//    palSetPad(GPIO, GPIO_USB2_DISC);
+    return 0;
+  }
+#endif
+
+  return 1;
+}
+
+#endif /* HAL_USE_USB */
diff --git a/software/mpu/board-F405/board-utils.h b/software/mpu/board-F405/board-utils.h
new file mode 100644
index 0000000..1ceb614
--- /dev/null
+++ b/software/mpu/board-F405/board-utils.h
@@ -0,0 +1,45 @@
+/*
+ *
+ *  mur.sat
+ *
+ *  Somewhen in the year 2012, mur.at will have a nano satellite launched
+ *  into a low earth orbit (310 km above the surface of our planet). The
+ *  satellite itself is a TubeSat personal satellite kit, developed and
+ *  launched by interorbital systems. mur.sat is a joint venture of mur.at,
+ *  ESC im Labor and realraum.
+ *
+ *  Please visit the project hompage at sat.mur.at for further information.
+ *
+ *
+ *  Copyright (C) 2013 Christian Pointner <equinox@mur.at>
+ *
+ *  This file is part of mur.sat.
+ *
+ *  mur.sat is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  mur.sat is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with mur.sat. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef MURSAT_board_utils_h_INCLUDED
+#define MURSAT_board_utils_h_INCLUDED
+
+#include "halconf.h"
+
+#if HAL_USE_USB
+
+int usbConnect(USBDriver* usbp);
+int usbDisconnect(USBDriver* usbp);
+
+#endif /* HAL_USE_USB */
+
+#endif
diff --git a/software/mpu/board-F405/board.c b/software/mpu/board-F405/board.c
index 0813bb6..a5d0b55 100644
--- a/software/mpu/board-F405/board.c
+++ b/software/mpu/board-F405/board.c
@@ -62,6 +62,8 @@ void __early_init(void) {
 void boardInit(void) {
 }
 
+
+
 #if HAL_USE_SDC
 /**
  * @brief   Insertion monitor function.
diff --git a/software/mpu/board-F405/board.mk b/software/mpu/board-F405/board.mk
deleted file mode 100644
index 078d5d5..0000000
--- a/software/mpu/board-F405/board.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# List of all the board related files.
-BOARDSRC = board/board.c
-
-# Required include directories
-BOARDINC = board