seniordesign-firmware Changeset - e3854a3907c2

Changeset - e3854a3907c2

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-02-15 14:16:56
kripperger@CL-SEC241-09.cedarville.edu

Seup up sensor data to masterComms

3 files changed with 9 insertions and 9 deletions:

slave/slave/lib/masterComm.c

slave/slave/modules.c

slave/slave/slave.c

0 comments (0 inline, 0 general)

slave/slave/lib/masterComm.c

➞

Show inline comments

 /*
  * masterComm.c
+ *
  * Created: 1/22/2013 3:40:53 PM
  *  Author: kripperger
  */
 #include <avr/io.h>
 #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)
+{
 	char sum = 0;
 	while(*stringPtr != 0x00)
+	{
 		sum += *stringPtr;
 		stringPtr++;
+	}
 	return sum;
+}
 void masterComm_types()
+{
 	switch(io_getModuleId())
+	{
 		case 0:
 			// Generic
 			dataTypes = DATATYPES_GENERIC;
 			break;
 		case 1:
 			// 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_packetSend_unsigned(uint8_t id, uint32_t data)
+{
 	serial0_sendChar('[');
 	snprintf(buff2,64,"%u%lu",id,data);
 	serial0_sendString(buff2);
 	serial0_sendChar(']');
 	serial0_sendChar(masterComm_checksum(buff2));
+}
 void masterComm_packetSend_signed(uint8_t id, int32_t data)
+{
 	serial0_sendChar('[');
 	snprintf(buff2,64,"%u%ld",id,data);
 	serial0_sendString(buff2);
 	serial0_sendChar(']');
 	serial0_sendChar(masterComm_checksum(buff2));
+}
 void masterComm_modules()
+{
 	// Send Board Temperature (Common for all modules)
 	masterComm_packetSend_signed(0,sensors_getBoardTemp());
 	// Send Heater Status (Common for all modules)
-	masterComm_packetSend_unsigned(1,/*Heater Status Get Function Here */0);
+	masterComm_packetSend_unsigned(1,io_heaterStatus());
 	// Send Battery Level (Common for all modules)
-	masterComm_packetSend_unsigned(2,/*Battery Level Get Function Here */0);
+	masterComm_packetSend_unsigned(2,/*Battery Level Get Function Here */999);
 	// Send module specific sensor readings
 	switch(io_getModuleId())
+	{
 		case 0:
 			// Generic
 			break;
 		case 1:
 			// Sensors
 			// Send SPI Temperature (Air)
 			masterComm_packetSend_unsigned(3,sensors_getSpiTemp());
 			// Send Ambient Light (Needs to be formatted)
-			masterComm_packetSend_unsigned(4,/*Ambient Light Get Function Here */44);
+			masterComm_packetSend_unsigned(4,sensors_getLux());
 			// Send Humidity
-			masterComm_packetSend_unsigned(5,/*Humidity Get Function Here */55);
+			masterComm_packetSend_unsigned(5,/*Humidity Get Function Here */999);
 			// Send Pressure
-			masterComm_packetSend_unsigned(6,/*Pressure Get Function Here */66);
+			masterComm_packetSend_unsigned(6,sensors_getPressure());
 			// Send Altitude
-			masterComm_packetSend_unsigned(7,/*Altitude Get Function Here */77);
+			masterComm_packetSend_unsigned(7,sensors_getAltitude());
 			break;
 		case 2:
 			// Geiger
 			// Send CPM (radiation)
 			masterComm_packetSend_unsigned(8,geiger_getCpm());
 			break;
 		case 3:
 			// Camera
 			break;
 		default:
 			break;
+	}
+}
 void masterComm_send()
+{
 	masterComm_types();		// Calculates how many data types to send
 	// 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_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);
+		}
+	}
+}

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;
+	}
+ }
  void modules_run(uint8_t id)
+ {
 	switch(id)
+	{
 		case 0:
 			modules_generic();
 			break;
 		case 1:
 			modules_sensors();
 			break;
 		case 2:
 			modules_geiger();
 			break;
 		case 3:
 			modules_cameras();
 			break;
 		default:
 			modules_generic();
 			break;
+	}
+ }
  void modules_generic_setup()
+ {
+ }
  void modules_sensors_setup()
+ {
 	DESELECT_TEMP;
 	setup_spi();
 	sensors_setupPressure();
+ }
  void modules_geiger_setup()
+ {
 	// Pin setup
 	DDRA &= ~(1 << DDA0);	// PA0 is an input
 	// Setup for interrupt input on PA0 (PCINT0)
 	PCMSK0 |= (1 << PCINT0);	// Enable interrupt for PA0
 	PCICR |= (1 << PCIE0);		// Enable ioc section PCIF0
 	// Setup for interrupt from Timer2
 	ASSR &= ~(1 << EXCLK);	// Disable external clock input (enabling crystal use)
 	ASSR |= (1 << AS2);		// Enable timer2 async mode with an external crystal
 	_delay_ms(250);			// Let external 32KHz crystal stabilize
 	TCCR2B = 0x05;			// Set the prescaler to 128: 32.768kHz / 128 = 1Hz overflow
 	TIFR2 = 0x01;			// Reset timer2 overflow interrupt flag
 	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_readHumid();			//Data Read
 	sensors_readLux();				//Data Read
 	sensors_readBatt();
+	sensors_readBatt();				//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
+ }
@@ \ No newline at end of file @@

slave/slave/slave.c

➞

Show inline comments

 /*
  * Slave Firmware
+ *
  * Wireless Observational Modular Aerial Network
+ *
  * Kyle Ripperger
  * Ethan Zonca
  * Matthew Kanning
  * Matthew Kroening
+ *
  */
 #include "config.h"
 #include <stdio.h>
 #include <inttypes.h>
 #include <avr/io.h>
 #include <compat/twi.h>
 #include <util/delay.h>
 #include <avr/cpufunc.h>
 #include <avr/interrupt.h>
 #include "modules.h"
 #include "lib/serial.h"
 #include "lib/serparser.h"
 #include "lib/led.h"
 #include "lib/inputOutput.h"
 #include "lib/i2c.h"
 #include "lib/spi.h"
 #include "lib/geiger.h"
 #include "lib/sensors.h"
 #include "lib/cameras.h"
 #include "lib/loopTimer.h"
 #include "lib/masterComm.h"
 void micro_setup()
+{
 	// Generic microcontroller config options
 	sei();	// Enable interrupts
+}
 int main(void)
+{
 	// Initialize
 	micro_setup();			// Generic microcontroller config options
 	time_setup();			// Setup loop timer and interrupts (TIMER0)
 	led_configure();		// Configure ports and registers for LED operation
 	io_configure();			// Configure IO ports and registers
 	i2c_init();				// Setup I2C
 	serial0_setup();		// Config serial port
 	io_readModuleId();
 	modules_setup(io_getModuleId());				// Run setup functions for specific module
 	//uint8_t test;		//Debug
 	//uint8_t test2;	//Debug
 	// Serial output //DEBUG
 	char buff[128];							//Buffer for serial output //DEBUG
 	serial0_sendString("Starting Slave\r\n");
     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,128,"|ModuleID: %u |BoardTemp: %i |Millis: %lu |Lux: %lu |Pressure: %lu |Altitude: %lu \r\n",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getLux(),sensors_getPressure(),sensors_getAltitude()); //DEBUG
+			snprintf(buff,128,"|ModuleID: %u |BoardTemp: %i |Heater: %u |Millis: %lu |Lux: %lu |Pressure: %lu |Altitude: %lu \r\n",io_getModuleId(),sensors_getBoardTemp(),io_heaterStatus(),time_millis(),sensors_getLux(),sensors_getPressure(),sensors_getAltitude()); //DEBUG
 			serial0_sendString(buff); //DEBUG
 			_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
 		PORTB ^= (1 << PB0);	//Toggle
 		sprintf(buff, "log: %u,%u,%u,%u\r\n", temp,temp2,temp3,temp4);
 		serial0_sendString(buff);
 		**************************************************************/
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)