seniordesign-firmware Changeset - 89ad841d14f4

Changeset - 89ad841d14f4

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-01-30 18:32:38
kripperger@CL-SEC241-09.cedarville.edu

Testing Serial Inter-module slave side

4 files changed with 14 insertions and 11 deletions:

slave/slave/lib/masterComm.c

slave/slave/lib/serparser.c

slave/slave/slave.c

slave/slave/slave.cproj

0 comments (0 inline, 0 general)

slave/slave/lib/masterComm.c

➞

Show inline comments

@@ @@ -10,12 +10,15 @@ @@
 #include <stdio.h>
 #include "../config.h"
 #include "masterComm.h"
 #include "serial.h"
 #include "serparser.h"
 #include "inputOutput.h"
 #include "sensors.h"
 #include "geiger.h"
 #include "led.h"
 uint8_t dataTypes;
 char buff2[64];
 char masterComm_checksum(const char* stringPtr)
@@ @@ -152,25 +155,24 @@ void masterComm_send() @@
 	serial0_sendString("[");						// Send opening bracket
 	snprintf(buff2,64,"@%u",dataTypes);				// Send package (@ reply and number of data types)
 	serial0_sendString(buff2);
 	serial0_sendString("]");						// Send closing bracket
 	serial0_sendString(masterComm_checksum(buff2));	// Calculate and send checksum
 	masterComm_modules();	// Send sensor data
 	serial0_sendString("got request\r\n");		//DEBUG
 	masterComm_modules();	// Send sensor data
+}
 void masterComm_checkParser()
+{
 	if (serparser_parse() == PARSERESULT_PARSEOK)
+	{
 		if (getPayloadType() == ('@'-0x30))		// Request for data recieved
+		{
 			led_on(2);
 			// Send all data
 			masterComm_send();
 			led_off(2);
+		}
+	}
+}

slave/slave/lib/serparser.c

➞

Show inline comments

@@ @@ -87,13 +87,13 @@ ISR(USART0_RX_vect) @@
 	//serial0_sendString((debugBuff));
+}
 #define DEBUG
+//#define DEBUG
 // Parse data from circular buffer
 int serparser_parse(void)
+{
 	char byte;

slave/slave/slave.c

➞

Show inline comments

@@ @@ -67,30 +67,31 @@ int main(void) @@
     while(1)
+    {
 		// Master communication
-		//masterComm_check();
+		masterComm_checkParser();
 		// Main slave operations
 		if ((time_millis() % SENSOR_LOOP) == 0)	// Uses program timer to run every so often. Time interval defined in config.h
+		{
+			led_on(0);
 			sensors_readBoardTemp();	// Read board temperature sensor (Common on all slaves) (Data Read)
 			modules_run(io_getModuleId());		// Runs specific module functions (like data reading)
 			io_regulateTemp();			// Gets board temperature and enables heater if below threshold
 			//snprintf(buff,64,"|ModuleID: %u |BoardTemp: %i |Millis: %lu |Heater: %u\r\n",io_getModuleId(),sensors_getBoardTemp(),time_millis(),io_heaterStatus()); //DEBUG
 			//serial0_sendString(buff); //DEBUG
 			led_toggle(0);		// Toggle LED0(Blue) to show loop running
 			_delay_ms(1);		// Delay to prevent the sensor loop from running again before time_millis changes
 			//led_toggle(0);		// Toggle LED0(Blue) to show loop running
 			_delay_ms(2);		// Delay to prevent the sensor loop from running again before time_millis changes
 			led_off(0);
+		}
+    }
 	return 0;
+}

slave/slave/slave.cproj

➞

Show inline comments

@@ @@ -19,13 +19,13 @@ @@
     <KeepTimersRunning>true</KeepTimersRunning>
     <OverrideVtor>false</OverrideVtor>
     <OverrideVtorValue />
     <eraseonlaunchrule>0</eraseonlaunchrule>
     <AsfVersion>2.11.1</AsfVersion>
     <avrtoolinterface>ISP</avrtoolinterface>
-    <avrtool>com.atmel.avrdbg.tool.ispmk2</avrtool>
+    <avrtool>com.atmel.avrdbg.tool.avrdragon</avrtool>
     <com_atmel_avrdbg_tool_simulator>
       <ToolType xmlns="">com.atmel.avrdbg.tool.simulator</ToolType>
       <ToolName xmlns="">AVR Simulator</ToolName>
       <ToolNumber xmlns="">
       </ToolNumber>
       <KeepTimersRunning xmlns="">true</KeepTimersRunning>
@@ @@ -74,13 +74,13 @@ @@
       <KeepTimersRunning>true</KeepTimersRunning>
       <OverrideVtor>false</OverrideVtor>
       <OverrideVtorValue>
       </OverrideVtorValue>
       <Channel>
         <host>127.0.0.1</host>
-        <port>64369</port>
+        <port>60480</port>
         <ssl>False</ssl>
       </Channel>
       <ToolOptions>
         <InterfaceName>ISP</InterfaceName>
         <InterfaceProperties>
           <JtagDbgClock>0</JtagDbgClock>

0 comments (0 inline, 0 general)