seniordesign-firmware Changeset - 911461738d90

Changeset - 911461738d90

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-01-18 15:43:21
ethanzonca@CL-ENS241-08.cedarville.edu

Added heater support to master

3 files changed with 9 insertions and 0 deletions:

master/master/config.h

master/master/master.c

master/master/master.cproj

0 comments (0 inline, 0 general)

master/master/config.h

➞

Show inline comments

 /*
  * Master Firmware: Configuration
+ *
  * Wireless Observational Modular Aerial Network
+ *
  * Ethan Zonca
  * Matthew Kanning
  * Kyle Ripperger
  * Matthew Kroening
+ *
  */
 #ifndef CONFIG_H_
 #define CONFIG_H_
 // --------------------------------------------------------------------------
 // Module config (master.c)
 // --------------------------------------------------------------------------
 #define F_CPU 11059200
 #define MODULE_ID '1'
 #define BOARDTEMP_ADDR 0x90
 #define HEATER_THRESHOLD 70
 // --------------------------------------------------------------------------
 // Error Codes config (led.c, used throughout code)
 // --------------------------------------------------------------------------
 // SD Card
 #define ERROR_SD_INIT 2
 #define ERROR_SD_PARTITION 3
 #define ERROR_SD_FILE 4
 #define ERROR_XBEETIMEOUT 5
 #define ERROR_NOXBEE 6
 #define ERROR_CRAP 15
 // --------------------------------------------------------------------------
 // Slave Sensors config (slavesensors.c)
 // --------------------------------------------------------------------------
 // NOT USED. Could integrate into slavesensors.c setup function for configurability eventually.
 // Currently manual configuration of sensors is done in slavesensors.c
 #define SLAVE0_SENSORS BOARDTEMP
 #define SLAVE1_SENSORS BOARDTEMP | HUMIDITY | TEMPERATURE | PRESSURE | AMBIENTLIGHT
 #define SLAVE2_SENSORS BOARDTEMP | GEIGER
 #define SLAVE3_SENSORS BOARDTEMP | CAMERA

master/master/master.c

➞

Show inline comments

@@ @@ -103,48 +103,49 @@ int main(void) @@
 			led_off(LED_ACT0);
+		}
 		ctr = (ctr + 1) % 4;
+	}
 	serial1_ioff();
 	while(1)
+    {
 		// Periodic: LED execution indicator
 		if(time_millis() - lastLedCycle > LEDCYCLE_RATE) {
 			spin();
 			if(!afsk_busy())
 				serial1_ion();
 			lastLedCycle = time_millis();
+		}
 		// Periodic: Logging
 		if(time_millis() - lastLog > LOGGER_RATE)
+		{
 			led_on(LED_CYCLE);
 			heater_regulateTemp();
 			// Print out GPS debug
 			//snprintf(debugBuf, 128, "GPS> time: %s lat: %s lon: %s speed: %s hdop: %s course: %s\r\n",
 			//get_timestamp(),get_latitude(),get_longitude(),get_speedKnots(),get_hdop(), get_course());
 			//serial0_sendString(debugBuf);
 			// Turn on sideboard LED if we have a fix
 			if(strcmp("99.99", get_hdop()) == 0) {
 				led_off(LED_SIDEBOARD);
+			}
 			else {
 				led_on(LED_SIDEBOARD);
+			}
 			sensors_readBoardTemp(); // i2c read, 400k
 			snprintf(logbuf, 128, "%lu,%d,%u,%s,%s,%s,%s,%s\r\n", time_millis(), sensors_getBoardTemp(),get_timestamp(),get_latitude(),get_longitude(),get_speedKnots(),get_hdop(), get_course());
 			logger_log(logbuf);
 			// Print out logger debug
 			serial0_sendString("LOG> ");
 			serial0_sendString(logbuf);
 			led_off(LED_CYCLE);
 			lastLog = time_millis();

master/master/master.cproj

➞

Show inline comments

@@ @@ -117,48 +117,54 @@ @@
     <Compile Include="lib\afsk.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\afsk.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\aprs.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\aprs.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\ax25.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\ax25.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\boardtemp.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\boardtemp.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\heater.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\heater.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\i2c.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\i2c.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\led.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\led.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\logger.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\logger.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\looptime.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\looptime.h">
       <SubType>compile</SubType>
     </Compile>

0 comments (0 inline, 0 general)