Changeset - a5d9aa0655fc
Parent rev.
Child rev.
[Not reviewed]
default
2 10 0
ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-03-14 16:48:00
ethanzonca@CL-ENS241-08.cedarville.edu
Added battery voltage, documentation, refactoring, etc.
12 files changed with 62 insertions and 91 deletions:
master/master/config.h
27
20
master/master/lib/boardtemp.c
29
master/master/lib/boardtemp.h
15
master/master/lib/heater.c
1
1
master/master/lib/led.c
5
master/master/lib/led.h
2
master/master/lib/logger.c
1
4
master/master/lib/sdcard/sd_raw.c
7
2
master/master/lib/sensordata.c
3
3
master/master/lib/watchdog.c
7
master/master/master.c
12
6
master/master/master.cproj
4
4
0 comments (0 inline, 0 general)
master/master/config.h
➞
Show inline comments
 
@@ -16,29 +16,36 @@
 
#include <avr/pgmspace.h>
 
 
// --------------------------------------------------------------------------
 
// Hardware settings
 
// --------------------------------------------------------------------------
 
 
#define F_CPU 11059200
 
#define BOARDTEMP_ADDR 0x90
 
 
 
// --------------------------------------------------------------------------
 
// Module config (master.c)
 
// --------------------------------------------------------------------------
 
 
// Debug Output
 
//#define DEBUG_OUTPUT
 
 
// Blackout (turn off all but power LEDs)
 
#define BLACKOUT_ENABLE
 
#define BLACKOUT_TIMEOUT 300000 // Blackout after 5 minutes (hopefully after fix)
 
 
#define F_CPU 11059200
 
#define MODULE_ID '1'
 
#define BOARDTEMP_ADDR 0x90
 
 
// Board heater setpoint
 
#define HEATER_THRESHOLD 60
 
 
// Touchdown buzzer settings
 
// Touchdown buzzer
 
#define BUZZER_RATE 3000
 
#define BUZZER_DURATION 1
 
 
#define BUZZER_FAILSAFE_DURATION 600000
 
#define BUZZER_TRIGGER_MINDURATION 1
 
#define BUZZER_TRIGGER_MAXALTITUDE 1
 
 
// --------------------------------------------------------------------------
 
// Error Codes config (led.c, used throughout code)
 
// Error Codes config (logger.c)
 
// --------------------------------------------------------------------------
 
 
// SD Card
 
@@ -46,29 +53,25 @@
 
#define ERROR_SD_INIT 1
 
#define ERROR_SD_PARTITION 2
 
#define ERROR_SD_FILE 3
 
 
#define ERROR_XBEETIMEOUT 4
 
 
 
#define ERROR_FATAL 5
 
 
#define ERROR_ATFAIL 6
 
#define ERROR_EXITAT 7
 
 
#define ERROR_INFOTEXT 8
 
 
// !!! Please specify detailed messages for these error codes in logger.c
 
// !!! Please specify/update detailed messages for these error codes in logger.c
 
 
// --------------------------------------------------------------------------
 
// Slave Sensors config (slavesensors.c)
 
// --------------------------------------------------------------------------
 
 
#define MAX_NUM_SLAVES 5  // Maximum number of nodes in the system
 
#define MAX_NUM_SENSORS 10 // Maximum number of unique types of sensors in the system
 
// Slave data structure size
 
#define MAX_NUM_SLAVES 5	// Maximum number of nodes in the system
 
#define MAX_NUM_SENSORS 10	// Maximum number of unique types of sensors in the system
 
 
// Node identifier of log destination xbee
 
#define XBEE_LOGDEST_NAME "HAB-LOGGER"
 
 
// Rate to request data from slaves. Must be greater than AT delay * number slaves
 
#define DATAREQUEST_RATE 3000
 
 
// Timeouts
 
@@ -77,9 +80,10 @@
 
#define TIMEOUT_EXITAT 2000
 
#define TIMEOUT_XBEERESPONSE 2000
 
 
// Retries
 
// Slave data request max retries (for retry upon corrupt data reception)
 
#define MAX_SLAVEREQUEST_RETRIES 2
 
 
 
// --------------------------------------------------------------------------
 
// Command Parser config (serparser.c)
 
// --------------------------------------------------------------------------
 
@@ -90,19 +94,20 @@
 
// Circular serial buffer size. Must be at least MAX_CMD_LEN + 5
 
#define BUFFER_SIZE 128
 
 
// Public broadcast address
 
#define BROADCAST_ADDR 0
 
 
 
// --------------------------------------------------------------------------
 
// GPS config (xxx.c)
 
// --------------------------------------------------------------------------
 
 
// NMEA circular buffer size. Must be large enough to hold all received sentences
 
#define NMEABUFFER_SIZE 150
 
 

			




	
	
	
		
 
// --------------------------------------------------------------------------

			




	
	
	
		
 
// USART config (serial.c)

			




	
	
	
		
 
// --------------------------------------------------------------------------

			




	
	
	
		
 

			




	
	
	
		
 
// Baud rates for XBEE and GPS serial ports

			




	
	
	
		
 
#define USART0_BAUDRATE 115200

			




	
	
	
		
 
#define USART1_BAUDRATE 115200

			




	
	
	
		
 

			




	
	
		
 
@@ -151,6 +156,7 @@

			




	
	
	
		
 
// Logger config (logger.c)

			




	
	
	
		
 
// --------------------------------------------------------------------------

			




	
	
	
		
 

			




	
	
	
		
 
// Log number EEPROM address (this number is incremented on boot, used for filenames)

			




	
	
	
		
 
#define LOGGER_ID_EEPROM_ADDR 0x10

			




	
	
	
		
 

			




	
	
	
		
 
// Written to the beginning of every log file

			




	
	
		
 
@@ -162,4 +168,5 @@

			




	
	
	
		
 
// LED cycle indicator speed

			




	
	
	
		
 
#define LEDCYCLE_RATE 100 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
#endif /* CONFIG_H_ */

			




	
	
		
 
\ No newline at end of file

			




        

    


    
    

    

        

                

                    master/master/lib/boardtemp.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
deleted file

			




        

    


    
    

    

        

                

                    master/master/lib/boardtemp.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
deleted file

			




        

    


    
    

    

        

                

                    master/master/lib/heater.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -12,7 +12,7 @@

			




	
	
	
		
 

			




	
	
	
		
 
#include "../config.h"

			




	
	
	
		
 
#include "led.h"

			




	
	
	
		
 
#include "boardtemp.h"

			




	
	
	
		
 
#include "sensors.h"

			




	
	
	
		
 
 

			




	
	
	
		
 
 void heater_regulateTemp()

			




	
	
	
		
 
 {

			




        

    


    
    

    

        

                

                    master/master/lib/led.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -79,6 +79,11 @@ void led_blackout() {

			




	
	
	
		
 
	}	

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool led_isBlackout() 

			




	
	
	
		
 
{

			




	
	
	
		
 
	return blackout;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
// Flashes error LED a set amount of times, then leaves it on

			




	
	
	
		
 
void led_errorcode(uint8_t code) 

			




	
	
	
		
 
{

			




        

    


    
    

    

        

                

                    master/master/lib/led.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -15,6 +15,7 @@

			




	
	
	
		
 
#define LED_H_

			




	
	
	
		
 

			




	
	
	
		
 
#include <avr/io.h>

			




	
	
	
		
 
#include <stdbool.h>

			




	
	
	
		
 

			




	
	
	
		
 
enum leds {

			




	
	
	
		
 
	LED_ACT0 = 0,

			




	
	
		
 
@@ -61,6 +62,7 @@ void led_on(uint8_t led);

			




	
	
	
		
 
void led_off(uint8_t led);

			




	
	
	
		
 
void led_toggle(uint8_t led);

			




	
	
	
		
 
void led_blackout();

			




	
	
	
		
 
bool led_isBlackout();

			




	
	
	
		
 
void led_errorcode(uint8_t code);

			




	
	
	
		
 
void led_spin();

			




	
	
	
		
 
void led_alert();

			




        

    


    
    

    

        

                

                    master/master/lib/logger.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -71,10 +71,7 @@ void logger_setup()

			




	
	
	
		
 
		error_log(ERROR_SD_INIT, true);

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	// TODO: Check SD card switch to see if inserted.

			




	
	
	
		
 
	// this was included in the library, but is commented out right now

			




	
	
	
		
 
	

			




	
	
	
		
 
		

			




	
	
	
		
 
	// Open first partition

			




	
	
	
		
 
	partition = partition_open(sd_raw_read, sd_raw_read_interval, sd_raw_write, sd_raw_write_interval, 0);

			




	
	
	
		
 
	

			




        

    


    
    

    

        

                

                    master/master/lib/sdcard/sd_raw.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -12,6 +12,8 @@

			




	
	
	
		
 
#include <avr/io.h>

			




	
	
	
		
 
#include "sd_raw.h"

			




	
	
	
		
 
#include "sd_raw_config.h"

			




	
	
	
		
 
#include "../led.h"

			




	
	
	
		
 
#include <avr/delay.h>

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * \addtogroup sd_raw MMC/SD/SDHC card raw access

			




	
	
		
 
@@ -319,6 +321,8 @@ uint8_t sd_raw_init()

			




	
	
	
		
 
    SPCR &= ~((1 << SPR1) | (1 << SPR0)); /* Clock Frequency: f_OSC / 4 */

			




	
	
	
		
 
    SPSR |= (1 << SPI2X); /* Doubled Clock Frequency: f_OSC / 2 */

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
#if !SD_RAW_SAVE_RAM

			




	
	
	
		
 
    /* the first block is likely to be accessed first, so precache it here */

			




	
	
	
		
 
    raw_block_address = (offset_t) -1;

			




	
	
		
 
@@ -327,9 +331,10 @@ uint8_t sd_raw_init()

			




	
	
	
		
 
#endif

			




	
	
	
		
 
    if(!sd_raw_read(0, raw_block, sizeof(raw_block))) {

			




	
	
	
		
 
		return 0;

			




	
	
	
		
 
	}		

			




	
	
	
		
 
	}

			




	
	
	
		
 
	

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
			

			




	
	
	
		
 
    return 1;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    master/master/lib/sensordata.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -16,7 +16,7 @@

			




	
	
	
		
 
#include <string.h>

			




	
	
	
		
 
#include "sensordata.h"

			




	
	
	
		
 
#include "slavesensors.h"

			




	
	
	
		
 
#include "boardtemp.h"

			




	
	
	
		
 
#include "sensors.h"

			




	
	
	
		
 
#include "looptime.h"

			




	
	
	
		
 
#include "gps.h"

			




	
	
	
		
 
#include "logger.h"

			




	
	
		
 
@@ -150,7 +150,7 @@ void sensordata_logvalues()

			




	
	
	
		
 
			csvHeader[0] = 0x00;

			




	
	
	
		
 
			

			




	
	
	
		
 
			// Add master data headers

			




	
	
	
		
 
			logger_log("Time,BoardTemp,GPSTime,GPSLat,GPSLon,GPSSpeed,GPSHDOP,GPSCourse,GPSSV,");

			




	
	
	
		
 
			logger_log("Time,BoardTemp,VBatt,GPSTime,GPSLat,GPSLon,GPSSpeed,GPSHDOP,GPSCourse,GPSSV,");

			




	
	
	
		
 
			

			




	
	
	
		
 
			// Add slave data headers

			




	
	
	
		
 
			for(uint8_t i=0; i<MAX_NUM_SLAVES; i++) 

			




	
	
		
 
@@ -181,7 +181,7 @@ void sensordata_logvalues()

			




	
	
	
		
 
		logbuf[0] = 0x00;

			




	
	
	
		
 
		

			




	
	
	
		
 
		// Write master sensor values

			




	
	
	
		
 
		snprintf(logbuf, CSV_LOGLINE_SIZE, "%lu,%d,%s,%s,%s,%s,%s,%s,%s,", time_millis(), sensors_getBoardTemp(),get_timestamp(),get_latitudeTrimmed(),get_longitudeTrimmed(),get_speedKnots(),get_hdop(), get_course(), get_sv());

			




	
	
	
		
 
		snprintf(logbuf, CSV_LOGLINE_SIZE, "%lu,%d,%u,%s,%s,%s,%s,%s,%s,%s,", time_millis(), sensors_getBoardTemp(), sensors_getBatt(), get_timestamp(),get_latitudeTrimmed(),get_longitudeTrimmed(),get_speedKnots(),get_hdop(), get_course(), get_sv());

			




	
	
	
		
 
		

			




	
	
	
		
 
		// Write slave sensor values

			




	
	
	
		
 
		for(int i=0; i<MAX_NUM_SLAVES; i++) 

			




        

    


    
    

    

        

                

                    master/master/lib/watchdog.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -18,7 +18,6 @@

			




	
	
	
		
 
//initialize watchdog

			




	
	
	
		
 
void watchdog_setup(void)

			




	
	
	
		
 
{

			




	
	
	
		
 
	

			




	
	
	
		
 
	cli();

			




	
	
	
		
 
	wdt_reset();

			




	
	
	
		
 
	// Set change enable bit, enable the WDT

			




	
	
		
 
@@ -27,9 +26,3 @@ void watchdog_setup(void)

			




	
	
	
		
 
	WDTCSR = (1<<WDE)|(1<<WDP3)|(1<<WDP0);

			




	
	
	
		
 
	sei();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
// ISR for watchdog timeout. Not currently used, interrupt is disabled.

			




	
	
	
		
 
ISR(WDT_vect)

			




	
	
	
		
 
{

			




	
	
	
		
 
	

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    master/master/master.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -29,7 +29,7 @@

			




	
	
	
		
 
#include "lib/watchdog.h"

			




	
	
	
		
 
#include "lib/gps.h"

			




	
	
	
		
 
#include "lib/i2c.h"

			




	
	
	
		
 
#include "lib/boardtemp.h"

			




	
	
	
		
 
#include "lib/sensors.h"

			




	
	
	
		
 
#include "lib/heater.h"

			




	
	
	
		
 
#include "lib/looptime.h"

			




	
	
	
		
 
#include "lib/slavesensors.h"

			




	
	
		
 
@@ -51,6 +51,7 @@ int main(void)

			




	
	
	
		
 
	i2c_init();

			




	
	
	
		
 
	sensordata_setup(); // must happen before slavesensors/logger/AFSK

			




	
	
	
		
 
	slavesensors_setup();

			




	
	
	
		
 
	sensors_setup();

			




	
	
	
		
 
	logger_setup();

			




	
	
	
		
 
	afsk_setup();

			




	
	
	
		
 
	

			




	
	
		
 
@@ -105,6 +106,7 @@ int main(void)

			




	
	
	
		
 
			}

			




	
	
	
		
 
			

			




	
	
	
		
 
			sensors_readBoardTemp();

			




	
	
	
		
 
			sensors_readBatt();

			




	
	
	
		
 
		

			




	
	
	
		
 
			// Write CSV header and log data values

			




	
	
	
		
 
			sensordata_logvalues();			

			




	
	
		
 
@@ -147,11 +149,6 @@ int main(void)

			




	
	
	
		
 
			// Check for touchdown

			




	
	
	
		
 
			sensordata_checkTouchdown();

			




	
	
	
		
 
			

			




	
	
	
		
 
			// LED blackout

			




	
	
	
		
 
			#ifdef BLACKOUT_ENABLE

			




	
	
	
		
 
			led_blackout();

			




	
	
	
		
 
			#endif

			




	
	
	
		
 
			

			




	
	
	
		
 
			// Ensure we aren't already transmitting

			




	
	
	
		
 
			while(afsk_busy());

			




	
	
	
		
 
			

			




	
	
		
 
@@ -162,6 +159,15 @@ int main(void)

			




	
	
	
		
 
			lastAprsBroadcast = time_millis();

			




	
	
	
		
 
		}			

			




	
	
	
		
 
		

			




	
	
	
		
 
		#ifdef BLACKOUT_ENABLE

			




	
	
	
		
 
		bool black = false;

			




	
	
	
		
 
		if(!black && time_millis() > BLACKOUT_TIMEOUT) 

			




	
	
	
		
 
		{

			




	
	
	
		
 
			// LED blackout

			




	
	
	
		
 
			led_blackout();

			




	
	
	
		
 
			black = true;

			




	
	
	
		
 
		}

			




	
	
	
		
 
		#endif

			




	
	
	
		
 
		

			




	
	
	
		
 
		// Parse any serial data in the XBee software buffer

			




	
	
	
		
 
		parseResult = serparser_parse();

			




        

    


    
    

    

        

                

                    master/master/master.cproj
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -48,7 +48,7 @@

			




	
	
	
		
 
      </OverrideVtorValue>

			




	
	
	
		
 
      <Channel>

			




	
	
	
		
 
        <host>127.0.0.1</host>

			




	
	
	
		
 
        <port>49512</port>

			




	
	
	
		
 
        <port>55130</port>

			




	
	
	
		
 
        <ssl>False</ssl>

			




	
	
	
		
 
      </Channel>

			




	
	
	
		
 
      <ToolOptions>

			




	
	
		
 
@@ -56,7 +56,7 @@

			




	
	
	
		
 
        <InterfaceProperties>

			




	
	
	
		
 
          <JtagDbgClock>249000</JtagDbgClock>

			




	
	
	
		
 
          <JtagProgClock>1000000</JtagProgClock>

			




	
	
	
		
 
          <IspClock>2010000</IspClock>

			




	
	
	
		
 
          <IspClock>1970000</IspClock>

			




	
	
	
		
 
          <JtagInChain>false</JtagInChain>

			




	
	
	
		
 
          <JtagEnableExtResetOnStartSession>false</JtagEnableExtResetOnStartSession>

			




	
	
	
		
 
          <JtagDevicesBefore>0</JtagDevicesBefore>

			




	
	
		
 
@@ -132,10 +132,10 @@

			




	
	
	
		
 
    <Compile Include="lib\ax25.h">

			




	
	
	
		
 
      <SubType>compile</SubType>

			




	
	
	
		
 
    </Compile>

			




	
	
	
		
 
    <Compile Include="lib\boardtemp.c">

			




	
	
	
		
 
    <Compile Include="lib\sensors.c">

			




	
	
	
		
 
      <SubType>compile</SubType>

			




	
	
	
		
 
    </Compile>

			




	
	
	
		
 
    <Compile Include="lib\boardtemp.h">

			




	
	
	
		
 
    <Compile Include="lib\sensors.h">

			




	
	
	
		
 
      <SubType>compile</SubType>

			




	
	
	
		
 
    </Compile>

			




	
	
	
		
 
    <Compile Include="lib\gps.c">

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-26437
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support