More bug fixes

FreeRTOS/include/task.h

@@ -1271,6 +1271,11 @@ void vTaskPriorityDisinherit( xTaskHandle * const pxMutexHolder ) PRIVILEGED_FUN
  */
 signed portBASE_TYPE xTaskGenericCreate( pdTASK_CODE pvTaskCode, const signed char * const pcName, unsigned short usStackDepth, void *pvParameters, unsigned portBASE_TYPE uxPriority, xTaskHandle *pxCreatedTask, portSTACK_TYPE *puxStackBuffer, const xMemoryRegion * const xRegions ) PRIVILEGED_FUNCTION;
 
+/*
+ * Checks if blocked tasks exist that require the RTOS tick
+*/
+signed portBASE_TYPE xTaskTickRequired( void ) PRIVILEGED_FUNCTION;
+
 #ifdef __cplusplus
 }
 #endif

FreeRTOS/portable/MSP430F5438/FreeRTOSConfig.h

@@ -119,7 +119,7 @@ occurs.
 #ifdef ANALOG
 #define configTOTAL_HEAP_SIZE               ((size_t)12044)
 #else
-#define configTOTAL_HEAP_SIZE               ((size_t)12340) //12364 12492 12486, 12526, 12424, 12290, 12334, 12000, 12328, 13500
+#define configTOTAL_HEAP_SIZE               ((size_t)12320) //12340 12364 12492 12486, 12526, 12424, 12290, 12334, 12000, 12328, 13500
 #endif
 
 #define configMAX_TASK_NAME_LEN             (16)

FreeRTOS/portable/MSP430F5438/portmacro.h

@@ -89,16 +89,28 @@ typedef char tString;
 /* Critical section control macros. */
 #define portNO_CRITICAL_SECTION_NESTING      ( ( unsigned portSHORT ) 0 )
 
-#define portENTER_CRITICAL()                                                  \
-{                                                                             \
-   extern volatile unsigned portSHORT usCriticalNesting;                      \
-   __disable_interrupt();                                                     \
-   __no_operation();                                                          \
-                                                                              \
-   /* Now interrupts are disabled usCriticalNesting can be accessed      */   \
-   /* directly.  Increment ulCriticalNesting to keep a count of how many */   \
-   /* times portENTER_CRITICAL() has been called.                        */   \
-   usCriticalNesting++;                                                       \
+#define portENTER_CRITICAL()                                                    \
+{                                                                               \
+   extern volatile unsigned portSHORT usCriticalNesting;                        \
+                                                                                \
+   /* If this is the first call and the interrupts are disabled,                \
+    * the code is called from an ISR. In this case do not enter                 \
+    * a critical section. Otherwise, interrupts can get enabled if              \
+    * portEXT_CRITICAL is called. This would enable interrupts while            \
+    * the ISR is active. But FreeRTOS requires that some of its                 \
+    * "fromISR" functions are called with interrupts disabled.                  \
+    */                                                                          \
+   if (( usCriticalNesting != portNO_CRITICAL_SECTION_NESTING ) ||              \
+       ((__get_interrupt_state() & GIE))) {                                     \
+                                                                                \
+     __disable_interrupt();                                                     \
+     __no_operation();                                                          \
+                                                                                \
+     /* Now interrupts are disabled usCriticalNesting can be accessed      */   \
+     /* directly.  Increment ulCriticalNesting to keep a count of how many */   \
+     /* times portENTER_CRITICAL() has been called.                        */   \
+     usCriticalNesting++;                                                       \
+   }                                                                            \
 }
 
 #define portEXIT_CRITICAL()                                                   \

FreeRTOS/tasks.c

@@ -2332,6 +2332,15 @@ void vTaskExitCritical( void )
 #endif
 /*-----------------------------------------------------------*/
 
+signed portBASE_TYPE xTaskTickRequired( void )
+{
+  if( !listLIST_IS_EMPTY( pxDelayedTaskList ) )
+    return pdTRUE;
+  if( !listLIST_IS_EMPTY( pxOverflowDelayedTaskList ) )
+    return pdTRUE;
+  return pdFALSE;
+}
 
+/*-----------------------------------------------------------*/
 
 

Watch/Application/Accelerometer.c

@@ -209,7 +209,13 @@ void HandleAccelerometer(tMessage *pMsg)
 
   case MSG_OPT_ACCEL_DISABLE:
     DisableAccelerometer();
-    CreateAndSendMessage(UpdConnParamMsg, LongInterval);
+
+    if (Connected(CONN_TYPE_BLE))
+      CreateAndSendMessage(UpdConnParamMsg, LongInterval);
+
+    else if (Connected(CONN_TYPE_SPP))
+      CreateAndSendMessage(SniffControlMsg, MSG_OPT_ENTER_SNIFF);
+
     break;
 
   case MSG_OPT_ACCEL_STREAMING:

Watch/Application/Adc.c

@@ -160,7 +160,7 @@ void InitAdc(void)
   ADC12MCTL2 = LIGHT_SENSE_INPUT_CHANNEL + ADC12EOS;
 
   /* init to 0 */
-  memset(Sample, 0, MAX_SAMPLES << 2);
+  memset(Sample, 0, MAX_SAMPLES << 1);
 
   /* control access to adc peripheral */
   AdcMutex = xSemaphoreCreateMutex();

Watch/Application/Buttons.c

@@ -104,7 +104,7 @@ typedef  struct
 
 #ifdef DIGITAL
 
-#define CONN_PAGE_ACT_NUM      (20) // 3rd party needs 16
+#define CONN_PAGE_ACT_NUM      (32) // 3rd party needs 16
 
 static const tButtonAction DisconnAction[] =
 {
@@ -367,7 +367,9 @@ static void HandleButtonEvent(unsigned char Index, unsigned char Event)
 {
   tMessage Msg;
 
-//  PrintS(tringAndTwoDecimals("- BtnEvt i:", Index, "e:", Event);
+  //PrintF("Index=%d Event=%d",Index,Event);
+
+  //  PrintS(tringAndTwoDecimals("- BtnEvt i:", Index, "e:", Event);
 //  PrintS(tringAndHexByte("LstBF:0x", LastButton);
 
   unsigned char Done = pdFALSE;
@@ -476,6 +478,7 @@ static void HandleButtonEvent(unsigned char Index, unsigned char Event)
       Msg.pBuffer[2] = Event;
       Msg.pBuffer[3] = pAction[i].MsgType;
       Msg.pBuffer[4] = pAction[i].MsgOpt;
+      //PrintF("Contents: ButtonIndex=%d ButtonMode=%d Event=%d MsgType=%d MsgOpt=%d",Msg.pBuffer[0],Msg.pBuffer[1],Msg.pBuffer[2],Msg.pBuffer[3],Msg.pBuffer[4]);
       Msg.Length = 5;
       RouteMsg(&Msg);
     }
@@ -509,6 +512,8 @@ void EnableButtonMsgHandler(tMessage* pMsg)
                           pAction->ButtonIndex << BTN_NO_SHFT |
                           pAction->ButtonEvent;
 
+  //PrintF("DisplayMode=%d ButtonIndex=%d ButtonEvent=%d",pAction->DisplayMode,pAction->ButtonIndex,pAction->ButtonEvent);
+
   unsigned char i, k = CONN_PAGE_ACT_NUM;
 
   for (i = 0; i < CONN_PAGE_ACT_NUM; ++i)
@@ -524,6 +529,7 @@ void EnableButtonMsgHandler(tMessage* pMsg)
     ButtonAction[i].Info = BtnInfo;
     ButtonAction[i].MsgType = pAction->CallbackMsgType;
     ButtonAction[i].MsgOpt = pAction->CallbackMsgOptions;
+    //PrintF("i=%d MsgType=%d MsgOpt=%d",i,pAction->CallbackMsgType,pAction->CallbackMsgOptions);
   }
   else PrintS("# DefBtn");
 }

Watch/Application/LcdDisplay.c

@@ -191,6 +191,7 @@ void Init(void)
 
   InitBattery();
   CheckClip();
+  __enable_interrupt();
 
   PrintF("*** %s:%s ***", niReset == FLASH_RESET_CODE ? "FLASH" :
     (niReset == MASTER_RESET_CODE ? "MASTER" : "NORMAL"), niBuild);
@@ -365,6 +366,13 @@ static void DisplayQueueMessageHandler(tMessage* pMsg)
     UpdateClock();
     break;
 
+  case GetRtcMsg:
+    SetupMessageWithBuffer(&Msg, RtcRespMsg, MSG_OPT_NONE);
+    GetRtc((Rtc_t*)Msg.pBuffer);
+    Msg.Length = sizeof(Rtc_t);
+    RouteMsg(&Msg);
+    break;
+
 #if COUNTDOWN_TIMER
   case CountDownMsg:
     if (pMsg->Options == MSG_OPT_NONE)

Watch/Hardware/hal_lpm.c

@@ -37,7 +37,8 @@ void EnterLpm3(void)
      * we are already in critical section so that we do not get switched out by the
      * OS in the middle of stopping the OS Scheduler.
      */
-    DisableRtosTick();
+    if (!xTaskTickRequired())
+      DisableRtosTick();
 
     /* errata PMM11 + PMM12 divide MCLK by two before going to sleep */
     if (Errata()) MCLK_DIV(2);

Watch/Hardware/hal_rtc.c

@@ -153,6 +153,20 @@ void SetRtc(Rtc_t *pRtcData)
   EnableTimeStamp();
 }
 
+void GetRtc(Rtc_t* pRtcData)
+{
+  tWordByteUnion temp;
+  temp.word = RTCYEAR;
+  pRtcData->YearLsb = temp.Bytes.byte0;
+  pRtcData->YearMsb = temp.Bytes.byte1;
+  pRtcData->Month = RTCMON;
+  pRtcData->Day = RTCDAY;
+  pRtcData->DayOfWeek = RTCDOW;
+  pRtcData->Hour = RTCHOUR;
+  pRtcData->Minute = RTCMIN;
+  pRtcData->Second = RTCSEC;
+}
+
 static void RestoreRtc(void)
 {
   CheckResetCode();

Watch/Hardware/hal_rtc.h

@@ -99,6 +99,13 @@ void InitRealTimeClock(void);
  */
 void SetRtc(Rtc_t *pRtcData);
 
+/*! Get the current structure containing the real time clock parameters.
+ *
+ * \param pRtcData
+ *
+ */
+void GetRtc(Rtc_t* pRtcData);
+
 void BackupRtc(void);
 
 void IncRtc(unsigned char Index);

Watch/Hardware/hal_rtos_timer.c

@@ -106,12 +106,14 @@ void SetupRtosTimer(void)
  */
 void EnableRtosTick(void)
 {
+  if (RtosTickEnabled) return;
   RtosTickEnabled = 1;
   AddUser(TIMER0_RTOS_USER,RTOS_TICK_COUNT);
 }
 
 void DisableRtosTick(void)
 {
+  if (!RtosTickEnabled) return;
   RtosTickEnabled = 0;
   RemoveUser(TIMER0_RTOS_USER);
 }