Merge pull request #208 from cw2/issue-174-stm32f4disco-bootloader-button

User button can enter bootloader during startup (STM32F4DISCOVERY)

Author: smaillet-ms

Solutions/STM32F4DISCOVERY/TinyBooter/TinyBooter.proj

@@ -115,8 +115,8 @@
         <RequiredProjects Include="$(SPOCLIENT)\DeviceCode\PAL\BlockStorage\dotNetMF.proj" />
     </ItemGroup>
     <ItemGroup>
-        <DriverLibs Include="Buttons_pal.$(LIB_EXT)" />
-        <RequiredProjects Include="$(SPOCLIENT)\DeviceCode\PAL\Buttons\dotNetMF.proj" />
+        <DriverLibs Include="Buttons_pal_stubs.$(LIB_EXT)" />
+        <RequiredProjects Include="$(SPOCLIENT)\DeviceCode\PAL\Buttons\stubs\dotNetMF.proj" />
     </ItemGroup>
     <ItemGroup>
         <DriverLibs Include="COM_pal.$(LIB_EXT)" />

Solutions/STM32F4DISCOVERY/TinyBooter/TinyBooterEntry.cpp

@@ -14,9 +14,6 @@
 #include <tinyhal.h>
 #include <TinyBooterEntry.h>
 
-#define BUTTON_ENTR     BUTTON_B4
-#define BUTTON_USER_IDX BUTTON_B5_BITIDX
-
 // boot loader doesn't use the CMSIS-RTOS kernel, so sleep goes direct
 // to the low level support
 extern void HAL_CPU_Sleep( SLEEP_LEVEL level, UINT64 wakeEvents );
@@ -90,24 +87,24 @@ void Tinybooter_PrepareForDecompressedLaunch()
 bool WaitForTinyBooterUpload( INT32 &timeout_ms )
 {
     bool enterBooterMode = false;
-    GPIO_BUTTON_CONFIG *  ButtonConfig = &g_GPIO_BUTTON_Config;
 
-// wait forever when using RAM build 
 #if defined(TARGETLOCATION_RAM)
+    // Wait forever when using RAM build 
     enterBooterMode = true;
     timeout_ms = -1;
-#else
-    //// User override (button held)
-    //if(ButtonConfig->Mapping[BUTTON_USER_IDX].m_HW != GPIO_PIN_NONE)
-    //{
-    //    Events_WaitForEvents(0,100); // wait for buttons to init
-    //    if(CPU_GPIO_GetPinState(ButtonConfig->Mapping[BUTTON_USER_IDX].m_HW))
-    //    {
-    //        // user override, so lets stay forever
-    //        timeout_ms = -1;
-    //        enterBooterMode = true;
-    //    }
-    //}
+#elif defined(TINYBOOTER_ENTRY_GPIO_PIN)
+
+    if(!CPU_GPIO_EnableInputPin(TINYBOOTER_ENTRY_GPIO_PIN, FALSE, NULL, GPIO_INT_NONE, TINYBOOTER_ENTRY_GPIO_RESISTOR))
+    {
+        ASSERT(FALSE);
+    }
+    if(CPU_GPIO_GetPinState(TINYBOOTER_ENTRY_GPIO_PIN) == TINYBOOTER_ENTRY_GPIO_STATE)
+    {
+        // User override, so let's stay forever
+        enterBooterMode = true;
+        timeout_ms = -1;
+    }
+
 #endif
     return enterBooterMode;
 }
@@ -139,25 +136,6 @@ void TinyBooter_OnStateChange( TinyBooterState state, void* data, void ** retDat
         // The data parameter is a pointer to the timeout value for the booter mode.
         ////////////////////////////////////////////////////////////////////////////////////
         case State_ButtonPress:
-            if(NULL != data)
-            {
-                UINT32 down, up;
-                INT32* timeout_ms = (INT32*)data;
-                
-                // wait forever if a button was pressed
-                *timeout_ms = -1;
-
-                // process buttons
-                while(Buttons_GetNextStateChange(down, up))
-                {
-                    // leave a way to exit boot mode incase it was accidentally entered
-                     if(0 != (down & BUTTON_ENTR)) 
-                     {
-                        // force an enumerate and launch
-                        *timeout_ms = 0; 
-                     }
-                }
-            }
             break;
 
         ////////////////////////////////////////////////////////////////////////////////////

Solutions/STM32F4DISCOVERY/platform_selector.h

@@ -120,20 +120,17 @@
 #define STM32F4_UART_CTS_PINS {(BYTE)GPIO_PIN_NONE, 51, 59} // GPIO_PIN_NONE, D3, D11
 #define STM32F4_UART_RTS_PINS {(BYTE)GPIO_PIN_NONE, 52, 60} // GPIO_PIN_NONE, D4, D12
 
-#define DRIVER_PAL_BUTTON_MAPPING         \
-        { 0, BUTTON_NONE }, /* Up */      \
-        { 0, BUTTON_NONE }, /* Down */    \
-        { 0, BUTTON_NONE }, /* Left */    \
-        { 0, BUTTON_NONE }, /* Right */   \
-        { 0, BUTTON_NONE }, /* Enter */   \
-        { PORT_PIN(GPIO_PORTA, 0), BUTTON_B5 }, // User
-
 // User LEDs
 #define LED3 PORT_PIN(GPIO_PORTD, 13) // PD.13 (orange)
 #define LED4 PORT_PIN(GPIO_PORTD, 12) // PD.12 (green)
 #define LED5 PORT_PIN(GPIO_PORTD, 14) // PD.14 (red)
 #define LED6 PORT_PIN(GPIO_PORTD, 15) // PD.15 (blue)
 
+// TinyBooter entry using GPIO
+#define TINYBOOTER_ENTRY_GPIO_PIN       PORT_PIN(GPIO_PORTA, 0) // 'User' button
+#define TINYBOOTER_ENTRY_GPIO_STATE     TRUE                    // Active high
+#define TINYBOOTER_ENTRY_GPIO_RESISTOR  RESISTOR_DISABLED       // No internal resistor, there is external pull-down (R39)
+
 //
 // constants
 /////////////////////////////////////////////////////////