# HG changeset patch
# User kripperger@CL-SEC241-09.cedarville.edu
# Date 2013-04-03 17:05:14
# Node ID 231d04aebb09d28f111d1af0a951aa2dec8deff5
# Parent  bff9c47f83da25b67f0f10b495622ffe3f19a06d
# Parent  9c8ca2112fb4b1758c07b4184c6d9891542bf632

Merge

diff --git a/master/master/config.h b/master/master/config.h
--- a/master/master/config.h
+++ b/master/master/config.h
@@ -32,10 +32,10 @@
 
 // Blackout (turn off all but power LEDs)
 #define BLACKOUT_ENABLE
-#define BLACKOUT_TIMEOUT 300000 // Blackout after 5 minutes (hopefully after fix)
+#define BLACKOUT_TIMEOUT 1200000 // Blackout after 20 minutes (hopefully after fix and launch)
 
 // Board heater setpoint
-#define HEATER_THRESHOLD 5 // Regulate to 5 degrees celsius
+#define HEATER_THRESHOLD 5 // Regulate to 5 degrees Celsius
 
 // Touchdown buzzer
 #define BUZZER_RATE 5000
@@ -136,7 +136,7 @@
 // - Home:       0
 // - IGate:      5
 #define S_CALLSIGN      "KD8TDF"
-#define S_CALLSIGN_ID   9 // 11
+#define S_CALLSIGN_ID   11
 
 // Destination callsign: APRS (with SSID=0) is usually okay.
 #define D_CALLSIGN      "APRS"
@@ -150,7 +150,7 @@
 #define DIGI_PATH1_TTL  1
 
 // Transmit the APRS sentence every X milliseconds
-#define APRS_TRANSMIT_PERIOD 20000
+#define APRS_TRANSMIT_PERIOD 35000
 
 
 // --------------------------------------------------------------------------