diff --git a/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/RTOSDemo.ewd b/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/RTOSDemo.ewd
index e9ce99b95..41cec0baf 100644
--- a/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/RTOSDemo.ewd
+++ b/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/RTOSDemo.ewd
@@ -49,7 +49,7 @@
         </option>
         <option>
           <name>RunToEnable</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>RunToName</name>
diff --git a/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/RTOSDemo.ewp b/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/RTOSDemo.ewp
index 66e90c0e0..8598fc929 100644
--- a/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/RTOSDemo.ewp
+++ b/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/RTOSDemo.ewp
@@ -39,20 +39,20 @@
         <option>
           <name>Input variant</name>
           <version>3</version>
-          <state>1</state>
+          <state>7</state>
         </option>
         <option>
           <name>Input description</name>
-          <state>Full formatting.</state>
+          <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, without multibyte support.</state>
         </option>
         <option>
           <name>Output variant</name>
           <version>2</version>
-          <state>1</state>
+          <state>7</state>
         </option>
         <option>
           <name>Output description</name>
-          <state>Full formatting.</state>
+          <state>No specifier a, A, no specifier n, no float nor long long, no flags.</state>
         </option>
         <option>
           <name>GOutputBinary</name>
@@ -70,16 +70,16 @@
         <option>
           <name>GRuntimeLibSelect</name>
           <version>0</version>
-          <state>2</state>
+          <state>1</state>
         </option>
         <option>
           <name>GRuntimeLibSelectSlave</name>
           <version>0</version>
-          <state>2</state>
+          <state>1</state>
         </option>
         <option>
           <name>RTDescription</name>
-          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+          <state>Use the normal configuration of the C/C++ runtime library. No locale interface, C locale, no file descriptor support, no multibytes in printf and scanf, and no hex floats in strtod.</state>
         </option>
         <option>
           <name>OGProductVersion</name>
@@ -103,7 +103,7 @@
         </option>
         <option>
           <name>GenLowLevelInterface</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>GEndianModeBE</name>
@@ -133,7 +133,7 @@
         </option>
         <option>
           <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
         </option>
         <option>
           <name>GFPUCoreSlave</name>
@@ -309,6 +309,7 @@
           <state>$PROJ_DIR$\ST_Code\libraries\CMSIS\Device\ST\STM32L1xx\Include</state>
           <state>$PROJ_DIR$\..\..\Source\include</state>
           <state>$PROJ_DIR$\..\..\Source\portable\IAR\ARM_CM3</state>
+          <state>$PROJ_DIR$\..\Common\include</state>
         </option>
         <option>
           <name>CCStdIncCheck</name>
@@ -645,7 +646,7 @@
         </option>
         <option>
           <name>IlinkOutputFile</name>
-          <state>STM32L-Discovery.out</state>
+          <state>RTOSDemo.out</state>
         </option>
         <option>
           <name>IlinkDebugInfoEnable</name>
@@ -1064,6 +1065,33 @@
       </file>
     </group>
   </group>
+  <group>
+    <name>Standard Demo Tasks</name>
+    <file>
+      <name>$PROJ_DIR$\..\Common\Minimal\BlockQ.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\Common\Minimal\blocktim.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\Common\Minimal\countsem.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\Common\Minimal\dynamic.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\Common\Minimal\GenQTest.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\Common\Minimal\PollQ.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\Common\Minimal\recmutex.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\Common\Minimal\semtest.c</name>
+    </file>
+  </group>
   <group>
     <name>System</name>
     <file>
@@ -1088,6 +1116,12 @@
   <file>
     <name>$PROJ_DIR$\main.c</name>
   </file>
+  <file>
+    <name>$PROJ_DIR$\main_full.c</name>
+  </file>
+  <file>
+    <name>$PROJ_DIR$\main_low_power.c</name>
+  </file>
   <file>
     <name>$PROJ_DIR$\stm32l1xx_it.c</name>
   </file>
diff --git a/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/STM32L_low_power_tick_management.c b/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/STM32L_low_power_tick_management.c
index faff612d1..d7cd3b2e7 100644
--- a/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/STM32L_low_power_tick_management.c
+++ b/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/STM32L_low_power_tick_management.c
@@ -75,8 +75,8 @@
 
 /*
  * When configCREATE_LOW_POWER_DEMO is set to 1 then the tick interrupt
- * is generated by the wakeup interrupt of the real time clock (RTC).  The RTC
- * configuration and handling functions are defined in this file.
+ * is generated by the TIM2 peripheral.  The TIM2 configuration and handling
+ * functions are defined in this file.
  *
  * When configCREATE_LOW_POWER_DEMO is set to 0 the tick interrupt is
  * generated by the standard FreeRTOS Cortex-M port layer, which uses the
@@ -84,23 +84,17 @@
  */
 #if configCREATE_LOW_POWER_DEMO == 1
 
-/* The frequency at which TIM2 should run. */
+/* The frequency at which TIM2 will run. */
 #define lpCLOCK_INPUT_FREQUENCY 	( 1000UL )
 
-/* Constants required to pend a PendSV interrupt from the tick ISR if the
-preemptive scheduler is being used.  These are just standard bits and registers
-within the Cortex-M core itself. */
-#define portNVIC_PENDSVSET_BIT	( 1UL << 28UL )
-
+/* STM32 register used to ensure the TIM2 clock stops when the MCU is in debug
+mode. */
 #define DBGMCU_APB1_FZ 	( * ( ( volatile unsigned long * ) 0xE0042008 ) )
+
 /*-----------------------------------------------------------*/
 
 /*
- * The tick interrupt is generated by the TIM2 timer.  The default interrupt
- * handler cannot be used (even with the TIM2 being handled from the tick hook
- * function) because the default tick interrupt accesses the SysTick registers
- * when configUSE_TICKLESS_IDLE set to 1.  TIM2_IRQHandler() is the default name
- * for the TIM2 interrupt handler.
+ * The tick interrupt is generated by the TIM2 timer.
  */
 void TIM2_IRQHandler( void );
 
@@ -115,15 +109,9 @@ initialisation. */
 static portTickType xMaximumPossibleSuppressedTicks = 0;
 
 /* Flag set from the tick interrupt to allow the sleep processing to know if
-sleep mode was exited because of an RTC interrupt or a different interrupt. */
+sleep mode was exited because of an tick interrupt or a different interrupt. */
 static volatile uint32_t ulTickFlag = pdFALSE;
 
-/* The RTC counter is stopped temporarily each time it is re-programmed.  The
-following variable offsets the RTC counter alarm value by the number of RTC
-counts that would typically be missed while the counter was stopped to
-compensate for the lost time.  _RB_ Value needs calculating correctly. */
-static uint32_t ulStoppedTimerCompensation = 1;//_RB_ / ( configCPU_CLOCK_HZ / configSYSTICK_CLOCK_HZ );
-
 /*-----------------------------------------------------------*/
 
 /* The tick interrupt handler.  This is always the same other than the part that
@@ -131,10 +119,13 @@ clears the interrupt, which is specific to the clock being used to generate the
 tick. */
 void TIM2_IRQHandler( void )
 {
+	/* Clear the interrupt. */
 	TIM_ClearITPendingBit( TIM2, TIM_IT_Update );
-	TIM_SetAutoreload( TIM2, ( uint16_t ) ulReloadValueForOneTick );
 
-	/* Protect incrementing the tick with an interrupt safe critical section. */
+	/* The next block of code is from the standard FreeRTOS tick interrupt
+	handler.  The standard handler is not called directly in case future
+	versions contain changes that make it no longer suitable for calling
+	here. */
 	( void ) portSET_INTERRUPT_MASK_FROM_ISR();
 	{
 		if( xTaskIncrementTick() != pdFALSE )
@@ -148,39 +139,42 @@ void TIM2_IRQHandler( void )
 	}
 	portCLEAR_INTERRUPT_MASK_FROM_ISR( 0 );
 
+	/* In case this is the first tick since the MCU left a low power mode the
+	reload value is reset to its default. */
+	TIM2->ARR = ( uint16_t ) ulReloadValueForOneTick;
+
 	/* The CPU woke because of a tick. */
 	ulTickFlag = pdTRUE;
 }
 /*-----------------------------------------------------------*/
 
 /* Override the default definition of vPortSetupTimerInterrupt() that is weakly
-defined in the FreeRTOS Cortex-M3 port layer with a version that configures the
-wakeup timer of the RTC to generate the tick interrupt. */
+defined in the FreeRTOS Cortex-M3 port layer with a version that configures TIM2
+to generate the tick interrupt. */
 void vPortSetupTimerInterrupt( void )
 {
 NVIC_InitTypeDef NVIC_InitStructure;
 TIM_TimeBaseInitTypeDef  TIM_TimeBaseStructure;
 
-	/* Enable the TIM2 clock, which is used to generate long tickless periods
-	when the tickless period is finite. */
+	/* Enable the TIM2 clock. */
   	RCC_APB1PeriphClockCmd( RCC_APB1Periph_TIM2, ENABLE );
 
 	/* Ensure clock stops in debug mode. */
 	DBGMCU_APB1_FZ |= DBGMCU_APB1_FZ_DBG_TIM2_STOP;
 
-	/* Scale the clock so very long tickless periods can be acheived.  The
-	SysTick is not used as even when its frequency is divided by 8 the maximum
-	tickless period with a system clock of 16MHz is only 8.3 seconds.  Using
-	a prescaled clock on the 16-bit TIM2 allows a tickless period of nearly
-	66 seconds, albeit at low resolution. */
+	/* Scale the clock so longer tickless periods can be achieved.  The	SysTick
+	is not used as even when its frequency is divided by 8 the maximum tickless
+	period with a system clock of 16MHz is only 8.3 seconds.  Using	a prescaled
+	clock on the 16-bit TIM2 allows a tickless period of nearly	66 seconds,
+	albeit at low resolution. */
 	TIM_TimeBaseStructure.TIM_Prescaler = ( uint16_t ) ( SystemCoreClock / lpCLOCK_INPUT_FREQUENCY );
 	TIM_TimeBaseStructure.TIM_CounterMode = TIM_CounterMode_Up;
 	TIM_TimeBaseStructure.TIM_Period = ( uint16_t ) ( lpCLOCK_INPUT_FREQUENCY / configTICK_RATE_HZ );
 	TIM_TimeBaseStructure.TIM_ClockDivision = 0;
 	TIM_TimeBaseInit( TIM2, &TIM_TimeBaseStructure );
 
-	/* Enable the TIM2 interrupt - used for the tick interrupt when the tickless
-	period is finite. */
+	/* Enable the TIM2 interrupt.  This must execute at the lowest interrupt
+	priority. */
 	NVIC_InitStructure.NVIC_IRQChannel = TIM2_IRQn;
 	NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = configLIBRARY_LOWEST_INTERRUPT_PRIORITY; /* Must be set to lowest priority. */
 	NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
@@ -216,17 +210,11 @@ const portTickType xRegulatorOffIdleTime = 30;
 	/* Calculate the reload value required to wait xExpectedIdleTime tick
 	periods. */
 	ulCounterValue = ulReloadValueForOneTick * xExpectedIdleTime;
-	if( ulCounterValue > ulStoppedTimerCompensation )
-	{
-		/* Compensate for the fact that TIM2 is going to be stopped
-		momentarily. */
-		ulCounterValue -= ulStoppedTimerCompensation;
-	}
 
-	/* Stop TIM2 momentarily.  The time TIM2 is stopped for is accounted for as
-	best it can be, but using the tickless mode will inevitably result in some
-	tiny drift of the time maintained by the kernel with respect to	calendar
-	time. */
+	/* Stop TIM2 momentarily.  The time TIM2 is stopped for is not accounted for
+	in this implementation (as it is in the generic implementation) because the
+	clock is so slow it is unlikely to be stopped for a complete count period
+	anyway. */
 	TIM_Cmd( TIM2, DISABLE );
 
 	/* Enter a critical section but don't use the taskENTER_CRITICAL() method as
@@ -255,13 +243,25 @@ const portTickType xRegulatorOffIdleTime = 30;
 	}
 	else if( eSleepAction == eNoTasksWaitingTimeout )
 	{
+		/* A user definable macro that allows application code to be inserted
+		here.  Such application code can be used to minimise power consumption
+		further by turning off IO, peripheral clocks, the Flash, etc. */
+		configPRE_STOP_PROCESSING();
+
 		/* There are no running state tasks and no tasks that are blocked with a
 		time out.  Assuming the application does not care if the tick time slips
 		with respect to calendar time then enter a deep sleep that can only be
 		woken by (in this demo case) the user button being pushed on the
-		STM32L discovery board. */
-		configPRE_STOP_PROCESSING();
+		STM32L discovery board.  If the application does require the tick time
+		to keep better track of the calender time then the RTC peripheral can be
+		used to make rough adjustments. */
 		PWR_EnterSTOPMode( PWR_Regulator_LowPower, PWR_SLEEPEntry_WFI );
+
+		/* A user definable macro that allows application code to be inserted
+		here.  Such application code can be used to reverse any actions taken
+		by the configPRE_STOP_PROCESSING().  In this demo
+		configPOST_STOP_PROCESSING() is used to re-initialise the clocks that
+		were turned off when STOP mode was entered. */
 		configPOST_STOP_PROCESSING();
 
 		/* Restart tick. */
@@ -274,36 +274,48 @@ const portTickType xRegulatorOffIdleTime = 30;
 	}
 	else
 	{
+		/* Trap underflow before the next calculation. */
+		configASSERT( ulCounterValue >= TIM_GetCounter( TIM2 ) );
+
 		/* Adjust the TIM2 value to take into account that the current time
 		slice is already partially complete. */
-		configASSERT( ulCounterValue >= TIM_GetCounter( TIM2 ) );
 		ulCounterValue -= ( uint32_t ) TIM_GetCounter( TIM2 );
+
+		/* Trap overflow/underflow before the calculated value is written to
+		TIM2. */
 		configASSERT( ulCounterValue < ( uint32_t ) USHRT_MAX );
 		configASSERT( ulCounterValue != 0 );
+
+		/* Update to use the calculated overflow value. */
 		TIM_SetAutoreload( TIM2, ( uint16_t ) ulCounterValue );
 		TIM_SetCounter( TIM2, 0 );
 
 		/* Restart the TIM2. */
 		TIM_Cmd( TIM2, ENABLE );
 
-		/* Allow the application to define some pre-sleep processing. */
+		/* Allow the application to define some pre-sleep processing.  This is
+		the standard configPRE_SLEEP_PROCESSING() macro as described on the
+		FreeRTOS.org website. */
 		xModifiableIdleTime = xExpectedIdleTime;
 		configPRE_SLEEP_PROCESSING( xModifiableIdleTime );
 
 		/* xExpectedIdleTime being set to 0 by configPRE_SLEEP_PROCESSING()
-		means the application defined code has already executed the WAIT
+		means the application defined code has already executed the wait/sleep
 		instruction. */
 		if( xModifiableIdleTime > 0 )
 		{
 			/* The sleep mode used is dependent on the expected idle time
-			as the deeper the sleep the longer the wake up time. */
+			as the deeper the sleep the longer the wake up time.  See the
+			comments at the top of main_low_power.c.  Note xRegulatorOffIdleTime
+			is set purely for convenience of demonstration and is not intended
+			to be an optimised value. */
 			if( xModifiableIdleTime > xRegulatorOffIdleTime )
 			{
 				/* A slightly lower power sleep mode with a longer wake up
 				time. */
 				PWR_EnterSleepMode( PWR_Regulator_LowPower, PWR_SLEEPEntry_WFI );
 			}
-			else if( pdTRUE )
+			else
 			{
 				/* A slightly higher power sleep mode with a faster wake up
 				time. */
@@ -311,13 +323,14 @@ const portTickType xRegulatorOffIdleTime = 30;
 			}
 		}
 
-		/* Allow the application to define some post sleep processing. */
+		/* Allow the application to define some post sleep processing.  This is
+		the standard configPOST_SLEEP_PROCESSING() macro, as described on the
+		FreeRTOS.org website. */
 		configPOST_SLEEP_PROCESSING( xModifiableIdleTime );
 
-		/* Stop TIM2.  Again, the time the SysTick is stopped for is accounted
-		for as best it can be, but using the tickless mode will	inevitably
-		result in some tiny drift of the time maintained by the	kernel with
-		respect to calendar time. */
+		/* Stop TIM2.  Again, the time the clock is stopped for in not accounted
+		for here (as it would normally be) because the clock is so slow it is
+		unlikely it will be stopped for a complete count period anyway. */
 		TIM_Cmd( TIM2, DISABLE );
 
 		/* Re-enable interrupts - see comments above the cpsid instruction()
@@ -328,14 +341,20 @@ const portTickType xRegulatorOffIdleTime = 30;
 
 		if( ulTickFlag != pdFALSE )
 		{
+			/* Trap overflows before the next calculation. */
+			configASSERT( ulReloadValueForOneTick >= ( uint32_t ) TIM_GetCounter( TIM2 ) );
+
 			/* The tick interrupt has already executed, although because this
 			function is called with the scheduler suspended the actual tick
 			processing will not occur until after this function has exited.
 			Reset the reload value with whatever remains of this tick period. */
-			configASSERT( ulReloadValueForOneTick >= ( uint32_t ) TIM_GetCounter( TIM2 ) );
 			ulCounterValue = ulReloadValueForOneTick - ( uint32_t ) TIM_GetCounter( TIM2 );
+
+			/* Trap under/overflows before the calculated value is used. */
 			configASSERT( ulCounterValue <= ( uint32_t ) USHRT_MAX );
 			configASSERT( ulCounterValue != 0 );
+
+			/* Use the calculated reload value. */
 			TIM_SetAutoreload( TIM2, ( uint16_t ) ulCounterValue );
 			TIM_SetCounter( TIM2, 0 );
 
@@ -353,9 +372,11 @@ const portTickType xRegulatorOffIdleTime = 30;
 			sleeping? */
 			ulCompleteTickPeriods = ( ( uint32_t ) TIM_GetCounter( TIM2 ) ) / ulReloadValueForOneTick;
 
+			/* Check for over/under flows before the following calculation. */
+			configASSERT( ( ( uint32_t ) TIM_GetCounter( TIM2 ) ) >= ( ulCompleteTickPeriods * ulReloadValueForOneTick ) );
+
 			/* The reload value is set to whatever fraction of a single tick
 			period remains. */
-			configASSERT( ( ( uint32_t ) TIM_GetCounter( TIM2 ) ) >= ( ulCompleteTickPeriods * ulReloadValueForOneTick ) );
 			ulCounterValue = ( ( uint32_t ) TIM_GetCounter( TIM2 ) ) - ( ulCompleteTickPeriods * ulReloadValueForOneTick );
 			configASSERT( ulCounterValue <= ( uint32_t ) USHRT_MAX );
 			if( ulCounterValue == 0 )
@@ -379,7 +400,5 @@ const portTickType xRegulatorOffIdleTime = 30;
 	}
 }
 
-
-
 #endif /* configCREATE_LOW_POWER_DEMO == 1 */
 
diff --git a/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/include/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/include/FreeRTOSConfig.h
index 25a4a76ef..46d059c91 100644
--- a/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/include/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/include/FreeRTOSConfig.h
@@ -78,7 +78,8 @@
  * See http://www.freertos.org/a00110.html.
  *----------------------------------------------------------*/
 
-/* Ensure stdint is only used by the compiler, and not the assembler. */
+/* Ensure stdint and C code is only used by the compiler, and not the
+assembler. */
 #ifdef __ICCARM__
 	#include <stdint.h>
 	extern uint32_t SystemCoreClock;
@@ -88,30 +89,42 @@
 
 /* Set configCREATE_LOW_POWER_DEMO to one to run the simple blinky low power
 demo, or 0 to run the more comprehensive test and demo application. */
-#define configCREATE_LOW_POWER_DEMO			1
+#define configCREATE_LOW_POWER_DEMO			0
 
+/* A few settings are dependent on the configCREATE_LOW_POWER_DEMO setting. */
 #if configCREATE_LOW_POWER_DEMO == 1
-	#define configCPU_CLOCK_HZ						SystemCoreClock
-	#define configUSE_TICKLESS_IDLE					1
 	#define configTICK_RATE_HZ						( 100 )
 	#define configEXPECTED_IDLE_TIME_BEFORE_SLEEP 	( 20 + 1 ) /* ( ( 200 / portTICK_RATE_MS ) + 1 ) written out pre-processed to enable #error statements to check its value. */
+	#define configUSE_TIMERS						0
 #else
-	#define configCPU_CLOCK_HZ						SystemCoreClock
-	#define configSYSTICK_CLOCK_HZ					( SystemCoreClock >> 3UL )
-	#define configUSE_TICKLESS_IDLE					0
+	#define configSYSTICK_CLOCK_HZ					( SystemCoreClock >> 3UL ) /* Systick clock is one eighth the system clock. */
 	#define configTICK_RATE_HZ						( ( portTickType ) 1000 )
+	#define configUSE_TIMERS						1
 #endif /* configCREATE_LOW_POWER_DEMO */
 
+/* Demo specific macros that allow the application writer to insert code to be
+executed immediately before the MCU's STOP low power mode is entered and exited
+respectively.  These macros are in addition to the standard
+configPRE_SLEEP_PROCESSING() and configPOST_SLEEP_PROCESSING() macros, which are
+called pre and post the low power SLEEP mode being entered and exited.  These
+macros can be used to turn turn off and on IO, clocks, the Flash etc. to obtain
+the lowest power possible while the tick is off.  See the comments at the top of
+main_low_power.c and in STM32L_low_power_tick_management.c. */
 #define configPRE_STOP_PROCESSING()
 #define configPOST_STOP_PROCESSING()				vMainPostStopProcessing()
 
+/* The configUSE_TICKLESS_IDLE setting is dependent on the users setting of
+configCREATE_LOW_POWER_DEMO at the top of this file. */
+#define configUSE_TICKLESS_IDLE					configCREATE_LOW_POWER_DEMO
+
+#define configCPU_CLOCK_HZ						SystemCoreClock
 #define configUSE_PREEMPTION					1
 #define configUSE_PORT_OPTIMISED_TASK_SELECTION	1
 #define configUSE_IDLE_HOOK						1
 #define configUSE_TICK_HOOK						1
 #define configMAX_PRIORITIES					( 5 )
 #define configMINIMAL_STACK_SIZE				( ( unsigned short ) 70 )
-#define configTOTAL_HEAP_SIZE					( ( size_t ) ( 10 * 1024 ) )
+#define configTOTAL_HEAP_SIZE					( ( size_t ) ( 14 * 1024 ) )
 #define configMAX_TASK_NAME_LEN					( 16 )
 #define configUSE_TRACE_FACILITY				1
 #define configUSE_16_BIT_TICKS					0
@@ -119,9 +132,15 @@ demo, or 0 to run the more comprehensive test and demo application. */
 #define configUSE_MUTEXES						1
 #define configQUEUE_REGISTRY_SIZE				5
 #define configCHECK_FOR_STACK_OVERFLOW			2
-#define configUSE_RECURSIVE_MUTEXES				0
+#define configUSE_RECURSIVE_MUTEXES				1
 #define configUSE_MALLOC_FAILED_HOOK			1
 #define configUSE_APPLICATION_TASK_TAG			0
+#define configUSE_COUNTING_SEMAPHORES			1
+
+/* Software timer related definitions. */
+#define configTIMER_TASK_PRIORITY				( configMAX_PRIORITIES - 1 )
+#define configTIMER_QUEUE_LENGTH				10
+#define configTIMER_TASK_STACK_DEPTH			configMINIMAL_STACK_SIZE
 
 /* Co-routine definitions. */
 #define configUSE_CO_ROUTINES 			0
diff --git a/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/main.c b/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/main.c
index 6193f1833..2e8bdf26d 100644
--- a/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/main.c
+++ b/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/main.c
@@ -63,230 +63,71 @@
     1 tab == 4 spaces!
 */
 
-/*
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
-    All rights reserved
-
-    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
-    This file is part of the FreeRTOS distribution.
-
-    FreeRTOS is free software; you can redistribute it and/or modify it under
-    the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
-
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
-
-    FreeRTOS 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.  Full license text is available from the following
-    link: http://www.freertos.org/a00114.html
-
-    1 tab == 4 spaces!
-
-    ***************************************************************************
-     *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
-     *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
-     *                                                                       *
-    ***************************************************************************
-
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
-
-    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
-    compatible FAT file system, and our tiny thread aware UDP/IP stack.
-
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
-
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
-    engineered and independently SIL3 certified version for use in safety and
-    mission critical applications that require provable dependability.
-
-    1 tab == 4 spaces!
-*/
+/******************************************************************************
+ * This project provides two demo applications.  A low power project that
+ * demonstrates the FreeRTOS tickless mode, and a more comprehensive test and
+ * demo application.  The configCREATE_LOW_POWER_DEMO setting (defined at the
+ * top of FreeRTOSConfig.h) is used to select between the two.  The low power
+ * demo is implemented and described in main_low_power.c.  The more
+ * comprehensive test and demo application is implemented and described in
+ * main_full.c.
+ *
+ * This file implements the code that is not demo specific, including the
+ * hardware setup and FreeRTOS hook functions.
+ */
 
 /* Kernel includes. */
 #include "FreeRTOS.h"
 #include "task.h"
-#include "queue.h"
-#include "semphr.h"
 
 /* ST library functions. */
 #include "stm32l1xx.h"
 #include "discover_board.h"
 #include "discover_functions.h"
-#include "stm32l_discovery_lcd.h"
-
-/* Priorities at which the Rx and Tx tasks are created. */
-#define configQUEUE_RECEIVE_TASK_PRIORITY	( tskIDLE_PRIORITY + 1 )
-#define	configQUEUE_SEND_TASK_PRIORITY		( tskIDLE_PRIORITY + 2 )
-
-/* The number of items the queue can hold.  This is 1 as the Rx task will
-remove items as they are added so the Tx task should always find the queue
-empty. */
-#define mainQUEUE_LENGTH					( 1 )
-
-/* The LED used to indicate that a value has been received on the queue. */
-#define mainQUEUE_LED						( 0 )
-
-/* A block time of zero simply means "don't block". */
-#define mainDONT_BLOCK						( 0 )
-
-/* The value that is sent from the Tx task to the Rx task on the queue. */
-#define mainQUEUED_VALUE					( 100UL )
-
-/* The length of time the LED will remain on for.  It is on just long enough
-to be able to see with the human eye so as not to distort the power readings too
-much. */
-#define mainLED_TOGGLE_DELAY				( 10 / portTICK_RATE_MS )
 
 /*-----------------------------------------------------------*/
 
 /*
- * The Rx and Tx tasks as described at the top of this file.
+ * Set up the hardware ready to run this demo.
  */
-static void prvQueueReceiveTask( void *pvParameters );
-static void prvQueueSendTask( void *pvParameters );
-
-/*-----------------------------------------------------------*/
-
-/* The queue to pass data from the Tx task to the Rx task. */
-static xQueueHandle xQueue = NULL;
+static void prvSetupHardware( void );
 
 /*
- * Set up the hardware ready to run this demo.
+ * main_low_power() is used when configCREATE_LOW_POWER_DEMO is set to 1.
+ * main_full() is used when configCREATE_LOW_POWER_DEMO is set to 0.
+ * configCREATE_LOW_POWER_DEMO is defined at the top of main.c.
  */
-static void prvSetupHardware( void );
+extern void main_low_power( void );
+extern void main_full( void );
 
-/*-----------------------------------------------------------*/
+/* Prototypes for the standard FreeRTOS callback/hook functions implemented
+within this file. */
+void vApplicationMallocFailedHook( void );
+void vApplicationIdleHook( void );
+void vApplicationStackOverflowHook( xTaskHandle pxTask, signed char *pcTaskName );
+void vApplicationTickHook( void );
 
-static const portTickType xMaxBlockTime = ( 500L / portTICK_RATE_MS ), xMinBlockTime = ( 100L / portTICK_RATE_MS );
-portTickType xSendBlockTime = ( 100UL / portTICK_RATE_MS );
-static xSemaphoreHandle xTxSemaphore = NULL;
+/*-----------------------------------------------------------*/
 
 int main( void )
 {
+	/* Prepare the hardware to run this demo. */
 	prvSetupHardware();
 
-	xTxSemaphore = xSemaphoreCreateBinary();
-
-	/* Create the queue. */
-	xQueue = xQueueCreate( mainQUEUE_LENGTH, sizeof( unsigned long ) );
-	configASSERT( xQueue );
-
-	/* Start the two tasks as described at the top of this file. */
-	xTaskCreate( prvQueueReceiveTask, ( const signed char * const ) "Rx", configMINIMAL_STACK_SIZE, NULL, configQUEUE_RECEIVE_TASK_PRIORITY, NULL );
-	xTaskCreate( prvQueueSendTask, ( const signed char * const ) "TX", configMINIMAL_STACK_SIZE, NULL, configQUEUE_SEND_TASK_PRIORITY, NULL );
-
-	/* Start the scheduler running running. */
-	vTaskStartScheduler();
-
-	/* If all is well the next line of code will not be reached as the
-	scheduler will be running.  If the next line is reached then it is likely
-	there was insufficient FreeRTOS heap available for the idle task and/or
-	timer task to be created.  See http://www.freertos.org/a00111.html. */
-	for( ;; );
-}
-/*-----------------------------------------------------------*/
-
-static void prvQueueSendTask( void *pvParameters )
-{
-const unsigned long ulValueToSend = mainQUEUED_VALUE;
-
-	/* Remove compiler warning about unused parameter. */
-	( void ) pvParameters;
-
-	for( ;; )
-	{
-		/* Place this task into the blocked state until it is time to run
-		again. */
-		xSemaphoreTake( xTxSemaphore, xSendBlockTime );
-
-		/* Send to the queue - causing the queue receive task to flash its LED.
-		It should not be necessary to block on the queue send because the Rx
-		task will already have removed the last queued item. */
-		xQueueSend( xQueue, &ulValueToSend, mainDONT_BLOCK );
-	}
-}
-/*-----------------------------------------------------------*/
-
-static void prvQueueReceiveTask( void *pvParameters )
-{
-unsigned long ulReceivedValue;
-
-	/* Remove compiler warning about unused parameter. */
-	( void ) pvParameters;
-
-	for( ;; )
-	{
-		/* Wait until something arrives in the queue. */
-		xQueueReceive( xQueue, &ulReceivedValue, portMAX_DELAY );
-
-		/*  To get here something must have arrived, but is it the expected
-		value?  If it is, turn the LED on for a short while. */
-		if( ulReceivedValue == mainQUEUED_VALUE )
-		{
-			GPIO_HIGH( LD_GPIO_PORT, LD_GREEN_GPIO_PIN );
-			vTaskDelay( mainLED_TOGGLE_DELAY );
-			GPIO_LOW( LD_GPIO_PORT, LD_GREEN_GPIO_PIN );
-		}
-	}
-}
-/*-----------------------------------------------------------*/
-
-void EXTI0_IRQHandler(void)
-{
-static const portTickType xIncrement = 200UL / portTICK_RATE_MS;
-
-	if( xSendBlockTime == portMAX_DELAY )
+	/* The configCREATE_LOW_POWER_DEMO setting is described at the top of
+	this file. */
+	#if configCREATE_LOW_POWER_DEMO == 1
 	{
-		portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
-
-		/* Unblock the Tx task again. */
-		xSemaphoreGiveFromISR( xTxSemaphore, &xHigherPriorityTaskWoken );
-
-		/* Start over with the short block time that will not result in the
-		tick being turned off or a low power mode being entered. */
-		xSendBlockTime = xMinBlockTime;
-
-		portYIELD_FROM_ISR( xHigherPriorityTaskWoken );
+		main_low_power();
 	}
-	else
+	#else
 	{
-		xSendBlockTime += xIncrement;
-
-		if( xSendBlockTime > xMaxBlockTime )
-		{
-			/* Set the send block time to be infinite to force entry into the STOP
-			sleep mode. */
-			xSendBlockTime = portMAX_DELAY;
-		}
+		main_full();
 	}
+	#endif
 
-	EXTI_ClearITPendingBit( EXTI_Line0 );
+	/* This line will never be reached. */
+	return 0;
 }
 /*-----------------------------------------------------------*/
 
@@ -298,6 +139,7 @@ EXTI_InitTypeDef EXTI_InitStructure;
 NVIC_InitTypeDef NVIC_InitStructure;
 void SystemCoreClockUpdate( void );
 
+	/* System function that updates the SystemCoreClock variable. */
 	SystemCoreClockUpdate();
 
 	/* Essential on STM32 Cortex-M devices. */
@@ -306,15 +148,6 @@ void SystemCoreClockUpdate( void );
 	/* Systick is fed from HCLK/8. */
 	SysTick_CLKSourceConfig( SysTick_CLKSource_HCLK_Div8 );
 
-	/* Enable HSI Clock. */
-//	RCC_HSICmd( ENABLE );
-
-	/*!< Wait till HSI is ready. */
-//	while( RCC_GetFlagStatus( RCC_FLAG_HSIRDY ) == RESET );
-
-	/* Set HSI as sys clock*/
-//	RCC_SYSCLKConfig( RCC_SYSCLKSource_HSI );
-
 	/* Set MSI clock range to ~4.194MHz. */
 	RCC_MSIRangeConfig( RCC_MSIRange_6 );
 
@@ -327,29 +160,6 @@ void SystemCoreClockUpdate( void );
 	/* Enable SYSCFG clocks. */
 	RCC_APB2PeriphClockCmd( RCC_APB2Periph_SYSCFG , ENABLE );
 
-	/* Allow access to the RTC */
-//	PWR_RTCAccessCmd( ENABLE );
-
-	/* Reset RTC Backup Domain */
-//	RCC_RTCResetCmd( ENABLE );
-//	RCC_RTCResetCmd( DISABLE );
-
-	/* LSE Enable */
-//	RCC_LSEConfig( RCC_LSE_ON );
-	//RCC_LSICmd( ENABLE ); //_RB_
-
-	/* Wait until LSE is ready */
-//	while( RCC_GetFlagStatus( RCC_FLAG_LSERDY ) == RESET );
-
-	/* Disable HSE */
-//	RCC_HSEConfig( RCC_HSE_OFF );
-
-//	if( RCC_GetFlagStatus( RCC_FLAG_HSERDY ) != RESET )
-//	{
-		/* Stay in infinite loop if HSE is not disabled. */
-//		while( 1 );
-//	}
-
 	/* Set internal voltage regulator to 1.5V. */
 	PWR_VoltageScalingConfig( PWR_VoltageScaling_Range2 );
 
@@ -448,20 +258,6 @@ void vApplicationTickHook( void )
 }
 /*-----------------------------------------------------------*/
 
-void vMainPostStopProcessing( void )
-{
-extern void SetSysClock( void );
-
-	SetSysClock();
-	/* Unblock the Tx task again. */
-//	xSemaphoreGiveFromISR( xTxSemaphore, NULL );
-
-	/* Start over with the short block time that will not result in the
-	tick being turned off or a low power mode being entered. */
-//	xSendBlockTime = xMinBlockTime;
-}
-/*-----------------------------------------------------------*/
-
 void vAssertCalled( unsigned long ulLine, const char * const pcFileName )
 {
 volatile unsigned long ulSetToNonZeroInDebuggerToContinue = 0;
@@ -484,835 +280,3 @@ volatile unsigned long ulSetToNonZeroInDebuggerToContinue = 0;
 	taskEXIT_CRITICAL();
 }
 
-
-
-
-#ifdef  USE_FULL_ASSERT
-
-/**
-  * @brief  Reports the name of the source file and the source line number
-  *         where the assert_param error has occurred.
-  * @param  file: pointer to the source file name
-  * @param  line: assert_param error line source number
-  * @retval None
-  */
-void assert_failed(uint8_t* file, uint32_t line)
-{
-  /* User can add his own implementation to report the file name and line number,
-     ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
-  /* Infinite loop */
-  while (1);
-}
-
-#endif
-
-
-
-
-
-
-
-
-
-#if 0
-/**
-  ******************************************************************************
-  * @file    main.c
-  * @author  Microcontroller Division
-  * @version V1.0.3
-  * @date    May-2013
-  * @brief   Main program body
-  ******************************************************************************
-  * @copy
-  *
-  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
-  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
-  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
-  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
-  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-  *
-  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
-  */
-
-/* Includes ------------------------------------------------------------------*/
-
-#include "main.h"
-
-#define BOR_MODIFY
-#define BOR_LEVEL OB_BOR_OFF  /*!< BOR is disabled at power down, the reset is asserted when the VDD power supply reachs the PDR(Power Down Reset) threshold (1.5V) */
-
-
-/* Private variables ---------------------------------------------------------*/
-
-static TSL_tTick_ms_T last_tick_tsl;  /* Hold the last tsl time value */
-extern unsigned char Bias_Current;    /* Bias Current stored in E²Prom used for ICC mesurement precision */
-extern uint8_t t_bar[2];              /* LCD bar graph: used for displaying active function */
-extern bool self_test;                /* Auto_test activation flag: set by interrupt handler if user button is pressed for a few seconds */
-extern bool Idd_WakeUP;               /* */
-extern volatile bool KeyPressed;      /* */
-extern bool UserButton;               /* Set by interrupt handler to indicate that user button is pressed */
-uint8_t state_machine;                /* Machine status used by main() wich indicats the active function, set by user button in interrupt handler */
-uint16_t Int_CurrentSTBY;             /* */
-
-#ifdef STM32L1XX_MDP
-  uint8_t message[29] = "     ** 32L152CDISCOVERY  **";
-	#else
-	uint8_t message[29] = "     ** STM32L1-DISCOVERY **";
-#endif
-/*******************************************************************************/
-/**
-  * @brief main entry point.
-  * @par Parameters None
-  * @retval void None
-  * @par Required preconditions: None
-  */
-int main(void)
-{
-  bool StanbyWakeUp ;
-  float Current_STBY;
-  __IO uint32_t BOROptionBytes = 0;
-
- /*!< At this stage the microcontroller clock setting is already configured,
-       this is done through SystemInit() function which is called from startup
-       file (startup_stm32l1xx_md.s) before to branch to application main.
-       To reconfigure the default setting of SystemInit() function, refer to
-       system_stm32l1xx.c file
-     */
-
-  /* store Standby Current*/
-  Int_CurrentSTBY = Current_Measurement();
-
-  /* Check if the StandBy flag is set */
-  if (PWR_GetFlagStatus(PWR_FLAG_SB) != RESET)
-  {
-    /* System resumed from STANDBY mode */
-    /* Clear StandBy flag */
-    RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR,ENABLE);
-    PWR_ClearFlag(PWR_FLAG_SB);
-    /* set StandbyWakeup indicator*/
-    StanbyWakeUp = TRUE;
-  } else
-  {
-    /* Reset StandbyWakeup indicator*/
-    StanbyWakeUp = FALSE;
-  }
-
-	#ifdef BOR_MODIFY
-  /* Get BOR Option Bytes */
-  BOROptionBytes = FLASH_OB_GetBOR();
-
-  if((BOROptionBytes & 0x0F) != BOR_LEVEL)
-  {
-    /* Unlocks the option bytes block access */
-    FLASH_OB_Unlock();
-
-    /* Clears the FLASH pending flags */
-    FLASH_ClearFlag(FLASH_FLAG_EOP|FLASH_FLAG_WRPERR | FLASH_FLAG_PGAERR
-                  | FLASH_FLAG_SIZERR | FLASH_FLAG_OPTVERR);
-
-    /* Select the desired V(BOR) Level ---------------------------------------*/
-    FLASH_OB_BORConfig(BOR_LEVEL);
-
-    /* Launch the option byte loading */
-    FLASH_OB_Launch();
-  }
-#endif
-
-  /* Configure Clocks for Application need */
-  RCC_Configuration();
-
-  /* Set internal voltage regulator to 1.8V */
-  PWR_VoltageScalingConfig(PWR_VoltageScaling_Range1);
-
-  /* Wait Until the Voltage Regulator is ready */
-  while (PWR_GetFlagStatus(PWR_FLAG_VOS) != RESET) ;
-
-  /* Init I/O ports */
-  Init_GPIOs();
-
-  /* Initializes ADC */
-  ADC_Icc_Init();
-
-  /* Enable General interrupts */
-  enableGlobalInterrupts();
-
-  /* Init Touch Sensing configuration */
-  TSL_user_Init();
-
-  /* Initializes the LCD glass */
-  LCD_GLASS_Init();
-
-  /* Reset Keypressed flag used in interrupt and Scrollsentence */
-  KeyPressed = FALSE;
-
-  /* user button actif */
-  UserButton = TRUE;
-
-  /* Check if User button press at Power ON  */
-  if ((USERBUTTON_GPIO_PORT->IDR & USERBUTTON_GPIO_PIN) != 0x0)
-  {
-    /* Measure operational amplifier bias current and store value in E²Prom for application need*/
-    Bias_measurement();
-  }
-
-  /* Standard application startup */
-  if ( !StanbyWakeUp )
-  {
-    /* Reset autotest flag stored in memory */
-    AUTOTEST(FALSE) ;
-
-		/* Display Welcome message */
-    LCD_GLASS_ScrollSentence(message,1,SCROLL_SPEED);
-    if (!KeyPressed)
-    {
-       /* if welcome message not skipped Display blinking message JP1 ON*/
-      LCD_BlinkConfig(LCD_BlinkMode_AllSEG_AllCOM,LCD_BlinkFrequency_Div512);
-      LCD_GLASS_DisplayString("JP1 ON");
-      TEMPO;
-      TEMPO;
-      TEMPO;
-      TEMPO;
-      LCD_BlinkConfig(LCD_BlinkMode_Off,LCD_BlinkFrequency_Div32);
-    }
-  /* Wake up from Standby or autotest */
-  }  else  {
-    /*Check Autotest value stored in flash to get wakeup context*/
-    if (self_test)
-    {
-      /* Wake UP: Return of RESET by Auto test */
-      auto_test_part2();
-    } else {
-      /* Wake UP: Return of RESET by Current STAND BY measurement */
-      LCD_GLASS_ScrollSentence("     STANDBY WAKEUP",1,SCROLL_SPEED);
-      /* Substract bias current from operational amplifier*/
-      if ( Int_CurrentSTBY > Bias_Current )
-        Int_CurrentSTBY -= Bias_Current;
-      Current_STBY = Int_CurrentSTBY * Vdd_appli()/ADC_CONV;
-      Current_STBY *= 20L;
-      display_MuAmp((uint32_t)Current_STBY);
-      /* Wait for user button press to continue */
-      while(!KeyPressed);
-    }
-  }
-  /* Reset KeyPress Flag */
-  KeyPressed = FALSE;
-  /* Clear LCD bars */
-  BAR0_OFF;
-  BAR1_OFF;
-  BAR2_OFF;
-  BAR3_OFF;
-  /* Switch off the leds*/
-  GPIO_HIGH(LD_GPIO_PORT,LD_GREEN_GPIO_PIN);
-  GPIO_LOW(LD_GPIO_PORT,LD_BLUE_GPIO_PIN);
-  /* Set application state machine to VREF state  */
-  state_machine = STATE_VREF ;
-  /*Until application reset*/
-  while (1)
-  {
-  /* run autotest if requested by the user */
-    if (self_test)
-      auto_test();
-    /* Perform Actions depending on current application State  */
-    switch (state_machine)
-    {
-        /* VREF State : Display VRef value */
-        case STATE_VREF:
-          GPIO_TOGGLE(LD_GPIO_PORT,LD_BLUE_GPIO_PIN);
-          GPIO_TOGGLE(LD_GPIO_PORT,LD_GREEN_GPIO_PIN);
-          Vref_measure();
-          TEMPO ;
-        break;
-
-        /* Slider Value State : Display the TS slider value */
-        case STATE_SLIDER_VALUE:
-
-        // Execute STMTouch Driver state machine
-        if (TSL_user_Action() == TSL_STATUS_OK)
-          {
-            ProcessSensors(); // Execute sensors related tasks
-          }
-        break;
-
-        /* Slider button State : Display the curent TS button pressed  */
-        case STATE_SLIDER_BUTTON:
-        // Execute STMTouch Driver state machine
-        if (TSL_user_Action() == TSL_STATUS_OK)
-          {
-            ProcessSensorsButtons(); // Execute sensors related tasks
-          }
-          break;
-
-        /* ICC RUN State : ICC mesurements in Run and Sleep modes   */
-        case STATE_ICC_RUN:
-          LCD_GLASS_DisplayString(" RUN  ");
-          TEMPO;
-          Icc_RUN();
-          TEMPO;
-          TEMPO;
-          TEMPO;
-          TEMPO;
-          LCD_GLASS_DisplayString(" SLEEP ");
-          TEMPO;
-          Icc_SLEEP();
-          TEMPO;
-          TEMPO;
-          TEMPO;
-          TEMPO;
-        break;
-
-        /* ICC LOW POWER RUN State : ICC mesurements in LowPower run and LowPower Sleep modes */
-        case STATE_ICC_LP_RUN:
-          LCD_GLASS_DisplayString("LP RUN");
-          TEMPO;
-          Icc_LPRUN();
-          TEMPO;
-          TEMPO;
-          TEMPO;
-          TEMPO;
-          LCD_GLASS_DisplayString("LP SLP");
-          TEMPO;
-          Icc_LPSLEEP();
-          TEMPO;
-          TEMPO;
-          TEMPO;
-          TEMPO;
-        break;
-
-        /* ICC STOP  State : ICC mesurements in Stop and STOP NoRTC modes */
-        case STATE_ICC_STOP:
-          LCD_GLASS_DisplayString(" STOP ");
-          TEMPO;
-          Icc_STOP();
-          TEMPO;
-          TEMPO;
-          TEMPO;
-          TEMPO;
-          LCD_GLASS_DisplayString("SP-NRTC");
-          TEMPO;
-          Icc_Stop_NoRTC();
-          TEMPO;
-          TEMPO;
-          TEMPO;
-          TEMPO;
-          break;
-
-        /* ICC Standby  State : ICC mesurements in Standby mode */
-        case STATE_ICC_STBY:
-          LCD_GLASS_DisplayString("STBY  ");
-          TEMPO;
-          TEMPO;
-        ADC_Icc_Test(MCU_STBY);
-        /* Following break never performed dues to software reset in previous function */
-        break;
-
-        /* for safe: normaly never reaches */
-        default:
-          LCD_GLASS_Clear();
-          LCD_GLASS_DisplayString("ERROR");
-        break;
-      }
-      /* Reset KeyPress flag*/
-      KeyPressed = FALSE;
-    }
-}
-
-/**
-  * @brief  Configures the different system clocks.
-  * @param  None
-  * @retval None
-  */
-void RCC_Configuration(void)
-{
-  /* Enable HSI Clock */
-  RCC_HSICmd(ENABLE);
-
-  /*!< Wait till HSI is ready */
-  while (RCC_GetFlagStatus(RCC_FLAG_HSIRDY) == RESET);
-
-  /* Set HSI as sys clock*/
-  RCC_SYSCLKConfig(RCC_SYSCLKSource_HSI);
-
-  /* Set MSI clock range to ~4.194MHz*/
-  RCC_MSIRangeConfig(RCC_MSIRange_6);
-
-  /* Enable the GPIOs clocks */
-  RCC_AHBPeriphClockCmd(RCC_AHBPeriph_GPIOA | RCC_AHBPeriph_GPIOB | RCC_AHBPeriph_GPIOC| RCC_AHBPeriph_GPIOD| RCC_AHBPeriph_GPIOE| RCC_AHBPeriph_GPIOH, ENABLE);
-
-  /* Enable comparator, LCD and PWR mngt clocks */
-  RCC_APB1PeriphClockCmd(RCC_APB1Periph_COMP | RCC_APB1Periph_LCD | RCC_APB1Periph_PWR,ENABLE);
-
-  /* Enable ADC & SYSCFG clocks */
-  RCC_APB2PeriphClockCmd(RCC_APB2Periph_ADC1 | RCC_APB2Periph_SYSCFG , ENABLE);
-
-  /* Allow access to the RTC */
-  PWR_RTCAccessCmd(ENABLE);
-
-  /* Reset RTC Backup Domain */
-  RCC_RTCResetCmd(ENABLE);
-  RCC_RTCResetCmd(DISABLE);
-
-  /* LSE Enable */
-  RCC_LSEConfig(RCC_LSE_ON);
-
-  /* Wait until LSE is ready */
-  while (RCC_GetFlagStatus(RCC_FLAG_LSERDY) == RESET);
-
-   /* RTC Clock Source Selection */
-  RCC_RTCCLKConfig(RCC_RTCCLKSource_LSE);
-
-  /* Enable the RTC */
-  RCC_RTCCLKCmd(ENABLE);
-
-  /*Disable HSE*/
-  RCC_HSEConfig(RCC_HSE_OFF);
-  if(RCC_GetFlagStatus(RCC_FLAG_HSERDY) != RESET )
-  {
-    /* Stay in infinite loop if HSE is not disabled*/
-    while(1);
-  }
-}
-
-/**
-  * @brief  To initialize the I/O ports
-  * @caller main
-  * @param None
-  * @retval None
-  */
-void  Init_GPIOs (void)
-{
-  /* GPIO, EXTI and NVIC Init structure declaration */
-  GPIO_InitTypeDef GPIO_InitStructure;
-  EXTI_InitTypeDef EXTI_InitStructure;
-  NVIC_InitTypeDef NVIC_InitStructure;
-
-  /* Configure User Button pin as input */
-  GPIO_InitStructure.GPIO_Pin = USERBUTTON_GPIO_PIN;
-  GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
-  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
-  GPIO_InitStructure.GPIO_Speed = GPIO_Speed_40MHz;
-  GPIO_Init(USERBUTTON_GPIO_PORT, &GPIO_InitStructure);
-
-  /* Select User Button pin as input source for EXTI Line */
-  SYSCFG_EXTILineConfig(EXTI_PortSourceGPIOA,EXTI_PinSource0);
-
-  /* Configure EXT1 Line 0 in interrupt mode trigged on Rising edge */
-  EXTI_InitStructure.EXTI_Line = EXTI_Line0 ;  // PA0 for User button AND IDD_WakeUP
-  EXTI_InitStructure.EXTI_Mode = EXTI_Mode_Interrupt;
-  EXTI_InitStructure.EXTI_Trigger = EXTI_Trigger_Rising;
-  EXTI_InitStructure.EXTI_LineCmd = ENABLE;
-  EXTI_Init(&EXTI_InitStructure);
-
-  /* Enable and set EXTI0 Interrupt to the lowest priority */
-  NVIC_InitStructure.NVIC_IRQChannel = EXTI0_IRQn ;
-  NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 0x0F;
-  NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0x0F;
-  NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
-  NVIC_Init(&NVIC_InitStructure);
-
-  /* Configure the LED_pin as output push-pull for LD3 & LD4 usage*/
-  GPIO_InitStructure.GPIO_Pin = LD_GREEN_GPIO_PIN | LD_BLUE_GPIO_PIN;
-  GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
-  GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
-  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
-  GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;
-  GPIO_Init(LD_GPIO_PORT, &GPIO_InitStructure);
-
-  /* Force a low level on LEDs*/
-  GPIO_LOW(LD_GPIO_PORT,LD_GREEN_GPIO_PIN);
-  GPIO_LOW(LD_GPIO_PORT,LD_BLUE_GPIO_PIN);
-
-/* Counter enable: GPIO set in output for enable the counter */
-  GPIO_InitStructure.GPIO_Pin = CTN_CNTEN_GPIO_PIN;
-  GPIO_Init( CTN_GPIO_PORT, &GPIO_InitStructure);
-
-/* To prepare to start counter */
-  GPIO_HIGH(CTN_GPIO_PORT,CTN_CNTEN_GPIO_PIN);
-
-/* Configure Port A LCD Output pins as alternate function */
-  GPIO_InitStructure.GPIO_Pin = GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_8 | GPIO_Pin_9 |GPIO_Pin_10 |GPIO_Pin_15;
-  GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF;
-  GPIO_Init( GPIOA, &GPIO_InitStructure);
-
-/* Select LCD alternate function for Port A LCD Output pins */
-  GPIO_PinAFConfig(GPIOA, GPIO_PinSource1,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOA, GPIO_PinSource2,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOA, GPIO_PinSource3,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOA, GPIO_PinSource8,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOA, GPIO_PinSource9,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOA, GPIO_PinSource10,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOA, GPIO_PinSource15,GPIO_AF_LCD) ;
-
-  /* Configure Port B LCD Output pins as alternate function */
-  GPIO_InitStructure.GPIO_Pin = GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_8 | GPIO_Pin_9 \
-                                 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_13 | GPIO_Pin_14 | GPIO_Pin_15;
-  GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF;
-  GPIO_Init( GPIOB, &GPIO_InitStructure);
-
-  /* Select LCD alternate function for Port B LCD Output pins */
-  GPIO_PinAFConfig(GPIOB, GPIO_PinSource3,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOB, GPIO_PinSource4,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOB, GPIO_PinSource5,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOB, GPIO_PinSource8,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOB, GPIO_PinSource9,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOB, GPIO_PinSource10,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOB, GPIO_PinSource11,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOB, GPIO_PinSource12,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOB, GPIO_PinSource13,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOB, GPIO_PinSource14,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOB, GPIO_PinSource15,GPIO_AF_LCD) ;
-
-  /* Configure Port C LCD Output pins as alternate function */
-  GPIO_InitStructure.GPIO_Pin = GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_6 \
-                                 | GPIO_Pin_7 | GPIO_Pin_8 | GPIO_Pin_9 | GPIO_Pin_10 |GPIO_Pin_11 ;
-  GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF;
-  GPIO_Init( GPIOC, &GPIO_InitStructure);
-
-  /* Select LCD alternate function for Port B LCD Output pins */
-  GPIO_PinAFConfig(GPIOC, GPIO_PinSource0,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOC, GPIO_PinSource1,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOC, GPIO_PinSource2,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOC, GPIO_PinSource3,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOC, GPIO_PinSource6,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOC, GPIO_PinSource7,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOC, GPIO_PinSource8,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOC, GPIO_PinSource9,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOC, GPIO_PinSource10,GPIO_AF_LCD) ;
-  GPIO_PinAFConfig(GPIOC, GPIO_PinSource11,GPIO_AF_LCD) ;
-
-  /* Configure ADC (IDD_MEASURE) pin as Analogue */
-  GPIO_InitStructure.GPIO_Pin = IDD_MEASURE  ;
-  GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AN;
-  GPIO_Init( IDD_MEASURE_PORT, &GPIO_InitStructure);
-}
-
-
-/**
-  * @brief  Executed when a sensor is in Error state
-  * @param  None
-  * @retval None
-  */
-void MyLinRots_ErrorStateProcess(void)
-{
-  // Add here your own processing when a sensor is in Error state
-  TSL_linrot_SetStateOff();
-}
-
-
-/**
-  * @brief  Executed when a sensor is in Off state
-  * @param  None
-  * @retval None
-  */
-void MyLinRots_OffStateProcess(void)
-{
-  // Add here your own processing when a sensor is in Off state
-}
-
-
-
-/**
-  * @brief  Inserts a delay time.
-  * @param  nTime: specifies the delay time length, in 1 ms.
-  * @retval None
-  */
-void Delay(uint32_t nTime)
-{
-  while (TSL_tim_CheckDelay_ms((TSL_tTick_ms_T) nTime, &last_tick_tsl) != TSL_STATUS_OK);
-}
-
-
-#ifdef  USE_FULL_ASSERT
-
-/**
-  * @brief  Reports the name of the source file and the source line number
-  *         where the assert_param error has occurred.
-  * @param  file: pointer to the source file name
-  * @param  line: assert_param error line source number
-  * @retval None
-  */
-void assert_failed(uint8_t* file, uint32_t line)
-{
-  /* User can add his own implementation to report the file name and line number,
-     ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
-  /* Infinite loop */
-  while (1);
-}
-
-#endif
-
-void vApplicationStackOverflowHook( void )
-{
-}
-
-/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
-	/* Ensure the interrupt is clear before exiting.  The RTC uses EXTI line 20
-	to bring the CPU out of sleep. */
-
-
-
-
-
-
-
-
-
-void _vPortSuppressTicksAndSleep( portTickType xExpectedIdleTime )
-{
-uint32_t ulWakeupValue, ulCompleteTickPeriods;
-eSleepModeStatus eSleepAction;
-portTickType xModifiableIdleTime;
-
-	/* THIS FUNCTION IS CALLED WITH THE SCHEDULER SUSPENDED. */
-
-	/* Make sure the wakeup timer reload value does not overflow the counter. */
-	if( xExpectedIdleTime > xMaximumPossibleSuppressedTicks )
-	{
-		xExpectedIdleTime = xMaximumPossibleSuppressedTicks;
-	}
-
-	/* Calculate the reload value required to wait xExpectedIdleTime tick
-	periods. */
-	ulWakeupValue = ( ( ulWakeupValueForOneTick + 1UL ) * xExpectedIdleTime ) - 1UL;
-	if( ulWakeupValue > ulStoppedTimerCompensation )
-	{
-		/* Compensate for the fact that the RTC is going to be stopped
-		momentarily. */
-		ulWakeupValue -= ulStoppedTimerCompensation;
-	}
-
-	/* Stop the RTC momentarily.  The time the RTC is stopped for is accounted
-	for as best it can be, but using the tickless mode will inevitably result in
-	some tiny drift of the time maintained by the kernel with respect to
-	calendar time. */
-	prvDisableWakeupTimer();
-
-	/* Enter a critical section but don't use the taskENTER_CRITICAL() method as
-	that will mask interrupts that should exit sleep mode. */
-	__asm volatile ( "cpsid i" );
-
-	/* The tick flag is set to false before sleeping.  If it is true when sleep
-	mode is exited then sleep mode was probably exited because the tick was
-	suppressed for the entire xExpectedIdleTime period. */
-	ulTickFlag = pdFALSE;
-
-	/* If a context switch is pending then abandon the low power entry as
-	the context switch might have been pended by an external interrupt that
-	requires processing. */
-	eSleepAction = eTaskConfirmSleepModeStatus();
-	if( eSleepAction == eAbortSleep )
-	{
-		/* Restart tick. */
-		prvEnableWakeupTimer();
-
-		/* Re-enable interrupts - see comments above the cpsid instruction()
-		above. */
-		__asm volatile ( "cpsie i" );
-	}
-	else
-	{
-		/* Adjust the alarm value to take into account that the current time
-		slice is already partially complete. */
-//		ulWakeupValue -= ( RTC->WUTR & RTC_WUTR_WUT ); /* Current value. */
-
-		/* Disable the write protection for RTC registers */
-		RTC->WPR = 0xCA;
-		RTC->WPR = 0x53;
-
-		/* Set the Wakeup Timer value */
-		RTC->WUTR = ulWakeupValue;
-
-		/* Enable the Wakeup Timer */
-		RTC->CR |= (uint32_t)RTC_CR_WUTE;
-
-		/* Enable the write protection for RTC registers. */
-		RTC->WPR = 0xFF;
-
-		/* Allow the application to define some pre-sleep processing. */
-		xModifiableIdleTime = xExpectedIdleTime;
-		configPRE_SLEEP_PROCESSING( xModifiableIdleTime );
-
-		/* xExpectedIdleTime being set to 0 by configPRE_SLEEP_PROCESSING()
-		means the application defined code has already executed the WAIT
-		instruction. */
-		if( xModifiableIdleTime > 0 )
-		{
-			/* Sleep until something happens. */
-			__asm volatile ( "wfi" );
-			__asm volatile ( "dsb" );
-		}
-
-		/* Allow the application to define some post sleep processing. */
-		configPOST_SLEEP_PROCESSING( xModifiableIdleTime );
-
-		/* Stop RTC.  Again, the time the clock is stopped for is accounted
-		for as best it can be, but using the tickless mode will	inevitably
-		result in some tiny drift of the time maintained by the	kernel with
-		respect to calendar time. */
-		prvDisableWakeupTimer();
-
-		/* Re-enable interrupts - see comments above the cpsid instruction()
-		above. */
-		__asm volatile ( "cpsie i" );
-
-		if( ulTickFlag != pdFALSE )
-		{
-			/* The tick interrupt has already executed, although because this
-			function is called with the scheduler suspended the actual tick
-			processing will not occur until after this function has exited.
-			Reset the alarm value with whatever remains of this tick period. */
-			ulWakeupValue = ulWakeupValueForOneTick;//_RB_ - ( RTC->WUTR & RTC_WUTR_WUT ); /* Current value. */
-
-			/* Disable the write protection for RTC registers */
-			RTC->WPR = 0xCA;
-			RTC->WPR = 0x53;
-
-			/* Set the Wakeup Timer value */
-			RTC->WUTR = ulWakeupValue;
-
-			/* Enable the write protection for RTC registers. */
-			RTC->WPR = 0xFF;
-
-			/* The tick interrupt handler will already have pended the tick
-			processing in the kernel.  As the pending tick will be processed as
-			soon as this function exits, the tick value	maintained by the tick
-			is stepped forward by one less than the	time spent sleeping.  The
-			actual stepping of the tick appears later in this function. */
-			ulCompleteTickPeriods = xExpectedIdleTime - 1UL;
-		}
-		else
-		{
-			/* Something other than the tick interrupt ended the sleep.  How
-			many complete tick periods passed while the processor was
-			sleeping? */
-			ulCompleteTickPeriods = ( RTC->WUTR & RTC_WUTR_WUT ) / ulWakeupValueForOneTick;
-
-			/* The alarm value is set to whatever fraction of a single tick
-			period remains. */
-			ulWakeupValue = ( RTC->WUTR & RTC_WUTR_WUT ) - ( ulCompleteTickPeriods * ulWakeupValueForOneTick );
-
-			/* Disable the write protection for RTC registers */
-			RTC->WPR = 0xCA;
-			RTC->WPR = 0x53;
-
-			/* Set the Wakeup Timer value */
-			RTC->WUTR = ulWakeupValue;
-
-			/* Enable the write protection for RTC registers. */
-			RTC->WPR = 0xFF;
-		}
-
-		/* Restart the RTC so it runs down from the wakeup value.  The wakeup
-		value will get set to the value required to generate exactly one tick
-		period the next time the wakeup interrupt executes. */
-		prvEnableWakeupTimer();
-
-		/* Wind the tick forward by the number of tick periods that the CPU
-		remained in a low power state. */
-		vTaskStepTick( ulCompleteTickPeriods );
-	}
-}
-
-
-
-
-
-
-
-
-
-
-//	RTC_ClearITPendingBit( RTC_IT_WUT );
-//	EXTI_ClearITPendingBit( EXTI_Line20 );
-
-
-
-#ifdef USE_RTC
-NVIC_InitTypeDef NVIC_InitStructure;
-EXTI_InitTypeDef EXTI_InitStructure;
-
-	/* Enable access to the RTC registers. */
-	PWR_RTCAccessCmd( ENABLE );
-	RCC_RTCResetCmd( ENABLE );
-	RCC_RTCResetCmd( DISABLE );
-
-	/* LSE Enable */
-	RCC_LSEConfig( RCC_LSE_ON );
-
-	/* Wait until LSE is ready. */
-	while( RCC_GetFlagStatus( RCC_FLAG_LSERDY ) == RESET );
-
-	/* Enable the PWR clock. */
-	RCC_APB1PeriphClockCmd( RCC_APB1Periph_PWR, ENABLE );
-
-	/* LSE used as RTC clock source. */
-	RCC_RTCCLKConfig( RCC_RTCCLKSource_LSE ); /* 32.768KHz external */
-
-	/* Enable the RTC clock and wait for sync. */
-	RCC_RTCCLKCmd( ENABLE );
-	RTC_WaitForSynchro();
-
-	/* Watchdog timer user EXTI line 20 to wake from sleep. */
-	EXTI_ClearITPendingBit( EXTI_Line20 );
-	EXTI_InitStructure.EXTI_Line = EXTI_Line20;
-	EXTI_InitStructure.EXTI_Mode = EXTI_Mode_Interrupt;
-	EXTI_InitStructure.EXTI_Trigger = EXTI_Trigger_Rising;
-	EXTI_InitStructure.EXTI_LineCmd = ENABLE;
-	EXTI_Init( &EXTI_InitStructure );
-
-	/* Enable the RTC Wakeup Interrupt. */
-	NVIC_InitStructure.NVIC_IRQChannel = RTC_WKUP_IRQn;
-	NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = configLIBRARY_LOWEST_INTERRUPT_PRIORITY;
-	NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
-	NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
-	NVIC_Init( &NVIC_InitStructure );
-
-	/* Drive the wakeup clock from LSE/2 (32768/2) */
-	RTC_WakeUpClockConfig( RTC_WakeUpClock_RTCCLK_Div2 );
-
-	/* Set count and reload values. */
-	RTC_SetWakeUpCounter( ulReloadValueForOneTick );
-
-	/* Enable the RTC Wakeup Interrupt. */
-	RTC_ITConfig( RTC_IT_WUT, ENABLE );
-
-	/* Enable Wakeup Counter. */
-	RTC_WakeUpCmd( ENABLE );
-#endif
-
-
-static void prvDisableWakeupTimer( void )
-{
-	RTC->WPR = 0xCA;
-	RTC->WPR = 0x53;
-
-	/* Disable the Wakeup Timer */
-	RTC->CR &= (uint32_t)~RTC_CR_WUTE;
-
-	/* Wait till RTC WUTWF flag is set. */
-	/* _RB_ Timeout needed. */
-	do
-	{
-	} while( ( RTC->ISR & RTC_ISR_WUTWF ) == 0x00 );
-
-	/* Enable the write protection for RTC registers */
-	RTC->WPR = 0xFF;
-}
-/*-----------------------------------------------------------*/
-
-static void prvEnableWakeupTimer( void )
-{
-	RTC->WPR = 0xCA;
-	RTC->WPR = 0x53;
-
-	/* Enable the Wakeup Timer */
-	RTC->CR |= (uint32_t)RTC_CR_WUTE;
-
-	/* Enable the write protection for RTC registers */
-	RTC->WPR = 0xFF;
-}
-/*-----------------------------------------------------------*/
-
-
-#endif
-
diff --git a/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/main_full.c b/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/main_full.c
new file mode 100644
index 000000000..cae1454f9
--- /dev/null
+++ b/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/main_full.c
@@ -0,0 +1,263 @@
+/*
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that has become a de facto standard.             *
+     *                                                                       *
+     *    Help yourself get started quickly and support the FreeRTOS         *
+     *    project by purchasing a FreeRTOS tutorial book, reference          *
+     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
+     *                                                                       *
+     *    Thank you!                                                         *
+     *                                                                       *
+    ***************************************************************************
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+
+    >>! NOTE: The modification to the GPL is included to allow you to distribute
+    >>! a combined work that includes FreeRTOS without being obliged to provide
+    >>! the source code for proprietary components outside of the FreeRTOS
+    >>! kernel.
+
+    FreeRTOS 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.  Full license text is available from the following
+    link: http://www.freertos.org/a00114.html
+
+    1 tab == 4 spaces!
+
+    ***************************************************************************
+     *                                                                       *
+     *    Having a problem?  Start by reading the FAQ "My application does   *
+     *    not run, what could be wrong?"                                     *
+     *                                                                       *
+     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
+    license and Real Time Engineers Ltd. contact details.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
+    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+/******************************************************************************
+ * NOTE 1:  This project provides two demo applications.  A low power tickless
+ * project, and a more comprehensive test and demo application.  The
+ * configCREATE_LOW_POWER_DEMO setting in FreeRTOSConfig.h is used to
+ * select between the two.  See the notes on using
+ * configCREATE_LOW_POWER_DEMO in FreeRTOSConfig.h.  This file implements
+ * the comprehensive test and demo version.
+ *
+ * NOTE 2:  This file only contains the source code that is specific to the
+ * full demo.  Generic functions, such FreeRTOS hook functions, and functions
+ * required to configure the hardware, are defined in main.c.
+ ******************************************************************************
+ *
+ * main_full() creates all the demo application tasks and a software timer, then
+ * starts the scheduler.  The web documentation provides more details of the
+ * standard demo application tasks, which provide no particular functionality,
+ * but do provide a good example of how to use the FreeRTOS API.
+ *
+ * In addition to the standard demo tasks, the following tasks and tests are
+ * defined and/or created within this file:
+ *
+ * "Check" timer - The check software timer period is initially set to three
+ * seconds.  The callback function associated with the check software timer
+ * checks that all the standard demo tasks are not only still executing, but
+ * are executing without reporting any errors.  If the check software timer
+ * discovers that a task has either stalled, or reported an error, then it
+ * changes its own execution period from the initial three seconds, to just
+ * 200ms.  The check software timer callback function also toggles an LED each
+ * time it is called.  This provides a visual indication of the system status:
+ * If the LED toggles every three seconds, then no issues have been discovered.
+ * If the LED toggles every 200ms, then an issue has been discovered with at
+ * least one task.
+ *
+ * See the documentation page for this demo on the FreeRTOS.org web site for
+ * full information, including hardware setup requirements.
+ */
+
+/* Standard includes. */
+#include <stdio.h>
+
+/* Kernel includes. */
+#include "FreeRTOS.h"
+#include "task.h"
+#include "timers.h"
+#include "semphr.h"
+
+/* Standard demo application includes. */
+#include "PollQ.h"
+#include "semtest.h"
+#include "dynamic.h"
+#include "BlockQ.h"
+#include "blocktim.h"
+#include "countsem.h"
+#include "GenQTest.h"
+#include "recmutex.h"
+
+/* ST library functions. */
+#include "stm32l1xx.h"
+#include "discover_board.h"
+#include "discover_functions.h"
+#include "stm32l_discovery_lcd.h"
+
+/* Priorities for the demo application tasks. */
+#define mainQUEUE_POLL_PRIORITY				( tskIDLE_PRIORITY + 2UL )
+#define mainSEM_TEST_PRIORITY				( tskIDLE_PRIORITY + 1UL )
+#define mainBLOCK_Q_PRIORITY				( tskIDLE_PRIORITY + 2UL )
+
+/* A block time of zero simply means "don't block". */
+#define mainDONT_BLOCK						( 0UL )
+
+/* The period after which the check timer will expire providing no errors
+have been reported by any of the standard demo tasks.  ms are converted to the
+equivalent in ticks using the portTICK_RATE_MS constant. */
+#define mainCHECK_TIMER_PERIOD_MS			( 3000UL / portTICK_RATE_MS )
+
+/* The period at which the check timer will expire, in ms, if an error has been
+reported in one of the standard demo tasks.  ms are converted to the equivalent
+in ticks using the portTICK_RATE_MS constant. */
+#define mainERROR_CHECK_TIMER_PERIOD_MS 	( 200UL / portTICK_RATE_MS )
+
+/*-----------------------------------------------------------*/
+
+/*
+ * The check timer callback function, as described at the top of this file.
+ */
+static void prvCheckTimerCallback( xTimerHandle xTimer );
+
+/*-----------------------------------------------------------*/
+
+void main_full( void )
+{
+xTimerHandle xCheckTimer = NULL;
+
+	/* Start all the other standard demo/test tasks.  They have not particular
+	functionality, but do demonstrate how to use the FreeRTOS API and test the
+	kernel port. */
+	vStartDynamicPriorityTasks();
+	vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
+	vCreateBlockTimeTasks();
+	vStartCountingSemaphoreTasks();
+	vStartGenericQueueTasks( tskIDLE_PRIORITY );
+	vStartRecursiveMutexTasks();
+	vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
+	vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );
+
+	/* Create the software timer that performs the 'check' functionality,
+	as described at the top of this file. */
+	xCheckTimer = xTimerCreate( ( const signed char * ) "CheckTimer",/* A text name, purely to help debugging. */
+								( mainCHECK_TIMER_PERIOD_MS ),		/* The timer period, in this case 3000ms (3s). */
+								pdTRUE,								/* This is an auto-reload timer, so xAutoReload is set to pdTRUE. */
+								( void * ) 0,						/* The ID is not used, so can be set to anything. */
+								prvCheckTimerCallback				/* The callback function that inspects the status of all the other tasks. */
+							  );
+
+	if( xCheckTimer != NULL )
+	{
+		xTimerStart( xCheckTimer, mainDONT_BLOCK );
+	}
+
+	/* Start the scheduler. */
+	vTaskStartScheduler();
+
+	/* If all is well, the scheduler will now be running, and the following line
+	will never be reached.  If the following line does execute, then there was
+	insufficient FreeRTOS heap memory available for the idle and/or timer tasks
+	to be created.  See the memory management section on the FreeRTOS web site
+	for more details. */
+	for( ;; );
+}
+/*-----------------------------------------------------------*/
+
+static void prvCheckTimerCallback( xTimerHandle xTimer )
+{
+static long lChangedTimerPeriodAlready = pdFALSE;
+unsigned long ulErrorFound = pdFALSE;
+
+	/* Check all the demo tasks to ensure they are all still running, and that
+	none have detected an error. */
+
+	if( xAreDynamicPriorityTasksStillRunning() != pdTRUE )
+	{
+		ulErrorFound = pdTRUE;
+	}
+
+	if( xAreBlockingQueuesStillRunning() != pdTRUE )
+	{
+		ulErrorFound = pdTRUE;
+	}
+
+	if ( xAreBlockTimeTestTasksStillRunning() != pdTRUE )
+	{
+		ulErrorFound = pdTRUE;
+	}
+
+	if ( xAreGenericQueueTasksStillRunning() != pdTRUE )
+	{
+		ulErrorFound = pdTRUE;
+	}
+
+	if ( xAreRecursiveMutexTasksStillRunning() != pdTRUE )
+	{
+		ulErrorFound = pdTRUE;
+	}
+
+	if( xArePollingQueuesStillRunning() != pdTRUE )
+	{
+		ulErrorFound = pdTRUE;
+	}
+
+	if( xAreSemaphoreTasksStillRunning() != pdTRUE )
+	{
+		ulErrorFound = pdTRUE;
+	}
+
+	/* Toggle the check LED to give an indication of the system status.  If
+	the LED toggles every mainCHECK_TIMER_PERIOD_MS milliseconds then
+	everything is ok.  A faster toggle indicates an error. */
+	GPIO_TOGGLE( LD_GPIO_PORT, LD_GREEN_GPIO_PIN );
+
+	/* Have any errors been latch in ulErrorFound?  If so, shorten the
+	period of the check timer to mainERROR_CHECK_TIMER_PERIOD_MS milliseconds.
+	This will result in an increase in the rate at which mainCHECK_LED
+	toggles. */
+	if( ulErrorFound != pdFALSE )
+	{
+		if( lChangedTimerPeriodAlready == pdFALSE )
+		{
+			lChangedTimerPeriodAlready = pdTRUE;
+
+			/* This call to xTimerChangePeriod() uses a zero block time.
+			Functions called from inside of a timer callback function must
+			*never* attempt	to block. */
+			xTimerChangePeriod( xTimer, ( mainERROR_CHECK_TIMER_PERIOD_MS ), mainDONT_BLOCK );
+		}
+	}
+}
+/*-----------------------------------------------------------*/
+
diff --git a/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/main_low_power.c b/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/main_low_power.c
new file mode 100644
index 000000000..5e3744a4e
--- /dev/null
+++ b/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/main_low_power.c
@@ -0,0 +1,337 @@
+/*
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that has become a de facto standard.             *
+     *                                                                       *
+     *    Help yourself get started quickly and support the FreeRTOS         *
+     *    project by purchasing a FreeRTOS tutorial book, reference          *
+     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
+     *                                                                       *
+     *    Thank you!                                                         *
+     *                                                                       *
+    ***************************************************************************
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+
+    >>! NOTE: The modification to the GPL is included to allow you to distribute
+    >>! a combined work that includes FreeRTOS without being obliged to provide
+    >>! the source code for proprietary components outside of the FreeRTOS
+    >>! kernel.
+
+    FreeRTOS 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.  Full license text is available from the following
+    link: http://www.freertos.org/a00114.html
+
+    1 tab == 4 spaces!
+
+    ***************************************************************************
+     *                                                                       *
+     *    Having a problem?  Start by reading the FAQ "My application does   *
+     *    not run, what could be wrong?"                                     *
+     *                                                                       *
+     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
+    license and Real Time Engineers Ltd. contact details.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
+    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+/* ****************************************************************************
+ * When configCREATE_LOW_POWER_DEMO is set to 1 in FreeRTOSConfig.h main() will
+ * call main_low_power(), which is defined in this file.  main_low_power()
+ * demonstrates FreeRTOS tick suppression being used to allow the MCU to be
+ * placed into the Sleep, Low Power Sleep and Stop low power modes.  When
+ * configCREATE_LOW_POWER_DEMO is set to 0 main will instead call main_full(),
+ * which is a more comprehensive RTOS demonstration.
+ * ****************************************************************************
+ *
+ * This application demonstrates the FreeRTOS tickless idle mode (tick
+ * suppression) being used to allow the STM32L to enter various low power modes
+ * during extended idle periods.  See
+ * http://www.freertos.org/low-power-tickless-rtos.html for information on
+ * tickless operation.
+ *
+ * Deeper low power modes have longer wake up periods that lighter low power
+ * modes, and power is also used simply entering and especially exiting the low
+ * power modes.  How the low power modes are used therefore requires careful
+ * consideration to ensure power consumption is truly minimised and that the
+ * embedded device meets its real time requirements.  This demo is configured to
+ * select between four different modes depending on the anticipated idle period.
+ * Note the time thresholds used to decide which low power mode to enter are
+ * purely for convenience of demonstration and are not intended to represent
+ * optimal values for any particular application.
+ *
+ * The STM32L specific part of the tickless operation is implemented in
+ * STM32L_low_power_tick_management.c.
+ *
+ * The demo is configured to execute on the STM32L Discovery board.
+ *
+ * Functionality:
+ *
+ *  + Two tasks are created, an Rx task and a Tx task.  A queue is created to
+ *	  pass a message from the Tx task to the Rx task.
+ *
+ *  + The Rx task blocks on a queue to wait for data, blipping an LED each time
+ *    data is received (turning it on and then off again) before returning to
+ *    block on the queue once more.
+ *
+ *  + The Tx task repeatedly blocks on an attempt to obtain a semaphore, and
+ *	  unblocks if either the semaphore is received or its block time expires.
+ *	  After leaving the blocked state the Tx task uses the queue to send a
+ *	  value to the Rx task, which in turn causes the Rx task to exit the
+ *	  Blocked state and blip the LED.  The rate at which the LED is seen to blip
+ *	  is therefore dependent on the block time.
+ *
+ *  + The Tx task's block time is changed by the interrupt service routine that
+ *	  executes when the USER button is pressed.  The low power mode entered
+ *	  depends on the block time (as described in the Observed Behaviour section
+ *	  below).  Four block times are used: short, medium, long and infinite.
+ *
+ * Observed behaviour:
+ *
+ * 1) The block time used by the Tx task is initialised to its 'short' value,
+ * so when the Tx task blocks on the semaphore it times-out quickly, resulting
+ * in the LED toggling rapidly.  The timeout period is less than the value of
+ * configEXPECTED_IDLE_TIME_BEFORE_SLEEP (set in FreeRTOSConfig.h), so the
+ * initial state does not suppress the tick interrupt or enter a low power mode.
+ *
+ * 2) When the button is pressed the block time used by the Tx task is increased
+ * to its 'medium' value.  The longer block time results in a slowing of the
+ * rate at which the LED toggles.  The time the Tx task spends in the blocked
+ * state is now greater than configEXPECTED_IDLE_TIME_BEFORE_SLEEP, so the tick
+ * is suppressed.  The MCU is placed into the 'Sleep' low power state while the
+ * tick is suppressed.
+ *
+ * 3) When the button is pressed again the block time used by the Tx task is
+ * increased to its 'long' value, so the rate at which the LED is observed to
+ * blip gets even slow.  When the 'long' block time is used the MCU is placed
+ * into its 'Low Power Sleep' low power state.
+ *
+ * 4) The next time the button is pressed the block time used by the Tx task is
+ * set to infinite, so the Tx task does not time out when it attempts to obtain
+ * the semaphore, and therefore the LED stops blipping completely.  Both tasks
+ * are not blocked indefinitely and the MCU is placed into its 'Stop' low power
+ * state.
+ *
+ * 5) Pressing the button one final time results in the semaphore being 'given'
+ * to unblock the Tx task, the CPU clocks being returned to their pre-stop
+ * state, and the block time being reset to its 'short' time.  The system is
+ * then back to its initial condition with the LED blipping rapidly.
+ *
+ */
+
+/* Kernel includes. */
+#include "FreeRTOS.h"
+#include "task.h"
+#include "queue.h"
+#include "semphr.h"
+
+/* ST library functions. */
+#include "stm32l1xx.h"
+#include "discover_board.h"
+#include "discover_functions.h"
+#include "stm32l_discovery_lcd.h"
+
+/* Priorities at which the Rx and Tx tasks are created. */
+#define configQUEUE_RECEIVE_TASK_PRIORITY	( tskIDLE_PRIORITY + 1 )
+#define	configQUEUE_SEND_TASK_PRIORITY		( tskIDLE_PRIORITY + 2 )
+
+/* The number of items the queue can hold.  This is 1 as the Rx task will
+remove items as they are added so the Tx task should always find the queue
+empty. */
+#define mainQUEUE_LENGTH					( 1 )
+
+/* A block time of zero simply means "don't block". */
+#define mainDONT_BLOCK						( 0 )
+
+/* The value that is sent from the Tx task to the Rx task on the queue. */
+#define mainQUEUED_VALUE					( 100UL )
+
+/* The length of time the LED will remain on for. */
+#define mainLED_TOGGLE_DELAY				( 10 / portTICK_RATE_MS )
+
+/*-----------------------------------------------------------*/
+
+/*
+ * The Rx and Tx tasks as described at the top of this file.
+ */
+static void prvQueueReceiveTask( void *pvParameters );
+static void prvQueueSendTask( void *pvParameters );
+
+/*-----------------------------------------------------------*/
+
+/* The queue used to pass data from the Tx task to the Rx task. */
+static xQueueHandle xQueue = NULL;
+
+/*-----------------------------------------------------------*/
+
+/* Holds the block time used by the Tx task. */
+portTickType xSendBlockTime = ( 100UL / portTICK_RATE_MS );
+
+/* The lower an upper limits of the block time.  An infinite block time is used
+if xSendBlockTime is incremented past xMaxBlockTime. */
+static const portTickType xMaxBlockTime = ( 500L / portTICK_RATE_MS ), xMinBlockTime = ( 100L / portTICK_RATE_MS );
+
+/* The semaphore on which the Tx task blocks. */
+static xSemaphoreHandle xTxSemaphore = NULL;
+
+/*-----------------------------------------------------------*/
+
+/* See the comments at the top of the file. */
+void main_low_power( void )
+{
+	/* Create the semaphore as described at the top of this file. */
+	xTxSemaphore = xSemaphoreCreateBinary();
+	configASSERT( xTxSemaphore );
+
+	/* Create the queue as described at the top of this file. */
+	xQueue = xQueueCreate( mainQUEUE_LENGTH, sizeof( unsigned long ) );
+	configASSERT( xQueue );
+
+	/* Start the two tasks as described at the top of this file. */
+	xTaskCreate( prvQueueReceiveTask, ( const signed char * const ) "Rx", configMINIMAL_STACK_SIZE, NULL, configQUEUE_RECEIVE_TASK_PRIORITY, NULL );
+	xTaskCreate( prvQueueSendTask, ( const signed char * const ) "TX", configMINIMAL_STACK_SIZE, NULL, configQUEUE_SEND_TASK_PRIORITY, NULL );
+
+	/* Start the scheduler running running. */
+	vTaskStartScheduler();
+
+	/* If all is well the next line of code will not be reached as the
+	scheduler will be running.  If the next line is reached then it is likely
+	there was insufficient FreeRTOS heap available for the idle task and/or
+	timer task to be created.  See http://www.freertos.org/a00111.html. */
+	for( ;; );
+}
+/*-----------------------------------------------------------*/
+
+static void prvQueueSendTask( void *pvParameters )
+{
+const unsigned long ulValueToSend = mainQUEUED_VALUE;
+
+	/* Remove compiler warning about unused parameter. */
+	( void ) pvParameters;
+
+	for( ;; )
+	{
+		/* Enter the Blocked state to wait for the semaphore.  The task will
+		leave the Blocked state if either the semaphore is received or
+		xSendBlockTime ticks pass without the semaphore being received. */
+		xSemaphoreTake( xTxSemaphore, xSendBlockTime );
+
+		/* Send to the queue - causing the Tx task to flash its LED. */
+		xQueueSend( xQueue, &ulValueToSend, mainDONT_BLOCK );
+	}
+}
+/*-----------------------------------------------------------*/
+
+static void prvQueueReceiveTask( void *pvParameters )
+{
+unsigned long ulReceivedValue;
+
+	/* Remove compiler warning about unused parameter. */
+	( void ) pvParameters;
+
+	for( ;; )
+	{
+		/* Wait until something arrives in the queue. */
+		xQueueReceive( xQueue, &ulReceivedValue, portMAX_DELAY );
+
+		/*  To get here something must have arrived, but is it the expected
+		value?  If it is, turn the LED on for a short while. */
+		if( ulReceivedValue == mainQUEUED_VALUE )
+		{
+			/* LED on... */
+			GPIO_HIGH( LD_GPIO_PORT, LD_GREEN_GPIO_PIN );
+
+			/* ... short delay ... */
+			vTaskDelay( mainLED_TOGGLE_DELAY );
+
+			/* ... LED off again. */
+			GPIO_LOW( LD_GPIO_PORT, LD_GREEN_GPIO_PIN );
+		}
+	}
+}
+/*-----------------------------------------------------------*/
+
+/* Handles interrupts generated by pressing the USER button. */
+void EXTI0_IRQHandler(void)
+{
+static const portTickType xIncrement = 200UL / portTICK_RATE_MS;
+
+	/* If xSendBlockTime is already portMAX_DELAY then the Tx task was blocked
+	indefinitely, and this interrupt is bringing the MCU out of STOP low power
+	mode. */
+	if( xSendBlockTime == portMAX_DELAY )
+	{
+		portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
+
+		/* Unblock the Tx task. */
+		xSemaphoreGiveFromISR( xTxSemaphore, &xHigherPriorityTaskWoken );
+
+		/* Start over with the 'short' block time as described at the top of
+		this file. */
+		xSendBlockTime = xMinBlockTime;
+
+		/* Request a yield if calling xSemaphoreGiveFromISR() caused a task to
+		leave the Blocked state (which it will have done) and the task that left
+		the Blocked state has a priority higher than the currently running task
+		(which it will have). */
+		portYIELD_FROM_ISR( xHigherPriorityTaskWoken );
+	}
+	else
+	{
+		/* Increase the block time used by the Tx task, as described at the top
+		of this file. */
+		xSendBlockTime += xIncrement;
+
+		/* If the block time has gone over the configured maximum then set it to
+		an infinite block time to allow the MCU to go into its STOP low power
+		mode. */
+		if( xSendBlockTime > xMaxBlockTime )
+		{
+			xSendBlockTime = portMAX_DELAY;
+		}
+	}
+
+	EXTI_ClearITPendingBit( EXTI_Line0 );
+}
+/*-----------------------------------------------------------*/
+
+/* The configPOST_STOP_PROCESSING() macro is called when the MCU leaves its
+STOP low power mode.  The macro is set in FreeRTOSConfig.h to call
+vMainPostStopProcessing(). */
+void vMainPostStopProcessing( void )
+{
+extern void SetSysClock( void );
+
+	/* The STOP low power mode has been exited.  Reconfigure the system clocks
+	ready for normally running again. */
+	SetSysClock();
+}
+/*-----------------------------------------------------------*/
diff --git a/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/stm32l1xx_flash.icf b/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/stm32l1xx_flash.icf
index b3d3f25dd..208f63438 100644
--- a/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/stm32l1xx_flash.icf
+++ b/FreeRTOS/Demo/CORTEX_STM32L152_Discovery_IAR/stm32l1xx_flash.icf
@@ -10,7 +10,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000000;
 define symbol __ICFEDIT_region_RAM_end__   = 0x20003FFF;
 /*-Sizes-*/
 define symbol __ICFEDIT_size_cstack__ = 0x400;
-define symbol __ICFEDIT_size_heap__   = 0x200;
+define symbol __ICFEDIT_size_heap__   = 0x0;
 /**** End of ICF editor section. ###ICF###*/