seniordesign-firmware Changeset - c20bdd0c7746

Changeset - c20bdd0c7746

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-03-26 17:03:10
ethanzonca@CL-ENS241-08.cedarville.edu

Enable blackout, change heater thresh to reasonable level, tweak failsafe and minduration triggers for buzzer, add humidity data to APRS message

3 files changed with 14 insertions and 7 deletions:

master/master/config.h

master/master/lib/sensordata.c

master/master/master.c

0 comments (0 inline, 0 general)

master/master/config.h

➞

Show inline comments

@@ @@ -10,60 +10,60 @@ @@
+ *
  */
 #ifndef CONFIG_H_
 #define CONFIG_H_
 #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_ENABLE
 #define BLACKOUT_TIMEOUT 300000 // Blackout after 5 minutes (hopefully after fix)
 // Board heater setpoint
-#define HEATER_THRESHOLD 80
+#define HEATER_THRESHOLD 5 // Regulate to 5 degrees celsius
 // Touchdown buzzer
 #define BUZZER_RATE 5000
 #define BUZZER_DURATION 1000
 #define BUZZER_FAILSAFE_DURATION 600000
 #define BUZZER_TRIGGER_MINDURATION 1
 #define BUZZER_TRIGGER_MAXALTITUDE 1
 #define BUZZER_FAILSAFE_DURATION  12600000 // 3.5hr
 #define BUZZER_TRIGGER_MINDURATION 3600000 // 1 hour
 #define BUZZER_TRIGGER_MAXALTITUDE 180
 // --------------------------------------------------------------------------
 // Error Codes config (logger.c)
 // --------------------------------------------------------------------------
 // SD Card
 #define ERROR_SLAVETIMEOUT 0
 #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
 #define ERROR_WATCHDOG 9
 // !!! Please specify/update detailed messages for these error codes in logger.c
 // --------------------------------------------------------------------------
 // Slave Sensors config (slavesensors.c)
 // --------------------------------------------------------------------------
 // Slave data structure size
 #define MAX_NUM_SLAVES 5	// Maximum number of nodes in the system
@@ @@ -143,34 +143,34 @@ @@
 #define D_CALLSIGN_ID   0
 // Digipeating paths:
 // (read more about digipeating paths here: http://wa8lmf.net/DigiPaths/ )
 // The recommended digi path for a balloon is WIDE2-1 or pathless. The default
 // is pathless. Uncomment the following two lines for WIDE2-1 path:
 #define DIGI_PATH1      "WIDE2"
 #define DIGI_PATH1_TTL  1
 // Transmit the APRS sentence every X milliseconds
 #define APRS_TRANSMIT_PERIOD 20000
 // --------------------------------------------------------------------------
 // Logger config (logger.c)
 // --------------------------------------------------------------------------
 // Log number EEPROM address (this number is incremented on boot, used for filenames)
 #define LOGGER_ID_EEPROM_ADDR 0x10
 // Watchdog save/restore of program timer
 #define WATCHDOG_PROGTIMER_EEPROM_ADDR 0x20
 // Written to the beginning of every log file
-#define LOGGER_HEADERTEXT "HAB Control Master - 1.0\n"
+#define LOGGER_HEADERTEXT "HAB Control Master - 1.1\n"
 // Log to SD card every X milliseconds
 #define LOGGER_RATE 1000
 // LED cycle indicator speed
 #define LEDCYCLE_RATE 100
 #endif /* CONFIG_H_ */
@@ \ No newline at end of file @@

master/master/lib/sensordata.c

➞

Show inline comments

@@ @@ -82,48 +82,55 @@ char* slavesensors_getAPRScomment(char* @@
 				uint16_t len = strlen(commentBuffer);
 				snprintf(commentBuffer + len, bufferSize-len, "~t%u%li",i,val);
+			}
 			// Battery voltages (all slaves)
 			val = sensordata_get(i, SENSOR_BATTERYLEVEL);
 			if(val != -2111111111) {
 				uint16_t len = strlen(commentBuffer);
 				snprintf(commentBuffer + len, bufferSize-len, "~l%u%li",i,val);
+			}
 			// Pressure
 			val = sensordata_get(i, SENSOR_PRESSURE);
 			if(val != -2111111111) {
 				uint16_t len = strlen(commentBuffer);
 				snprintf(commentBuffer + len, bufferSize-len, "~P%li",val);
+			}
 			// Air Temperature
 			val = sensordata_get(i, SENSOR_AIRTEMP);
 			if(val != -2111111111) {
 				uint16_t len = strlen(commentBuffer);
 				snprintf(commentBuffer + len, bufferSize-len, "~C%li",val);
+			}
 			// Humidity
 			val = sensordata_get(i, SENSOR_HUMIDITY);
 			if(val != -2111111111) {
 				uint16_t len = strlen(commentBuffer);
 				snprintf(commentBuffer + len, bufferSize-len, "~H%li",val);
+			}
 			// Altitude
 			val = sensordata_get(i, SENSOR_ALTITUDE);
 			if(val != -2111111111) {
 				uint16_t len = strlen(commentBuffer);
 				snprintf(commentBuffer + len, bufferSize-len, "~A%li",val);
+			}
 			// Radiation
 			val = sensordata_get(i, SENSOR_CPM_RADIATION);
 			if(val != -2111111111) {
 				uint16_t len = strlen(commentBuffer);
 				snprintf(commentBuffer + len, bufferSize-len, "~R%li",val);
+			}
+		}
 		if(logger_aprsInfoTextAvailable())
+		{
 			uint16_t len = strlen(commentBuffer);
 			snprintf(commentBuffer + len, bufferSize-len, "~%s",logger_getAprsInfoText());
 			logger_aprsInfoTextConsumed();
+		}

master/master/master.c

➞

Show inline comments

@@ @@ -109,49 +109,49 @@ int main(void) @@
 			sensors_readBoardTemp();
 			sensors_readBatt();
 			//char buftmp[15];
 			//snprintf(buftmp, 15, "vbatt: %u\r\n", sensors_getBatt());
 			//serial0_sendString(buftmp);
 			// Write CSV header and log data values
 			sensordata_logvalues();
 			led_off(LED_CYCLE);
 			lastLog = time_millis();
+		}
 		// Periodic: Buzzer
 		if(time_millis() - lastBuzz > BUZZER_RATE) {
 			if(sensordata_isTouchdown())
+			{
 				led_on(LED_BUZZ);
 				lastBuzzOn = time_millis();
 				buzz = true;
+			}
 			lastBuzz = time_millis();
+		}
+		>
 		if(buzz && time_millis() - lastBuzzOn > BUZZER_DURATION) {
 			led_off(LED_BUZZ);
 			buzz = false;
+		}
 		// Periodic: Data Request
 		if(time_millis() - lastDataReq > DATAREQUEST_RATE)
+		{
 			// Start getting values for next transmission
 			if(slavesensors_isrequesting())
+			{
 				// This probably is a non-issue
 				//error_log_msg(ERROR_FATAL, false, "Still requesting on following loop");
+			}
 			else
+			{
 				slavesensors_startprocess();
+			}
 			lastDataReq = time_millis();
+		}
 		// Periodic: APRS transmission

0 comments (0 inline, 0 general)