seniordesign-firmware Changeset - 0ce2a225ee75

Changeset - 0ce2a225ee75

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

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

testing configs

4 files changed with 34 insertions and 32 deletions:

slave/slave/config.h

slave/slave/lib/masterComm.c

slave/slave/modules.c

slave/slave/slave.c

0 comments (0 inline, 0 general)

slave/slave/config.h

➞

Show inline comments

@@ @@ -2,43 +2,43 @@ @@
  * config.h
+ *
  * Created: 10/25/2012 10:00:09 PM
  *  Author: mkanning
  */
  #ifndef CONFIG_H_
  #define CONFIG_H_
  #define F_CPU 11059200				// Clock frequency (used in calculations)
 //Serial
 #define USART0_BAUDRATE 115200
 #define USART1_BAUDRATE 115200
 // Circular serial buffer size. Must be at least MAX_CMD_LEN + 5
 #define BUFFER_SIZE 32
 // Maximum payload size of command
 #define MAX_PAYLOAD_LEN 16
 // Number of datatypes to transmit per module type
 #define DATATYPES_GENERIC 1
-#define DATATYPES_SENSOR 6
+#define DATATYPES_SENSOR 3 //Should be set to more
 #define DATATYPES_GEIGER 2
 #define DATATYPES_CAMERA 1
 //Sensors and IO
 #define SENSOR_LOOP 200				// Frequency of sensor reads (in ms)
 #define HEATER_THRESHOLD 40			// Temperature threshold in Fahrenheit where heater is activated
  //I2C Addresses
  #define EEPROM_ADDR 0xA0		// Read 0xA1 - Write 0xA0
  #define BOARDTEMP_ADDR 0x90	// Read 0x91 - Write 0x90
  #define PRESSURE_ADDR 0xEF		// Read 0xEF - Write 0xEE
  #define HUMID_ADDR 0x27		// Read 0x27 - Write 0x26
  #define LIGHT_ADDR 0x95		// Read 0x95 - Write 0x94
  #define RTC_ADDR 0xB2			//DEBUG [Used for testing]      // Read 0xA3 - Write 0xA2
  #endif /* CONFIG_H_ */
@@ \ No newline at end of file @@

slave/slave/lib/masterComm.c

➞

Show inline comments

@@ @@ -46,133 +46,133 @@ void masterComm_types() @@
 			// Sensors
 			dataTypes = DATATYPES_SENSOR;
 			break;
 		case 2:
 			// Geiger
 			dataTypes = DATATYPES_GEIGER;
 			break;
 		case 3:
 			// Camera
 			dataTypes = DATATYPES_CAMERA;
 			break;
 		default:
 			dataTypes = DATATYPES_GENERIC;
 			break;
+	}
+}
 void masterComm_modules()
+{
 	// Send BoardTemperature (Common for all modules)
 	serial0_sendString("[");
 	snprintf(buff2,64,"1%u",sensors_getBoardTemp());
 	serial0_sendChar('[');
 	snprintf(buff2,64,"0%u",sensors_getBoardTemp());
 	serial0_sendString(buff2);
 	serial0_sendString("]");
 	serial0_sendString(masterComm_checksum(buff2));
 	serial0_sendChar(']');
 	serial0_sendChar(masterComm_checksum(buff2));
 	// Send module specific sensor readings
 	switch(io_getModuleId())
+	{
 		case 0:
 			// Generic
 			break;
 		case 1:
 			// Sensors
 			// Send SPI Temperature (Air)
-			serial0_sendString("[");
+			serial0_sendChar('[');
 			snprintf(buff2,64,"2%u",sensors_getSpiTemp());
 			serial0_sendString(buff2);
 			serial0_sendString("]");
 			serial0_sendString(masterComm_checksum(buff2));
 			serial0_sendChar(']');
 			serial0_sendChar(masterComm_checksum(buff2));
 			// Send Ambient Light (Needs to be formatted)
-			serial0_sendString("[");
+			serial0_sendChar('[');
 			snprintf(buff2,64,"3%u",geiger_getCpm());		//FIX
 			serial0_sendString(buff2);
 			serial0_sendString("]");
 			serial0_sendString(masterComm_checksum(buff2));
 			serial0_sendChar(']');
 			serial0_sendChar(masterComm_checksum(buff2));
 /*
 			// Send CPM (radiation)
-			serial0_sendString("[");
+			serial0_sendChar('[');
 			snprintf(buff2,64,"7%u",geiger_getCpm());
 			serial0_sendString(buff2);
 			serial0_sendString("]");
 			serial0_sendString(masterComm_checksum(buff2));
 			serial0_sendChar(']');
 			serial0_sendChar(masterComm_checksum(buff2));
 			// Send CPM (radiation)
-			serial0_sendString("[");
+			serial0_sendChar('[');
 			snprintf(buff2,64,"7%u",geiger_getCpm());
 			serial0_sendString(buff2);
 			serial0_sendString("]");
 			serial0_sendString(masterComm_checksum(buff2));
 			serial0_sendChar(']');
 			serial0_sendChar(masterComm_checksum(buff2));
 			// Send CPM (radiation)
-			serial0_sendString("[");
+			serial0_sendChar('[');
 			snprintf(buff2,64,"7%u",geiger_getCpm());
 			serial0_sendString(buff2);
 			serial0_sendString("]");
 			serial0_sendString(masterComm_checksum(buff2));
 			serial0_sendChar(']');
 			serial0_sendChar(masterComm_checksum(buff2));
 */
 			break;
 		case 2:
 			// Geiger
 			// Send CPM (radiation)
-			serial0_sendString("[");
+			serial0_sendChar('[');
 			snprintf(buff2,64,"7%u",geiger_getCpm());
 			serial0_sendString(buff2);
 			serial0_sendString("]");
 			serial0_sendString(masterComm_checksum(buff2));
 			serial0_sendChar(']');
 			serial0_sendChar(masterComm_checksum(buff2));
 			break;
 		case 3:
 			// Camera
 			break;
 		default:
 			break;
+	}
+}
 void masterComm_send()
+{
 	masterComm_types();		// Calculates how many data types to send
 	// Return resquest with number of data types to be sent
 	serial0_sendString("[");						// Send opening bracket
 	// Return request with number of data types to be sent
 	serial0_sendChar('[');						// 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
 	serial0_sendChar(']');						// Send closing bracket
 	serial0_sendChar(masterComm_checksum(buff2));	// Calculate and send checksum
 	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);
+			//led_off(2);
+		}
+	}
+}

slave/slave/modules.c

➞

Show inline comments

 /*
  * modules.c
+ *
  * Created: 11/9/2012 11:44:22 AM
  *  Author: kripperger
  */
  #include <inttypes.h>
  #include <avr/io.h>
  #include <avr/interrupt.h>
  #include "config.h"
  #include <util/delay.h>
  #include "modules.h"
  #include "lib/spi.h"
  #include "lib/i2c.h"
  #include "lib/sensors.h"
  void modules_setup(uint8_t id)
+ {
 	switch(id)
+	{
 		case 0:
 			modules_generic_setup();
 			break;
 		case 1:
 			modules_sensors_setup();
 			break;
 		case 2:
 			modules_geiger_setup();
 			break;
 		case 3:
 			modules_cameras_setup();
 			break;
 		default:
 			modules_generic_setup();
 			break;
@@ @@ -101,51 +102,51 @@ @@
 	TIMSK2 = 0x01;			// Enable interrupt on overflow
 	sei();					// Enable all interrupts
+ }
  void modules_cameras_setup()
+ {
+ }
  void modules_generic()
+ {
 	// Gathers data and performs functions for generic daughter board
+ }
  void modules_sensors()
+ {
 	// Gathers data and performs functions for sensor daughter board
 	sensors_readBoardTemp();		//Data Read
 	sensors_readSpiTemp();			//Data Read
 	sensors_readPressure();			//Data Read
 	sensors_readHumid();			//Data Read
 	sensors_readLight();			//Data Read
 	//sensors_readPressure();			//Data Read
 	//sensors_readHumid();			//Data Read
 	//sensors_readLight();			//Data Read
+ }
  void modules_geiger()
+ {
 	// No data gatering function needed for geiger daughter board
 		// This is taken care of in interrupt (See geiger.c)
+ }
  void modules_cameras()
+ {
 	// Gathers data and performs functions for cameras daughter board
+ }
   ///////////do I need to change .h file?
   void setup_pressure()
+  {
 	  int16_t ac1 = i2c_read(PRESSURE_ADDR, 0xAA);
 	  ac1 = ac1 << 8;
 	  ac1 = ac1 | i2c_read(PRESSURE_ADDR, 0xAB);
 	  int16_t ac2 = i2c_read(PRESSURE_ADDR, 0xAC);
 	  ac2 = ac2 << 8;

slave/slave/slave.c

➞

Show inline comments

@@ @@ -68,48 +68,49 @@ int main(void) @@
     while(1)
+    {
 		// Master communication
 		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(2);		// Delay to prevent the sensor loop from running again before time_millis changes
 			led_off(0);
 			led_off(2);
+		}
+    }
 	return 0;
+}
 		/********Examples of data reading and getting******************
 		x = geiger_getCpm();				//Data get
 		x = sensors_getSpiTemp();			//Data get
 		x = sensors_getBoardTemp();			//Data get
 		sensors_readSpiTemp();				//Data Read
 		sensors_readBoardTemp();			//Data Read
 		led_output(0xFF);					//Output value to LED array
 		i2c_write(RTC_ADDR, 0x05, 0x3A);	//i2c Write Example
 		PORTA &= ~(1 << PA1);	//OFF
 		PORTA |= (1 << PA1);	//ON

0 comments (0 inline, 0 general)