Add option for long USB reset pulse

7 years ago · 45fc69cee5
parent b9fd0b1233
commit 45fc69cee5
16 changed files with 48 additions and 1 deletions
--- a/Config.h
+++ b/Config.h
@ -89,6 +89,9 @@
 // Use the D-Star and DMR LEDs for POCSAG
 // #define USE_ALTERNATE_POCSAG_LEDS

+// Enable for RPi 3B+, USB mode
+#define LONG_USB_RESET
+
 // Enable modem debug messages
 // #define ENABLE_DEBUG

--- a/IOSTM.cpp
+++ b/IOSTM.cpp
@ -303,8 +303,13 @@ void CIO::Init()
  GPIO_WriteBit(GPIOA, GPIO_Pin_11, Bit_RESET);
  GPIO_WriteBit(GPIOA, GPIO_Pin_12, Bit_RESET);

+#if defined(LONG_USB_RESET)
  // 10 ms delay
  delay_us(10000U);
+#else
+  volatile unsigned int delay;
+  for(delay = 0;delay<512;delay++);
+#endif

  GPIO_InitStruct.GPIO_Pin   = GPIO_Pin_11 | GPIO_Pin_12;
  GPIO_InitStruct.GPIO_Mode  = GPIO_Mode_IN_FLOATING;
--- a/configs/MMDVM_HS_Dual_Hat-12mhz.h
+++ b/configs/MMDVM_HS_Dual_Hat-12mhz.h
@ -89,6 +89,9 @@
 // Use the D-Star and DMR LEDs for POCSAG
 #define USE_ALTERNATE_POCSAG_LEDS

+// Enable for RPi 3B+, USB mode
+// #define LONG_USB_RESET
+
 // Enable modem debug messages
 // #define ENABLE_DEBUG

--- a/configs/MMDVM_HS_Dual_Hat.h
+++ b/configs/MMDVM_HS_Dual_Hat.h
@ -89,6 +89,9 @@
 // Use the D-Star and DMR LEDs for POCSAG
 #define USE_ALTERNATE_POCSAG_LEDS

+// Enable for RPi 3B+, USB mode
+// #define LONG_USB_RESET
+
 // Enable modem debug messages
 // #define ENABLE_DEBUG

--- a/configs/MMDVM_HS_Hat-12mhz.h
+++ b/configs/MMDVM_HS_Hat-12mhz.h
@ -89,6 +89,9 @@
 // Use the D-Star and DMR LEDs for POCSAG
 #define USE_ALTERNATE_POCSAG_LEDS

+// Enable for RPi 3B+, USB mode
+// #define LONG_USB_RESET
+
 // Enable modem debug messages
 // #define ENABLE_DEBUG

--- a/configs/MMDVM_HS_Hat.h
+++ b/configs/MMDVM_HS_Hat.h
@ -89,6 +89,9 @@
 // Use the D-Star and DMR LEDs for POCSAG
 #define USE_ALTERNATE_POCSAG_LEDS

+// Enable for RPi 3B+, USB mode
+// #define LONG_USB_RESET
+
 // Enable modem debug messages
 // #define ENABLE_DEBUG

--- a/configs/NanoDV_NPI.h
+++ b/configs/NanoDV_NPI.h
@ -89,6 +89,9 @@
 // Use the D-Star and DMR LEDs for POCSAG
 #define USE_ALTERNATE_POCSAG_LEDS

+// Enable for RPi 3B+, USB mode
+// #define LONG_USB_RESET
+
 // Enable modem debug messages
 // #define ENABLE_DEBUG

--- a/configs/NanoDV_USB.h
+++ b/configs/NanoDV_USB.h
@ -89,6 +89,9 @@
 // Use the D-Star and DMR LEDs for POCSAG
 #define USE_ALTERNATE_POCSAG_LEDS

+// Enable for RPi 3B+, USB mode
+#define LONG_USB_RESET
+
 // Enable modem debug messages
 // #define ENABLE_DEBUG

--- a/configs/Nano_hotSPOT.h
+++ b/configs/Nano_hotSPOT.h
@ -89,6 +89,9 @@
 // Use the D-Star and DMR LEDs for POCSAG
 // #define USE_ALTERNATE_POCSAG_LEDS

+// Enable for RPi 3B+, USB mode
+// #define LONG_USB_RESET
+
 // Enable modem debug messages
 // #define ENABLE_DEBUG

--- a/configs/ZUMspot_Libre.h
+++ b/configs/ZUMspot_Libre.h
@ -89,6 +89,9 @@
 // Use the D-Star and DMR LEDs for POCSAG
 // #define USE_ALTERNATE_POCSAG_LEDS

+// Enable for RPi 3B+, USB mode
+#define LONG_USB_RESET
+
 // Enable modem debug messages
 // #define ENABLE_DEBUG

--- a/configs/ZUMspot_RPi.h
+++ b/configs/ZUMspot_RPi.h
@ -89,6 +89,9 @@
 // Use the D-Star and DMR LEDs for POCSAG
 // #define USE_ALTERNATE_POCSAG_LEDS

+// Enable for RPi 3B+, USB mode
+// #define LONG_USB_RESET
+
 // Enable modem debug messages
 // #define ENABLE_DEBUG

--- a/configs/ZUMspot_USB.h
+++ b/configs/ZUMspot_USB.h
@ -89,6 +89,9 @@
 // Use the D-Star and DMR LEDs for POCSAG
 // #define USE_ALTERNATE_POCSAG_LEDS

+// Enable for RPi 3B+, USB mode
+#define LONG_USB_RESET
+
 // Enable modem debug messages
 // #define ENABLE_DEBUG

--- a/configs/ZUMspot_duplex.h
+++ b/configs/ZUMspot_duplex.h
@ -89,6 +89,9 @@
 // Use the D-Star and DMR LEDs for POCSAG
 // #define USE_ALTERNATE_POCSAG_LEDS

+// Enable for RPi 3B+, USB mode
+#define LONG_USB_RESET
+
 // Enable modem debug messages
 // #define ENABLE_DEBUG

--- a/configs/generic_duplex_gpio.h
+++ b/configs/generic_duplex_gpio.h
@ -89,6 +89,9 @@
 // Use the D-Star and DMR LEDs for POCSAG
 // #define USE_ALTERNATE_POCSAG_LEDS

+// Enable for RPi 3B+, USB mode
+// #define LONG_USB_RESET
+
 // Enable modem debug messages
 // #define ENABLE_DEBUG

--- a/configs/generic_gpio.h
+++ b/configs/generic_gpio.h
@ -89,6 +89,9 @@
 // Use the D-Star and DMR LEDs for POCSAG
 // #define USE_ALTERNATE_POCSAG_LEDS

+// Enable for RPi 3B+, USB mode
+// #define LONG_USB_RESET
+
 // Enable modem debug messages
 // #define ENABLE_DEBUG

--- a/version.h
+++ b/version.h
@ -25,7 +25,7 @@
 #define VER_MAJOR       "1"
 #define VER_MINOR       "4"
 #define VER_REV         "8"
-#define VERSION_DATE    "20180908"
+#define VERSION_DATE    "20180918"

 #if defined(ZUMSPOT_ADF7021)
 #define BOARD_INFO      "ZUMspot"