From ef3df16126e6bfb8251dab00f54c484d31ff0322 Mon Sep 17 00:00:00 2001
From: Richard Meadows <richardeoin@gmail.com>
Date: Thu, 4 Aug 2016 12:16:06 +0100
Subject: [PATCH] [ubseds_emf] next flight hw

---
 firmware/config.mk                       | 2 +-
 firmware/inc/hw_config/main-solar-only.h | 9 +++++++--
 firmware/src/sequencer.c                 | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/firmware/config.mk b/firmware/config.mk
index ed92d2b..5cd2f9b 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -28,7 +28,7 @@ PROJECT_NAME		:= pico
 
 # The exact chip being built for.
 #
-TARGET_CHIP		:= SAMD20E17
+TARGET_CHIP		:= SAMD20E18
 
 # Compiliation Flags
 #
diff --git a/firmware/inc/hw_config/main-solar-only.h b/firmware/inc/hw_config/main-solar-only.h
index 53683b7..fd77135 100644
--- a/firmware/inc/hw_config/main-solar-only.h
+++ b/firmware/inc/hw_config/main-solar-only.h
@@ -129,7 +129,7 @@
 /**
  * Radio
  */
-#define SI4xxx_RADIO_PN		0x4467
+#define SI4xxx_RADIO_PN		0x4468
 #define SI4xxx_SERCOM		(SercomSpi*)SERCOM3
 #define SI4xxx_SERCOM_MOSI_PIN	PIN_PA19
 #define SI4xxx_SERCOM_MOSI_PINMUX PINMUX_PA19D_SERCOM3_PAD3
@@ -182,7 +182,7 @@
  * Telemetry
  */
 #define TELEMETRY_ENABLE		1
-#define TELEMETRY_USE_GEOFENCE	0
+#define TELEMETRY_USE_GEOFENCE	1
 #define TELEMETRY_FREQUENCY		434612500
 #define TELEMETRY_POWER			RF_POWER_8dBm
 
@@ -198,6 +198,11 @@
  */
 #define BACKLOG_RECORD_BACKLOG	1
 
+/**
+ * Prefix
+ */
+#define GEOFENCE_USE_PREFIX	1
+
 /**
  * Watchdog Timer
  *
diff --git a/firmware/src/sequencer.c b/firmware/src/sequencer.c
index 4d2e6ca..2e1df21 100644
--- a/firmware/src/sequencer.c
+++ b/firmware/src/sequencer.c
@@ -80,8 +80,8 @@ void telemetry_sequence(struct tracker_datapoint* dp, uint32_t n)
 #endif  /* TELEMETRY_ENABLE */
 
 
-  /* CEASE APRS AT THE END OF 2016 */
-  if (dp->time.year > 2016) { return; }
+  /* CEASE APRS AT THE END OF 2018 */
+  if (dp->time.year > 2018) { return; }
 
   /* APRS */
 #if APRS_ENABLE