Refresh count = %d", lRefreshCount );
- vTaskList( uip_appdata );
- strcat( uip_appdata, cCountBuf );
-
- return strlen( uip_appdata );
+ lRefreshCount++;
+
+ sprintf( cCountBuf, "
Refresh count = %d
Pulse Counter = %d at %02u:%02u:%02u", lRefreshCount, basementGasReading, rtcHOURS, rtcMINUTES, rtcSECONDS );
+ strcat( uip_appdata, cCountBuf );
+ vTaskList( uip_appdata );
+ strcat( uip_appdata, cCountBuf );
+
+ return strlen( uip_appdata );
}
/*---------------------------------------------------------------------------*/
Index: webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/main.c
===================================================================
--- webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/main.c (revision 17)
+++ webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/main.c (revision 19)
@@ -81,4 +81,7 @@
+void setRTC(void);
+void startRTC(void);
+
/*
* Checks the status of all the demo tasks then prints a message to the
@@ -98,4 +101,9 @@
extern void vuIP_Task( void *pvParameters );
+/*
+ * The task that handles the electricity meter handling/calculations.
+ */
+extern void vMeters_Task( void *pvParameters );
+
/*
* The LCD is written two by more than one task so is controlled by a
@@ -113,30 +121,35 @@
int main (void)
{
- /* Setup the led's on the MCB2300 board */
- vParTestInitialise();
-
- /* Create the queue used by the LCD task. Messages for display on the LCD
- are received via this queue. */
- xLCDQueue = xQueueCreate( mainQUEUE_SIZE, sizeof( xLCDMessage ) );
-
- /* Create the lwIP task. This uses the lwIP RTOS abstraction layer.*/
- xTaskCreate( vuIP_Task, ( signed portCHAR * ) "uIP", mainBASIC_WEB_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY - 1, NULL );
-
+ startRTC(); /* start the RTC */
+
+ /* Setup the led's on the MCB2300 board */
+ vParTestInitialise();
+
+ /* Create the queue used by the LCD task. Messages for display on the LCD
+ are received via this queue. */
+ xLCDQueue = xQueueCreate( mainQUEUE_SIZE, sizeof( xLCDMessage ) );
+
+ /* Create the lwIP task. This uses the lwIP RTOS abstraction layer.*/
+ xTaskCreate( vuIP_Task, ( signed portCHAR * ) "uIP", mainBASIC_WEB_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY - 1, NULL );
+
+// vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
+ vStartMetersTask( mainBLOCK_Q_PRIORITY );
/* Start the standard demo tasks. */
- vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
- vCreateBlockTimeTasks();
- vStartLEDFlashTasks( mainFLASH_PRIORITY );
- vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );
- vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
- vStartIntegerMathTasks( mainINTEGER_TASK_PRIORITY );
+// vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
+// vCreateBlockTimeTasks();
+ vStartLEDFlashTasks( mainFLASH_PRIORITY );
+// vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );
+// vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
+// vStartIntegerMathTasks( mainINTEGER_TASK_PRIORITY );
/* Start the tasks defined within this file/specific to this demo. */
- xTaskCreate( vCheckTask, ( signed portCHAR * ) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );
- xTaskCreate( vLCDTask, ( signed portCHAR * ) "LCD", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY - 1, NULL );
+ // xTaskCreate( vCheckTask, ( signed portCHAR * ) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );
+ xTaskCreate( vLCDTask, ( signed portCHAR * ) "LCD", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY - 1, NULL );
/* The suicide tasks must be created last as they need to know how many
tasks were running prior to their creation in order to ascertain whether
or not the correct/expected number of tasks are running at any given time. */
- vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY );
+ // vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY );
+
/* Start the scheduler. */
@@ -245,6 +258,40 @@
}
-
-
-
-
+void setRTC(void)
+{
+/*
+ This function needs to be called when the RTC battery was replaces
+
+ SEC 6 Seconds value in the range of 0 to 59 R/W 0xE002 4020
+ MIN 6 Minutes value in the range of 0 to 59 R/W 0xE002 4024
+ HOUR 5 Hours value in the range of 0 to 23 R/W 0xE002 4028
+ DOM 5 Day of month value in the range of 1 to 28, 29, 30,
+ or 31 (depending on the month and whether it is a
+ leap year).[1]
+ R/W 0xE002 402C
+ DOW 3 Day of week value in the range of 0 to 6[1] R/W 0xE002 4030
+ DOY 9 Day of year value in the range of 1 to 365 (366 for
+ leap years)[1]
+ R/W 0xE002 4034
+ MONTH 4 Month value in the range of 1 to 12 R/W 0xE002 4038
+ YEAR 12 Year value in the range of 0 to 4095 R/W 0xE002 403C
+*/
+ RTC_SEC = 00;
+ RTC_MIN = 22;
+ RTC_HOUR = 17;
+ RTC_DOM = 11;
+ RTC_DOW = 2-1;
+ RTC_DOY = 223;
+ RTC_MONTH = 8;
+ RTC_YEAR = 2009;
+}
+
+void startRTC(void)
+{
+ // Initial RTC Function
+ RTC_CCR = 0; // Reset All Bit Control
+ RTC_CCR |= 0x00000010; // CLKSRC = 1 = Used EXT 32.768 KHz
+ RTC_CCR |= 0x00000002; // Reset Clock
+ RTC_CCR &= 0xFFFFFFFD; // Release Reset
+ RTC_CCR |= 0x00000001; // Start RTC Clock
+}
Index: webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp
===================================================================
--- webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp (revision 17)
+++ webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp (revision 19)
@@ -2,5 +2,5 @@