Adam Kucybala / mbed-src

mbed library sources

Fork of mbed-src by mbed official

Files at this revision

API Documentation at this revision

Revision 169:60881100c991, committed 2014-04-24

Comitter:
mbed_official
Date:
Thu Apr 24 13:15:06 2014 +0100
Parent:
168:cf9372ac0a74
Child:
170:bfbcaf535cca
Commit message:
Synchronized with git revision 0f3d1cc59a1822f46af52a9a3d5c7059476464f2

Full URL: https://github.com/mbedmicro/mbed/commit/0f3d1cc59a1822f46af52a9a3d5c7059476464f2/

[NUCLEO_F103RB] Correction in us_ticker

Changed in this revision

targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_KPSDK_CODE/utilities/fsl_os_abstraction.h Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/us_ticker.c Show annotated file Show diff for this revision Revisions of this file 
--- a/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_KPSDK_CODE/utilities/fsl_os_abstraction.h	Thu Apr 24 10:45:06 2014 +0100
+++ b/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_KPSDK_CODE/utilities/fsl_os_abstraction.h	Thu Apr 24 13:15:06 2014 +0100
@@ -66,6 +66,9 @@
     kEventManualClr    /*!< The flags of the event will be cleared manually.      */
 }event_clear_type;
 
+// Temporary "fix", until the proper macros are integrated in the on-line build system
+#define FSL_RTOS_MBED
+
 /* Include required header file based on RTOS selection */
 #if defined (FSL_RTOS_MQX)
     /*! @brief Macro to set message queue copy messages to internal memory or not. */

--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/us_ticker.c	Thu Apr 24 10:45:06 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/us_ticker.c	Thu Apr 24 13:15:06 2014 +0100
@@ -62,9 +62,8 @@
         }
         else {
             if (oc_int_part > 0) {
-                //set_compare(0);
-                //oc_rem_part = cval; // To finish the counter loop the next time
-                //if (oc_rem_part == 0) GPIOB->ODR ^= (1 << 6); // DEBUG         
+                set_compare(0xFFFF);
+                oc_rem_part = cval; // To finish the counter loop the next time
                 oc_int_part--;
             }
             else {