Changeset 37 for webserver/example/EnergyMeters

Timestamp:

01/31/10 12:44:23 (15 years ago)

Author:

phil

Message:

- SolarCount? data reading now working. Still hangs sometimes on Rx Data loss. Data not yet visible on web page.
- Deleted some unnecessary temp files from the compiler.

Files:

• webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzp (modified) (1 diff)
• webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs (modified) (5 diffs)
• webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/main.c (modified) (3 diffs)
• webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c (modified) (2 diffs)
• webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (modified) (18 diffs)
• webserver/example/EnergyMeters/Source/serial.c (added)

webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzp

@@ -54 +54 @@
-      </file>
-      <file Name="heap_2.c" file_name="../../Source/portable/MemMang/heap_2.c"/>
+      <file file_name="../../Source/serial.c"/>
-    </folder>
-    <configuration Name="ARM Flash Debug" arm_target_flash_loader_type="LIBMEM RPC Loader" c_enforce_ansi_checking="No" c_preprocessor_definitions="" gcc_optimization_level="None" linker_keep_symbols="_vectors" linker_printf_fmt_level="int" linker_scanf_character_group_matching_enabled="No" linker_scanf_fmt_level="int"/>

webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs

@@ -2 +2 @@
-<session>
- <Bookmarks/>
-
-
-
+
- <ExecutionCountWindow/>
- <Memory1>
@@ -16 +14 @@
- </Memory3>
- <Memory4>
-0x40005749" numColumns="8" sizeText="1
+" numColumns="16" sizeText="0
- </Memory4>
- <Project>
@@ -22 +20 @@
-  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded" name="unnamed" />
-  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;Demo Source" name="unnamed" />
-  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;EnergyMeters" name="unnamed" />
- </Project>
- <Register1>
@@ -42 +39 @@
- <Watch1>
-  <Watches active="0" update="Three Seconds" >
+   <Watchpoint evalMode="2" linenumber="302" numelements="10" evalType="0" radix="16" name="rxUART3" expression="rxUART3" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
+   <Watchpoint evalMode="2" linenumber="72" numelements="10" evalType="0" radix="16" name="meterItems" expression="meterItems" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" />
-   <Watchpoint linenumber="64" radix="-1" name="currentTime" expression="currentTime" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" />
-
-
-
+
-  </Watches>
- </Watch1>
@@ -57 +54 @@
- </Watch3>
- <Watch4>
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  </Watches>
- </Watch4>
- <Files>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- </Files>
-Examples_CP-JR_ARM7_LPC2368\ETT_LPC2368_Examples\PERIPHERAL_DEMO\LED_Blink
+webserver\example\EnergyMeters\Source
-</session>

webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/main.c

@@ -118 +118 @@
-  vParTestInitialise();
-
-
+//
-
-  /* Create the queue used by the LCD task.  Messages for display on the LCD
-  are received via this queue. */
-
+//
-
-  /* Create the lwIP task.  This uses the lwIP RTOS abstraction layer.*/
@@ -128 +128 @@
-
-//  vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
-
+
+
+
-        /* Start the standard demo tasks. */
-//  vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
@@ -139 +141 @@
-        /* Start the tasks defined within this file/specific to this demo. */
- //   xTaskCreate( vCheckTask, ( signed portCHAR * ) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );
-
+
+
+
+
+
-
-        /* The suicide tasks must be created last as they need to know how many

webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c

@@ -36 +36 @@
-  vSemaphoreCreateBinary( xMetersSemaphore );
-        
-
+
+
+
-
-  for( ;; )
-  {
-
+    /* this runs every 1000 ms */
+
-    basementGasCalculation();
+
+
+
-
-    portENTER_CRITICAL();
-            // example: do stuff
+
+
-    portEXIT_CRITICAL();
-
@@ -79 +88 @@
-
-void vP2_0_ISR_Wrapper( void );
-
-// configure port-pins for use with LAN-controller,
-// reset it and send the configuration-sequence
-
-portBASE_TYPE Init_P2_0(void)

webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c

@@ -2 +2 @@
-
-#include "LPC23xx.h"
+
+
+#include "FreeRTOS.h"
+#include "semphr.h" 
+#include "task.h"
+#include "serial.h"
+
+#define solarSTACK_SIZE         configMINIMAL_STACK_SIZE+200
+
+#define SOLAR_READ_DELAY         500
-
-// Pin I/O LED Control Maskbit
@@ -17 +27 @@
-#define SOL_CHAN     2 /* querying channel currentChannel */
-#define SOL_CHAN_WAIT_REPLY 3 /* waiting for reply on channel currentChannel = 0; */
-10
+0xA
-//#define SOL_
-//#define SOL_
-
-
+// UART/FIFO Register Bit Masks
+
+#define UIIR_PEND         1U
+#define UIIR_RLS_INT      (3U << 1)
+#define UIIR_RDA_INT      (2U << 1)
+#define UIIR_CTI_INT      (6U << 1)
+#define UIIR_THRE_INT     (1U << 1)
+
+#define ULSR_RDR          1U
+
+
+/* Handle to the com port (UART3) */
+  xComPortHandle xPort;
+
+unsigned int uart3TxRunning = 0; /* flag to tell if we are currently sending a datagram */
+
+
-unsigned int rxBuf3NextFreeRxPos = 0;
-
@@ -27 +54 @@
-
-static int solarState = SOL_NO_INIT; /* state of the SolarCount communication state machine */
+
+
+portTickType xReadRate, xLastReadTime;
-
-
@@ -97 +127 @@
-void TXD_RS485(void) 
-{
-
+//
-  IOSET1 = DIR_RS485;           // RS485 Direction = 1 (Transmit)
-} /* TXD_RS485 */
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-  solarState = SOL_NO_INIT;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-/* Clear Uart3 RxBuf and pointer to next Rx element */
@@ -140 +156 @@
-void getUart3RxData(void)
-{
-
+
+
+
-  unsigned char RxBuf; // one rx char, or 0x100 if no data
-
+//
-
-  while (rxBuf3NextFreeRxPos + 1 < RX_UART3_BUF_SIZE)
-  {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-       // if data available
@@ -168 +195 @@
-  int i;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  /* move end part of the buffer (after n) to front */
-
-
-
-
+//
+//
+//
+//
-  /* write 0 to now unused elements */
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  /* adjust rxBuf3NextFreeRxPos */ 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -263 +311 @@
-  int cmpResult;
-
+
-  /* always get Rx data */
-  getUart3RxData();
@@ -269 +318 @@
-  {
-    case SOL_NO_INIT:
-      delay(500000);
-      init_serial3();
-      resetUart3RxBuf(); /* init */
-      currentChannel = 0; /* the channel we query first */
-
-      TXD_RS485();
-      delay(500000);
-       /* send init 1 */
-      send_uart3((unsigned char *)init1, sizeof(init1));
-      RXD_RS485();
-      solarState = SOL_SENT_INIT; /* now wait for reply */
-    break;
@@ -310 +354 @@
-    /* send query for channel number currentChannel */
-
-TXD_RS485(
+vTaskDelayUntil( &xLastReadTime, SOLAR_READ_DELAY 
-     switch ( currentChannel )
-     {
@@ -338 +382 @@
-        ; /* do nothing */
-     } /* switch */
-     RXD_RS485();
-     if (solarState != SOL_FINISHED)
-     {
@@ -395 +438 @@
-
-          /* finally, discard data from buffer */
-       resetUart3RxBuf();
+
-  
-          /* switch to next channel */
@@ -408 +451 @@
-        }
-
+        resetUart3RxBuf();
+
-      }
-      else
@@ -425 +470 @@
-
-
-
-
-
+
-void init_serial3 (void)  
-{
+
-  unsigned int baud = 57600;
-  unsigned int divisor = get_uart_clk(3, OSCILLATOR_CLOCK_FREQUENCY) / (16 * baud);
-
-
-  int i;
-
@@ -441 +484 @@
-  }
-
+ /* init serial port */
+ xPort = xSerialPortInitMinimal( baud /* baud rate */, 80 /* buffer length */ );
+//vStartComTestTasks();
-
-  // xxxx xxxx xxxx xxxx xxxx xxxx xxxx 1010
@@ -453 +499 @@
-  PINSEL3 &= 0xFFFF3FFF;                                                                        // P1.19 = GPIO
-  IODIR1 = DIR_RS485;                                                                           // Pin Control Direction RS485 = Output
-
+//
-
-   //PCLKSEL1 = 0;  /* UART3 frequency */
@@ -474 +520 @@
-
-// Baud Rate Calculator: http://prototalk.net/forums/showthread.php?t=11
-
-#if 0
-  U3LCR = 0x83;                                                  // 8 bits, no Parity, 1 Stop bit
-  U3DLL = 0x0C;                                                  // Baud 57600BPS for 12MHz PCLK Clock         
-  U3FDR = 0xC1;                                                  // Fractional Divider (0x67 = 115200 , 0xCE = 57600 ????),      
-  U3DLM = 0;
-
-  U3LCR = 0x03;                                                 // DLAB = 0
-#endif
-
-
-
@@ -496 +532 @@
-void send_uart3(char * data, int length)
-{
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    /* go only through length-1 because we do not send the terminating \x00 of the c-string in data */
-                                                                                        // Write char to UART                                                                                           // Next char
+// Write char to UART
-  }
-
-
-
+
+
+
+
+
+
-
-  return;
@@ -555 +597 @@
-}
-
+
+
+static portTASK_FUNCTION( vSolar_Task, pvParameters )
+{
+
+
+  initSolarFSM();
+
+  for( ;; )
+  {
+
+
+
+    //portENTER_CRITICAL();
+
+    solarFSM();
+
+    //portEXIT_CRITICAL();
+
+
+   if (solarState == SOL_FINISHED)
+   {
+      solarState = SOL_NO_INIT;
+   } /* if */
+   
+  }
+}
+
+
+
+void vStartSolarTask( unsigned portBASE_TYPE uxPriority )
+{
+
+  /* Spawn the task. */
+  xTaskCreate( vSolar_Task, ( signed portCHAR * ) "Solar", solarSTACK_SIZE, NULL, uxPriority, ( xTaskHandle * ) NULL );
+}
+