seniordesign-firmware Changeset - 2c432ac682ed

Changeset - 2c432ac682ed

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-01-24 16:43:44
kripperger@CL-SEC241-09.cedarville.edu

More work on Slave-Master comms

2 files changed with 76 insertions and 7 deletions:

slave/slave/lib/masterComm.c

slave/slave/lib/masterComm.h

0 comments (0 inline, 0 general)

slave/slave/lib/masterComm.c

➞

Show inline comments

@@ @@ -14,12 +14,25 @@ @@
 #include "serparser.h"
 #include "inputOutput.h"
 uint8_t dataTypes;
 char buff2[64];
 char masterComm_checksum(const char* stringPtr)
+{
 	char sum = 0;
 	while(*stringPtr != 0x00)
+	{
 		sum += *stringPtr;
 		stringPtr++;
+	}
 	return sum;
+}
 void masterComm_types()
+{
 	switch(io_getModuleId())
+	{
 		case 0:
 			// Generic
@@ @@ -47,27 +60,79 @@ void masterComm_types() @@
+	}
+}
 void masterComm_modules()
+{
 	// Send BoardTemperature (Common for all modules)
 	serial0_sendString("[");
 	snprintf(buff2,64,"1%u",sensors_getBoardTemp());
 	serial0_sendString(buff2);
 	serial0_sendString("]");
 	serial0_sendString(masterComm_checksum(buff2));
 	// Send module specific sensor readings
 	switch(io_getModuleId())
+	{
 		case 0:
 			// Generic
 			break;
 		case 1:
 			// Sensors
 			// Send SPI Temperature (Air)
 			serial0_sendString("[");
 			snprintf(buff2,64,"2%u",sensors_getSpiTemp());
 			serial0_sendString(buff2);
 			serial0_sendString("]");
 			serial0_sendString(masterComm_checksum(buff2));
 			// Send Ambient Light (Needs to be formatted)
 			serial0_sendString("[");
 			snprintf(buff2,64,"3%u",geiger_getCpm());		//FIX
 			serial0_sendString(buff2);
 			serial0_sendString("]");
 			serial0_sendString(masterComm_checksum(buff2));
 /*
 			// Send CPM (radiation)
 			serial0_sendString("[");
 			snprintf(buff2,64,"7%u",geiger_getCpm());
 			serial0_sendString(buff2);
 			serial0_sendString("]");
 			serial0_sendString(masterComm_checksum(buff2));
 			// Send CPM (radiation)
 			serial0_sendString("[");
 			snprintf(buff2,64,"7%u",geiger_getCpm());
 			serial0_sendString(buff2);
 			serial0_sendString("]");
 			serial0_sendString(masterComm_checksum(buff2));
 			// Send CPM (radiation)
 			serial0_sendString("[");
 			snprintf(buff2,64,"7%u",geiger_getCpm());
 			serial0_sendString(buff2);
 			serial0_sendString("]");
 			serial0_sendString(masterComm_checksum(buff2));
 */
 			break;
 		case 2:
 			// Geiger
 			// Send CPM (radiation)
 			serial0_sendString("[");
 			snprintf(buff2,64,"7%u",geiger_getCpm());
 			serial0_sendString(buff2);
 			serial0_sendString("]");
 			serial0_sendString(masterComm_checksum(buff2));
 			break;
 		case 3:
 			// Camera
 			break;
@@ @@ -78,26 +143,29 @@ void masterComm_modules() @@
+	}
+}
 void masterComm_send()
+{
 	masterComm_types();
 	serial0_sendString("[@");
 	snprintf(buff2,64,"%u]%u",dataTypes,('@'+dataTypes));
 	masterComm_types();		// Calculates how many data types to send
 	// Return resquest with number of data types to be sent
 	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();
 	masterComm_modules();	// Send sensor data
 	serial0_sendString("got request\r\n");		//DEBUG
+}
-void masterComm_check()
+void masterComm_checkParser()
+{
 	if (serparser_parse() == PARSERESULT_PARSEOK)
+	{
 		if (getPayloadType() == ('@'-0x30))		// Request for data recieved
+		{
 			// Send all data

slave/slave/lib/masterComm.h

➞

Show inline comments

@@ @@ -5,17 +5,18 @@ @@
  *  Author: kripperger
  */
 #ifndef MASTERCOMM_H_
 #define MASTERCOMM_H_
 char masterComm_checksum(const char* stringPtr);
 void masterComm_types();	// Calculates the number of types the module has
 void masterComm_modules();	// Sends sensor data depending on module
-void masterComm_check();	// Runs parser and checks for data request
+void masterComm_checkParser();	// Runs parser and checks for data request
 void masterComm_send();		// Sends data after being requested
 #endif /* MASTERCOMM_H_ */
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)