From 2524b4d48af3d7f485413d2bc81096b7c6d10ea0 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Thu, 23 Feb 2017 15:39:53 -0800
Subject: [PATCH 01/83] Sync project solution with asf version

Per instructions, ASF version 3.27.3 is utilized.
This sets the project version correctly after fresh download and ASF module sync.
---
 V2X_Firmware/V2X.cproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/V2X_Firmware/V2X.cproj b/V2X_Firmware/V2X.cproj
index 4081a0e..25174da 100644
--- a/V2X_Firmware/V2X.cproj
+++ b/V2X_Firmware/V2X.cproj
@@ -34,6 +34,7 @@
     <option id="common.drivers.nvm" value="Add" config="no_extmem" content-id="Atmel.ASF" />
     <option id="common.services.calendar" value="Add" config="" content-id="Atmel.ASF" />
     <option id="common.services.basic.clock" value="Add" config="" content-id="Atmel.ASF" />
+    <option id="common.services.basic.cpu" value="Add" config="" content-id="Atmel.ASF" />
     <option id="common.services.delay" value="Add" config="" content-id="Atmel.ASF" />
     <option id="common.services.basic.gpio" value="Add" config="" content-id="Atmel.ASF" />
     <option id="common.services.ioport" value="Add" config="" content-id="Atmel.ASF" />
@@ -59,7 +60,6 @@
     <option id="xmega.drivers.usart" value="Add" config="" content-id="Atmel.ASF" />
     <option id="xmega.drivers.wdt" value="Add" config="" content-id="Atmel.ASF" />
     <option id="xmega.services.pwm" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="common.services.basic.cpu" value="Add" config="" content-id="Atmel.ASF" />
     <option id="common.boards.user_board.common" value="Add" config="" content-id="Atmel.ASF" />
   </options>
   <configurations>
@@ -193,7 +193,7 @@
   <documentation help="http://asf.atmel.com/docs/3.27.3/common.applications.user_application.user_board.xmegaau/html/index.html" />
   <offline-documentation help="" />
   <dependencies>
-    <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.27.0" />
+    <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.27.3" />
   </dependencies>
   <project id="common.applications.user_application.user_board.xmegaau" value="Add" config="" content-id="Atmel.ASF" />
   <board id="board.user_board.xmegaau" value="Add" config="" content-id="Atmel.ASF" />

From 6f99e80375ff4da051eca6595be907eb43e895be Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 24 Feb 2017 09:42:23 -0800
Subject: [PATCH 02/83] Ignore tags

Ignore tags added by ctags
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index f95adc8..7e85086 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,5 @@ atmel*.*
 *.png
 
 *.xslt
+
+tags

From caea43419c92edecf44706121ad7a97c3c427d3f Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 24 Feb 2017 14:17:12 -0800
Subject: [PATCH 03/83] Fix header typos, ignore log

Fix header typos from the extra files section to match the provided instructions.
Ignore debug log file.
---
 .gitignore                                    | 2 ++
 V2X_Firmware/src/V2X/extra_files/conf_board.h | 4 ++--
 V2X_Firmware/src/V2X/extra_files/conf_usb.h   | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7e85086..5b0917c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,3 +80,5 @@ atmel*.*
 *.xslt
 
 tags
+
+V2X_Firmware/debug\.log
diff --git a/V2X_Firmware/src/V2X/extra_files/conf_board.h b/V2X_Firmware/src/V2X/extra_files/conf_board.h
index 8460b4b..94cea4c 100644
--- a/V2X_Firmware/src/V2X/extra_files/conf_board.h
+++ b/V2X_Firmware/src/V2X/extra_files/conf_board.h
@@ -1,11 +1,11 @@
 /**
- * \file clock_conf.h
+ * \file conf_board.h
  *
  * \brief Initial firmware for V2X bring up
  *
  * Author: Jesse Banks (jbanks2)
  * 
- * Usage: move this file to src/config/clock_conf.h by replacing the existing file.
+ * Usage: move this file to src/config/conf_board.h by replacing the existing file.
  */
 
 #ifndef CONF_BOARD_H
diff --git a/V2X_Firmware/src/V2X/extra_files/conf_usb.h b/V2X_Firmware/src/V2X/extra_files/conf_usb.h
index 3c33369..c350fe1 100644
--- a/V2X_Firmware/src/V2X/extra_files/conf_usb.h
+++ b/V2X_Firmware/src/V2X/extra_files/conf_usb.h
@@ -1,11 +1,11 @@
 /**
- * \file clock_conf.h
+ * \file conf_usb.h
  *
  * \brief Initial firmware for V2X bring up
  *
  * Author: Jesse Banks (jbanks2)
  * 
- * Usage: move this file to src/config/clock_conf.h by replacing the existing file.
+ * Usage: move this file to src/config/conf_usb.h by replacing the existing file.
  */
 
 #ifndef _CONF_USB_H_

From 77791e18eddd3f62d6201a1584e51e7edc2c0506 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 28 Feb 2017 11:01:44 -0800
Subject: [PATCH 04/83] LED port revision support

Change led ports for revision 2
Each port was moved up one place on the pinout.
---
 V2X_Firmware/src/V2X/V2X_board.h | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index a615705..d5884b5 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -21,14 +21,32 @@ extern "C" {
  * @{
  */
 
+/* Board revision */
+/* #define REV_12 */
+#define REV_20
+
+/* temporary stub for copying later */
+#if REV_12
+#elif REV_20
+#endif
+
 /** Name string macro */
-#define BOARD_NAME                "RVI_V2X_Version_1.2"
+#if REV_12
+#define BOARD_NAME 				  "RVI_V2X_Version_1.2"
+#elif REV_20
+/* REV20: board name change */
+#define BOARD_NAME                "RVI_V2X_Version_2.0"
+#endif
 /** @} */
 
 /** \name LED0 definitions
  *  net: SEQ_LED3 or "PWR" LED
  *  @{ */
+#if REV_12
 #define LED0_PIN                  IOPORT_CREATE_PIN(PORTB, 0)
+#elif REV_20
+#define LED0_PIN                  IOPORT_CREATE_PIN(PORTA, 7)
+#endif
 #define LED0_ACTIVE               true
 #define LED0_INACTIVE             !LED0_ACTIVE
 /** @} */
@@ -36,7 +54,11 @@ extern "C" {
 /** \name LED1 definitions
  *  net: SEQ_LED1 or "M2M" LED
  *  @{ */
+#if REV_12
 #define LED1_PIN                  IOPORT_CREATE_PIN(PORTA, 6)
+#elif REV_20
+#define LED1_PIN                  IOPORT_CREATE_PIN(PORTA, 5)
+#endif
 #define LED1_ACTIVE               true
 #define LED1_INACTIVE             !LED0_ACTIVE
 /** @} */
@@ -44,7 +66,11 @@ extern "C" {
 /** \name LED2 definitions
  *  net: SEQ_LED3 or "GPS" LED
  *  @{ */
+#if REV_12
 #define LED2_PIN                  IOPORT_CREATE_PIN(PORTA, 7)
+#elif REV_20
+#define LED2_PIN                  IOPORT_CREATE_PIN(PORTA, 6)
+#endif
 #define LED2_ACTIVE               true
 #define LED2_INACTIVE             !LED0_ACTIVE
 /** @} */

From 6e49c988025fd17c6d7b1149bf5236d49a1b833e Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Wed, 1 Mar 2017 10:18:16 -0800
Subject: [PATCH 05/83] Explicit ignore of config directory

Ignore config directory from git. Use ASF to manage configuration files.

explanation: though necessary files live in the Config folder, they should be
handled by the Atmel Software Framework Wizard/Explorer tools included
with Atmel Studio, to ensure proper ASF modules have been loaded. Please read
the included "V2X project setup" pdf for instructions on managing ASF modules.
---
 .gitignore | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.gitignore b/.gitignore
index 5b0917c..9373deb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,6 +79,16 @@ atmel*.*
 
 *.xslt
 
+# ctags
 tags
 
+# Project Specific
 V2X_Firmware/debug\.log
+
+# config folder ignored 
+# explanation: though necessary files live in the Config folder, they should be
+# handled by the Atmel Software Framework Wizard/Explorer tools included
+# with Atmel Studio, to ensure proper ASF modules have been loaded. Please read
+# the included "V2X project setup" pdf for instructions on managing ASF modules.
+V2X_Firmware/src/[Cc]onfig/
+

From 7b9baae67d73cb9d9724b6ff6f545b22469771dd Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Wed, 1 Mar 2017 11:45:24 -0800
Subject: [PATCH 06/83] Provide for revision comparison

Improves control of revisions. Versions are considered as constants and so can be compared
instead of just #ifdef or #ifndef
---
 V2X_Firmware/src/V2X/V2X_board.h | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index d5884b5..c2c95c8 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -21,19 +21,17 @@ extern "C" {
  * @{
  */
 
-/* Board revision */
-/* #define REV_12 */
-#define REV_20
+/* Board revision options */
+#define REV_12 		(12)
+#define REV_20		(20)
 
-/* temporary stub for copying later */
-#if REV_12
-#elif REV_20
-#endif
+/* Board revision in use */
+#define V2X_REV		(REV_20)
 
 /** Name string macro */
-#if REV_12
+#if V2X_REV == REV_12
 #define BOARD_NAME 				  "RVI_V2X_Version_1.2"
-#elif REV_20
+#elif V2X_REV >= REV_20
 /* REV20: board name change */
 #define BOARD_NAME                "RVI_V2X_Version_2.0"
 #endif
@@ -42,9 +40,9 @@ extern "C" {
 /** \name LED0 definitions
  *  net: SEQ_LED3 or "PWR" LED
  *  @{ */
-#if REV_12
+#if V2X_REV == REV_12
 #define LED0_PIN                  IOPORT_CREATE_PIN(PORTB, 0)
-#elif REV_20
+#elif V2X_REV >= REV_20
 #define LED0_PIN                  IOPORT_CREATE_PIN(PORTA, 7)
 #endif
 #define LED0_ACTIVE               true
@@ -54,9 +52,9 @@ extern "C" {
 /** \name LED1 definitions
  *  net: SEQ_LED1 or "M2M" LED
  *  @{ */
-#if REV_12
+#if V2X_REV == REV_12
 #define LED1_PIN                  IOPORT_CREATE_PIN(PORTA, 6)
-#elif REV_20
+#elif V2X_REV >= REV_20
 #define LED1_PIN                  IOPORT_CREATE_PIN(PORTA, 5)
 #endif
 #define LED1_ACTIVE               true
@@ -66,9 +64,9 @@ extern "C" {
 /** \name LED2 definitions
  *  net: SEQ_LED3 or "GPS" LED
  *  @{ */
-#if REV_12
+#if V2X_REV == REV_12
 #define LED2_PIN                  IOPORT_CREATE_PIN(PORTA, 7)
-#elif REV_20
+#elif V2X_REV >= REV_20
 #define LED2_PIN                  IOPORT_CREATE_PIN(PORTA, 6)
 #endif
 #define LED2_ACTIVE               true

From e70b7a013dd1f931653ff628a03bf82a3f67cd14 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Thu, 2 Mar 2017 15:48:54 -0800
Subject: [PATCH 07/83] Charge pump revision support

Remove charge pump in revision 2.0
Charge pump is not utilized or required in new revision.
Relegates charge pump usage to previous 1.2 revision.
---
 V2X_Firmware/src/V2X/V2X_board.h | 4 +++-
 V2X_Firmware/src/V2X/V2X_init.c  | 5 +++++
 V2X_Firmware/src/V2X/V2X_led.h   | 2 ++
 V2X_Firmware/src/main.c          | 8 ++++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index c2c95c8..aa0ff7d 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -26,7 +26,7 @@ extern "C" {
 #define REV_20		(20)
 
 /* Board revision in use */
-#define V2X_REV		(REV_20)
+#define V2X_REV		(REV_12)
 
 /** Name string macro */
 #if V2X_REV == REV_12
@@ -204,6 +204,7 @@ extern "C" {
 #define CP0_INACTIVE              !CP0_ACTIVE
 /** @} */
 
+#if V2X_REV <= REV_12
 /**
  * \name Charge Pump #0 definitions
  *
@@ -219,6 +220,7 @@ extern "C" {
 
 /** Number of on-board buttons */
 #define CHARGEPUMP_COUNT 1
+#endif
 
 /** \name Signal pin definitions
  *  @{
diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 77a77c2..c1467fb 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -55,7 +55,12 @@ void pin_init(void)
 		ioport_configure_pin(BUF0_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);	//blocks atmel serial path to CAN through buffer
 		ioport_configure_pin(BUF1_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);	//enables FTDI serial path to CAN through buffer
 
+	#if V2X_REV <= REV_12
+		/* Revision 1.2:
+		 * Use charge pump for powering leds
+		 */
 		ioport_configure_pin(CHARGEPUMP_0_PIN				, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);
+	#endif
 }
 
 /* This function is meant to contain board-specific initialization code
diff --git a/V2X_Firmware/src/V2X/V2X_led.h b/V2X_Firmware/src/V2X/V2X_led.h
index c29ba65..6a31fd7 100644
--- a/V2X_Firmware/src/V2X/V2X_led.h
+++ b/V2X_Firmware/src/V2X/V2X_led.h
@@ -9,11 +9,13 @@
 #ifndef V2X_LED_H_
 #define V2X_LED_H_
 
+#if V2X_REV <= REV_12
 /**
  * @def charge_pump_toggle
  * @brief Causes the pin driving the charge pump circuit to toggle state HIGH<>LOW
  **/
 inline static void charge_pump_toggle(void) {gpio_toggle_pin(CHARGEPUMP_0_PIN); }
+#endif
 
 /**
  * @def led_0_on
diff --git a/V2X_Firmware/src/main.c b/V2X_Firmware/src/main.c
index 682f762..b495b33 100644
--- a/V2X_Firmware/src/main.c
+++ b/V2X_Firmware/src/main.c
@@ -33,16 +33,24 @@ int main ()
 
 	while (1){
 		sleepmgr_enter_sleep();		//go to sleep until interrupt
+		#if V2X_REV <= REV_12
 			charge_pump_toggle();		//charge pump pin needs toggled to create boost voltage for LEDs
+		#endif
 		reset_processor();			//look for pending resets
 		button_service();			//SCAN and report the button 
+		#if V2X_REV <= REV_12
 			charge_pump_toggle();		//charge pump pin needs toggled to create boost voltage for LEDs
+		#endif
 		job_coordinator();			//schedule new jobs if needed
 		GSM_process_buffer();		//handle any pending jobs for GSM
 		CAN_process_buffer();		//handle any pending jobs for CAN
+		#if V2X_REV <= REV_12
 			charge_pump_toggle();		//charge pump pin needs toggled to create boost voltage for LEDs
+		#endif
 		if (usb_cdc_is_active(USB_ACL)) //if host listening,
 			{report_accel_data();}   //create and send accel data
+		#if V2X_REV <= REV_12
 			charge_pump_toggle();		//charge pump pin needs toggled to create boost voltage for LEDs
+		#endif
 	}
 }

From 3729d0da4d82301952b690068ed33b2cdb4a9dac Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Mon, 6 Mar 2017 13:24:05 -0800
Subject: [PATCH 08/83] TWI note

TWI module may have incorrect settings in this board definition. I find no reference to it in the schematics, so it may be completely unaffected by this revision change. It's unclear if the TWI module is actually being used, so this question may be irrelevant.
---
 V2X_Firmware/src/V2X/V2X_board.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index c2c95c8..476b6b0 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -249,7 +249,11 @@ extern "C" {
 #define EXT1_PIN_SEQ_TXD                   IOPORT_CREATE_PIN(PORTD,7) //TX SIGNAL (PORT D TXD1) TO FTDI MODULE FOR SEQ AT INTERFACE, ALSO USB DP
 /** @} */
 
-
+/* FIXME: Is the following TWI definition incorrect, or irrelevant?
+ * Incorrect because (there may not actually be a TWI device on PORTA)?
+ * Irrelevant because we do not use TWI device>?
+ */
+ 
 /** \name TWI definitions
  *  @{
  */

From 530c838e168515a8cadd682a96efae7dfbbfeef4 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 7 Mar 2017 10:44:05 -0800
Subject: [PATCH 09/83] ACL signal port change

Revision support for accelerometer port change
---
 V2X_Firmware/src/V2X/V2X_board.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index c2c95c8..3044675 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -223,8 +223,13 @@ extern "C" {
 /** \name Signal pin definitions
  *  @{
  */
+#if V2X_REV <= REV_12
 #define EXT1_PIN_ACL_INT2                  IOPORT_CREATE_PIN(PORTA,2)
 #define EXT1_PIN_ACL_INT1                  IOPORT_CREATE_PIN(PORTA,3)
+#elif V2X_REV >= REV_20
+#define EXT1_PIN_ACL_INT2                  IOPORT_CREATE_PIN(PORTA,1)
+#define EXT1_PIN_ACL_INT1                  IOPORT_CREATE_PIN(PORTA,2)
+#endif
 #define EXT1_PIN_HUB_STATUS                IOPORT_CREATE_PIN(PORTA,4)
 #define EXT1_PIN_HUB_SUSPEND               IOPORT_CREATE_PIN(PORTE,5)
 #define EXT1_PIN_HOST_SHORT_CIRCUIT        IOPORT_CREATE_PIN(PORTB,1)

From 203a516f2ef36c541b009034859a1e49184c1c0f Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 7 Mar 2017 11:34:15 -0800
Subject: [PATCH 10/83] Hub port changes

Provide revsision support for hub changes.
Correct port assignment for previous revision.
Drop suspend signal and reassign status signal in new revision.
---
 V2X_Firmware/src/V2X/V2X_board.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index c2c95c8..4eb392d 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -225,8 +225,12 @@ extern "C" {
  */
 #define EXT1_PIN_ACL_INT2                  IOPORT_CREATE_PIN(PORTA,2)
 #define EXT1_PIN_ACL_INT1                  IOPORT_CREATE_PIN(PORTA,3)
+#if V2X_REV <= REV_12
 #define EXT1_PIN_HUB_STATUS                IOPORT_CREATE_PIN(PORTA,4)
-#define EXT1_PIN_HUB_SUSPEND               IOPORT_CREATE_PIN(PORTE,5)
+#define EXT1_PIN_HUB_SUSPEND               IOPORT_CREATE_PIN(PORTA,5)
+#elif V2X_REV >= REV_20
+#define EXT1_PIN_HUB_STATUS                IOPORT_CREATE_PIN(PORTA,3)
+#endif
 #define EXT1_PIN_HOST_SHORT_CIRCUIT        IOPORT_CREATE_PIN(PORTB,1)
 #define EXT1_PIN_SR_CLEAR                  IOPORT_CREATE_PIN(PORTC,0)
 #define EXT1_PIN_SR_LATCH                  IOPORT_CREATE_PIN(PORTC,1)

From b656e6b3ce673bc450b7a685f0f6d693239cc1fa Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 7 Mar 2017 11:37:20 -0800
Subject: [PATCH 11/83] Remove unused hub ports

Remove port assignment for hub serial config signal in revision 2.0
---
 V2X_Firmware/src/V2X/V2X_board.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index 4eb392d..dad184a 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -240,8 +240,10 @@ extern "C" {
 #define EXT1_PIN_SPI_MOSI                  IOPORT_CREATE_PIN(PORTC,5)
 #define EXT1_PIN_SPI_MISO                  IOPORT_CREATE_PIN(PORTC,6)
 #define EXT1_PIN_SPI_SCK                   IOPORT_CREATE_PIN(PORTC,7)
+#if V2X_REV <= REV_12
 #define EXT1_PIN_HUB_SDA                   IOPORT_CREATE_PIN(PORTE,0)
 #define EXT1_PIN_HUB_SCL                   IOPORT_CREATE_PIN(PORTE,1)
+#endif
 #define EXT1_PIN_ACL_RXD                   IOPORT_CREATE_PIN(PORTE,2) //RX SIGNAL (PORT E RXD0) FROM SEQ TO FTDI FOR ACCEL AT INTERFACE
 #define EXT1_PIN_ACL_TXD                   IOPORT_CREATE_PIN(PORTE,3) //TX SIGNAL (PORT E TXD0) FROM SEQ TO FTDI FOR ACCEL AT INTERFACE
 #define EXT1_PIN_SIM_WAKE                  IOPORT_CREATE_PIN(PORTD,0)

From dbc5bfc2158f99e7549b9682d6f6f6d05b095e55 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 7 Mar 2017 11:40:03 -0800
Subject: [PATCH 12/83] Remove unused ACL port: acl data to ftdi uart

Removal of FTDI renders these ports unneccesary.
---
 V2X_Firmware/src/V2X/V2X_board.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index 3044675..1d835a5 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -243,8 +243,10 @@ extern "C" {
 #define EXT1_PIN_SPI_SCK                   IOPORT_CREATE_PIN(PORTC,7)
 #define EXT1_PIN_HUB_SDA                   IOPORT_CREATE_PIN(PORTE,0)
 #define EXT1_PIN_HUB_SCL                   IOPORT_CREATE_PIN(PORTE,1)
+#if V2X_REV <= REV_12
 #define EXT1_PIN_ACL_RXD                   IOPORT_CREATE_PIN(PORTE,2) //RX SIGNAL (PORT E RXD0) FROM SEQ TO FTDI FOR ACCEL AT INTERFACE
 #define EXT1_PIN_ACL_TXD                   IOPORT_CREATE_PIN(PORTE,3) //TX SIGNAL (PORT E TXD0) FROM SEQ TO FTDI FOR ACCEL AT INTERFACE
+#endif
 #define EXT1_PIN_SIM_WAKE                  IOPORT_CREATE_PIN(PORTD,0)
 #define EXT1_PIN_SIM_NETWORK               IOPORT_CREATE_PIN(PORTD,1)
 #define EXT1_PIN_SIM_TXD                   IOPORT_CREATE_PIN(PORTE,2) //TX SIGNAL (PORT D RXD0) FROM SIM MODULE

From a6a4459901047cdf923138ba7517ccedc355f2c7 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Wed, 1 Mar 2017 11:57:39 -0800
Subject: [PATCH 13/83] Buffer control revision support

Elimination of FDTI chip in revision 2.0 means Atmel asserts full control of message passing by default

explanation: though necessary files live in the Config folder, they should be
handled by the Atmel Software Framework Wizard/Explorer tools included
with Atmel Studio, to ensure proper ASF modules have been loaded. Please read
the included "V2X project setup" pdf for instructions on managing ASF modules
---
 V2X_Firmware/src/V2X/V2X_board.h | 66 ++++++++++++++++++--------------
 V2X_Firmware/src/V2X/V2X_init.c  |  3 ++
 V2X_Firmware/src/V2X/V2X_uart.c  |  7 ++++
 V2X_Firmware/src/V2X/V2X_uart.h  |  8 ++--
 4 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index c2c95c8..79f2aaa 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -30,10 +30,10 @@ extern "C" {
 
 /** Name string macro */
 #if V2X_REV == REV_12
-#define BOARD_NAME 				  "RVI_V2X_Version_1.2"
+	#define BOARD_NAME 				  "RVI_V2X_Version_1.2"
 #elif V2X_REV >= REV_20
 /* REV20: board name change */
-#define BOARD_NAME                "RVI_V2X_Version_2.0"
+	#define BOARD_NAME                "RVI_V2X_Version_2.0"
 #endif
 /** @} */
 
@@ -41,9 +41,9 @@ extern "C" {
  *  net: SEQ_LED3 or "PWR" LED
  *  @{ */
 #if V2X_REV == REV_12
-#define LED0_PIN                  IOPORT_CREATE_PIN(PORTB, 0)
+	#define LED0_PIN                  IOPORT_CREATE_PIN(PORTB, 0)
 #elif V2X_REV >= REV_20
-#define LED0_PIN                  IOPORT_CREATE_PIN(PORTA, 7)
+	#define LED0_PIN                  IOPORT_CREATE_PIN(PORTA, 7)
 #endif
 #define LED0_ACTIVE               true
 #define LED0_INACTIVE             !LED0_ACTIVE
@@ -53,9 +53,9 @@ extern "C" {
  *  net: SEQ_LED1 or "M2M" LED
  *  @{ */
 #if V2X_REV == REV_12
-#define LED1_PIN                  IOPORT_CREATE_PIN(PORTA, 6)
+	#define LED1_PIN                  IOPORT_CREATE_PIN(PORTA, 6)
 #elif V2X_REV >= REV_20
-#define LED1_PIN                  IOPORT_CREATE_PIN(PORTA, 5)
+	#define LED1_PIN                  IOPORT_CREATE_PIN(PORTA, 5)
 #endif
 #define LED1_ACTIVE               true
 #define LED1_INACTIVE             !LED0_ACTIVE
@@ -65,9 +65,9 @@ extern "C" {
  *  net: SEQ_LED3 or "GPS" LED
  *  @{ */
 #if V2X_REV == REV_12
-#define LED2_PIN                  IOPORT_CREATE_PIN(PORTA, 7)
+	#define LED2_PIN                  IOPORT_CREATE_PIN(PORTA, 7)
 #elif V2X_REV >= REV_20
-#define LED2_PIN                  IOPORT_CREATE_PIN(PORTA, 6)
+	#define LED2_PIN                  IOPORT_CREATE_PIN(PORTA, 6)
 #endif
 #define LED2_ACTIVE               true
 #define LED2_INACTIVE             !LED0_ACTIVE
@@ -175,27 +175,35 @@ extern "C" {
 #define BUF0_INACTIVE              !BUF0_ACTIVE
 /** @} */
 
-/**
- * \name Serial Buffer #1 definitions
- *
- * Makes FTDI active communicator with ELM/STN device
- *
- *  @{ */
-#define BUF_1_NAME             "Buffer FTDI Active"
-#define BUF_1_PIN              BUF1_PIN
-#define BUF_1_ACTIVE           BUF1_ACTIVE
-#define BUF_1_INACTIVE         BUF1_INACTIVE
-/** @} */
-
-/** \name BUF1 definitions
- *  @{ */
-#define BUF1_PIN                   IOPORT_CREATE_PIN(PORTB, 3)
-#define BUF1_ACTIVE                true
-#define BUF1_INACTIVE              !BUF1_ACTIVE
-/** @} */
-
-/** Number of on-board buttons */
-#define BUFFER_COUNT 2
+/* Revision 1.2 uses FTDI chip for primary routing. Control must be selected 
+ * specifically by either the FDTI or the Atmel. Revision 2.0 removes the FDTI
+ * chip. 
+ */
+#if V2X_REV == REV_12
+	/**
+	* \name Serial Buffer #1 definitions
+	*
+	* Makes FTDI active communicator with ELM/STN device
+	*
+	*  @{ */
+	#define BUF_1_NAME             "Buffer FTDI Active"
+	#define BUF_1_PIN              BUF1_PIN
+	#define BUF_1_ACTIVE           BUF1_ACTIVE
+	#define BUF_1_INACTIVE         BUF1_INACTIVE
+	/** @} */
+
+	/** \name BUF1 definitions
+	*  @{ */
+	#define BUF1_PIN                   IOPORT_CREATE_PIN(PORTB, 3)
+	#define BUF1_ACTIVE                true
+	#define BUF1_INACTIVE              !BUF1_ACTIVE
+	/** @} */
+
+	/** Number of on-board buttons */
+	#define BUFFER_COUNT 2
+#elif V2X_REV >= REV_20
+	#define BUFFER_COUNT 1
+#endif
 
 /** \name CP0 definitions
  *  @{ */
diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 77a77c2..b94609c 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -53,7 +53,10 @@ void pin_init(void)
 		ioport_configure_pin(BUTTON_1_PIN					, IOPORT_DIR_INPUT  | IOPORT_PULL_UP	);  //NON_REM[1] USB hub Boot Strapping option
 
 		ioport_configure_pin(BUF0_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);	//blocks atmel serial path to CAN through buffer
+        /* only use FDTI buffer in previous revision */
+	#if V2X_REV <= REV_12
 		ioport_configure_pin(BUF1_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);	//enables FTDI serial path to CAN through buffer
+	#endif
 
 		ioport_configure_pin(CHARGEPUMP_0_PIN				, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);
 }
diff --git a/V2X_Firmware/src/V2X/V2X_uart.c b/V2X_Firmware/src/V2X/V2X_uart.c
index 7962ccf..63944b7 100644
--- a/V2X_Firmware/src/V2X/V2X_uart.c
+++ b/V2X_Firmware/src/V2X/V2X_uart.c
@@ -10,9 +10,16 @@
 void canbus_serial_routing(uint8_t source)
 {
 	gpio_set_pin_low(BUF0_PIN);
+	
+#if V2X_REV <= REV_12
+	/* use FTDI by default */
 	gpio_set_pin_low(BUF1_PIN);
 	if		(source == FTDI_ROUTING)	{gpio_set_pin_high(BUF1_PIN);}
 	else  /*(source == AVR_ROUTING)*/	{gpio_set_pin_high(BUF0_PIN);}
+#else
+	/* use Atmel */
+	gpio_set_pin_high(BUF0_PIN);
+#endif
 }
 
 void uart_config(uint8_t port, usb_cdc_line_coding_t * cfg)
diff --git a/V2X_Firmware/src/V2X/V2X_uart.h b/V2X_Firmware/src/V2X/V2X_uart.h
index 6c9303e..c0961dc 100644
--- a/V2X_Firmware/src/V2X/V2X_uart.h
+++ b/V2X_Firmware/src/V2X/V2X_uart.h
@@ -3,7 +3,7 @@
  *
  * Created: 2/12/2016 10:34:20 AM
  *  Author: jbanks2
- */ 
+ */
 
 
 #ifndef V2X_UART_H_
@@ -14,8 +14,10 @@
  * @brief The two states the serial buffer can have
  **/
 enum buffer_routing{
-	AVR_ROUTING = 0,
-	FTDI_ROUTING
+	AVR_ROUTING = 0
+#if V2X_REV <= REV_12
+	, FTDI_ROUTING
+#endif
 	};
 
 /**

From 8b6c51b2ffabad75f4ddc0fe9e8888bd3eabbc61 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 7 Mar 2017 14:18:07 -0800
Subject: [PATCH 14/83] Power sequence and control values update

Revision support for:
- power control sequence output values to shift register.
- power control default starting values.
- hub power manipulation, also in processor reset case
- 3v3 power supply control in shift register
- variable shift register byte size determined at compile time by revision
---
 V2X_Firmware/src/V2X/V2X_board.h | 19 +++++++++++
 V2X_Firmware/src/V2X/V2X_init.c  |  8 +++--
 V2X_Firmware/src/V2X/V2X_menu.c  | 44 +++++++++++++++-----------
 V2X_Firmware/src/V2X/V2X_power.c | 23 +++++++++++---
 V2X_Firmware/src/V2X/V2X_power.h | 54 ++++++++++++++++++++++++++------
 5 files changed, 113 insertions(+), 35 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index c2c95c8..09d6de8 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -305,6 +305,10 @@ extern "C" {
  * This is used for power and reset sequencing
  *
  */
+#if V2X_REV <= REV_12
+/* Revision 1.2 features two shift registers, accommodating a 16 bit field for 
+ * the following power signals. Note: order is relevant!
+ */
 enum power_sequence_outputs {
 	ENABLE_3V3			= 0,
 	ENABLE_3V3B			,
@@ -323,6 +327,21 @@ enum power_sequence_outputs {
 	ENABLE_SIM_VBUS		,
 	ENABLE_FTDI_RESET	
 };
+#elif V2X_REV >= REV_20
+/* Revision 2.0 uses only a single shift register, accommodating an 8 bit field
+ * for the following power signals. Note: order is relevant!
+ */
+ enum power_sequence_outputs {
+	 ENABLE_4V1			= 0
+	 , ENABLE_5V0
+	 , ENABLE_5V0B
+	 , ENABLE_CAN_SLEEP
+	 , ENABLE_CAN_RESET
+	 , ENABLE_SIM_PWR_ON
+	 , ENABLE_SIM_RESET
+	 , ENABLE_SIM_WAKE
+ };
+#endif
 
 #define SR_SPI				&SPIC
 //! @}
diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 77a77c2..203280b 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -80,9 +80,11 @@ void v2x_board_init(void)
 	ACL_init();								//configures, but does not start sampling
 	GSM_usart_init();						//starts direct serial channel to the SIM module
 	CAN_uart_start();						//starts direct serial channel to the ELM module
-	canbus_serial_routing(AVR_ROUTING);		//cause the serial 3-state buffer to route the serial path from the ELM to the FTDI 
+	canbus_serial_routing(AVR_ROUTING);		//cause the serial 3-state buffer to route the serial path from the ELM to the FTDI
 	udc_start();							//start stack and vbus monitoring
+#if V2X_REV <= REV_12
 	PWR_hub_start();						//connect the hub to the computer
+#endif
 
 	//autostart all systems
 	delay_ms(500);
@@ -100,6 +102,7 @@ void reset_processor(void) {
 			CCP = 0xd8; //enable write protected registers
 			RST_CTRL = true; //force SW reset
 		}
+#if V2X_REV <= REV_12
 		if (reset_flags & (1<<RESET_USB)) {
 			usb_tx_string_P(PSTR("USB restarting\r>"));
 			delay_s(3);
@@ -109,6 +112,7 @@ void reset_processor(void) {
 			delay_s(1);
 			reset_flags &= ~(1<<RESET_USB);
 		}
+#endif
 		if (reset_flags & (1<<RESET_CAN)) {
 			menu_send_CTL();
 			usb_tx_string_P(PSTR("CAN restarting\r>"));
@@ -129,7 +133,7 @@ void reset_processor(void) {
 			reset_flags = reset_flags & ~((1<<RESET_SYSTEM)|(1<<RESET_USB)|(1<<RESET_CAN)|(1<<RESET_GSM));
 		}
 	}
-	
+
 }
 
 void reset_trigger_USB (void) {
diff --git a/V2X_Firmware/src/V2X/V2X_menu.c b/V2X_Firmware/src/V2X/V2X_menu.c
index 2073b4c..b56c851 100644
--- a/V2X_Firmware/src/V2X/V2X_menu.c
+++ b/V2X_Firmware/src/V2X/V2X_menu.c
@@ -3,7 +3,7 @@
  *
  * Created: 2/23/2016 9:00:14 AM
  *  Author: jbanks2
- */ 
+ */
 
 #include "V2X.h"
 #include "ctype.h"
@@ -73,7 +73,7 @@ void menu_main(void) {
 	}else{
 			usb_tx_string_PV(PSTR("All commands start VX\r"));
 	}
-	clear_buffer(CMD_buffer);	//clear the buffer for next command	
+	clear_buffer(CMD_buffer);	//clear the buffer for next command
 	menu_send_n_st();
 }
 
@@ -105,7 +105,7 @@ void menu_accel (void) {
 	case 's':  //sample rate
  		speed = atoi(CMD_buffer+4);
 		if (speed > 3199) {
-			ACL_set_rate(ACL_RATE_3200);	
+			ACL_set_rate(ACL_RATE_3200);
 			usb_tx_string_PV(PSTR("Set to 3200Hz"));
 		}else if (speed > 1599) {
 			ACL_set_rate(ACL_RATE_1600);
@@ -140,7 +140,7 @@ void menu_accel (void) {
 		}else if (speed > 0) {
 			ACL_set_rate(ACL_RATE_1);
 			usb_tx_string_PV(PSTR("Set to 1Hz"));
- 		}else {	
+ 		}else {
 			usb_tx_string_P(PSTR("ERROR: Out of range, try again."));
 		}
 		break;
@@ -161,7 +161,7 @@ void menu_accel (void) {
 			usb_tx_string_PV(PSTR("+/-2G Range"));
 		}else {menu_send_out_of_range();}
 		break;
-		
+
 	case 'x':
 	case 'y':
 	case 'z':
@@ -207,12 +207,12 @@ void menu_accel (void) {
 			} else {
 				ACL_take_sample(sample);
 			}
-			ACL_data_to_string(sample, CMD_buffer); 
+			ACL_data_to_string(sample, CMD_buffer);
 			for (int i = 0; i < strlen(CMD_buffer); i++)
 				{usb_cdc_send_byte(USB_CMD, CMD_buffer[i]);}
 		} else {
 			usb_tx_string_P(PSTR("ERROR: Not currently sampling, use VXAE\r"));}
-		
+
 		break;
 	case 'f':
 		if (CMD_buffer[4] == '0') {
@@ -225,7 +225,7 @@ void menu_accel (void) {
 		}
 		else {menu_send_q();}
 		break;
-	case '?':  
+	case '?':
 	default:
 		usb_tx_string_P(PSTR("*** Accelerometer Menu ***\rE: Enable\rD: Disable\rR: Restart\rI: Subsystem Information\rQ: Query status\rG: Get last Sample\rSn: Set sample rate in HZ (1, 3, 6, 12, 25, 50, 100, 200, 400, 800)\rWn: Set \"G\" Range (2, 4, 8, 16)\rFn: Full range (1: full 0: 10bit)\rXn: Set X offset (+/-127)\rYn: Set Y offset\rZn: Set Z offset\r"));
 		break;
@@ -233,9 +233,9 @@ void menu_accel (void) {
 }
 
 void menu_modem (void) {
-	int i; 
+	int i;
 	switch (CMD_buffer[3]) {
-	case 'd':  
+	case 'd':
 		PWR_gsm_stop(); //disable
 		usb_tx_string_PV(PSTR("GSM is off\r"));
 		break;
@@ -290,7 +290,7 @@ void menu_can (void) {
 		break;
 	case 'x': //pass command
 		strcat_P(CMD_buffer, PSTR("\r"));
-		
+
 		CAN_add_string_to_buffer(BUFFER_OUT, CMD_buffer+4);
 		CAN_mark_for_processing(BUFFER_OUT);
 		CAN_start_snoop();
@@ -317,11 +317,13 @@ void menu_power (void) {
 	switch (CMD_buffer[3]) {
 	case 'd':  //disable power
 		switch (CMD_buffer[4]) {
+#if V2X_REV <= REV_12
 		case '3':  //3v
 			usb_tx_string_PV(PSTR("Disabling 3V supply"));
 			PWR_turn_off((1<<ENABLE_3V3));
 			PWR_push();
 			break;
+#endif
 		case '4':  //4v
 			usb_tx_string_PV(PSTR("Disabling 4V supply"));
 			PWR_turn_off((1<<ENABLE_4V1)|(1<<ENABLE_SIM_RESET));
@@ -344,11 +346,13 @@ void menu_power (void) {
 		break; //disable power
 	case 'e':  //enable power
 		switch (CMD_buffer[4]) {
+#if V2X_REV <= REV_12
 		case '3':  //3v
 			usb_tx_string_PV(PSTR("Enabling 3V supply"));
 			PWR_turn_on((1<<ENABLE_3V3));
 			PWR_push();
 			break;
+#endif
 		case '4':  //4v
 			usb_tx_string_PV(PSTR("Enabling 4V supply"));
 			PWR_turn_on((1<<ENABLE_4V1));
@@ -369,7 +373,7 @@ void menu_power (void) {
 			break;
 		}
 		break;  //enable power
-	case 'r':  
+	case 'r':
 		PWR_turn_off(~POWER_CONTROL_DEFAULT_VALUE);
 		PWR_turn_on(POWER_CONTROL_DEFAULT_VALUE);
 		PWR_push();
@@ -455,7 +459,7 @@ void menu_send_n(void) {usb_tx_string_P(PSTR("\r"));
 }
 
 void menu_send_n_st(void) {usb_tx_string_P(PSTR("\r>"));
-}			
+}
 
 void menu_send_out_of_range(void) {usb_tx_string_P(PSTR("ERROR: out of range\r"));
 }
@@ -465,10 +469,10 @@ void menu_send_GSM(void) {usb_tx_string_P(PSTR("GSM>:"));
 
 void menu_send_CTL(void) {usb_tx_string_P(PSTR("CTL>:"));
 }
-	
+
 void menu_send_CAN(void) {usb_tx_string_P(PSTR("CAN>:"));
 }
-	
+
 void menu_send_BTN(void) {usb_tx_string_P(PSTR("BTN>:"));
 }
 
@@ -476,7 +480,7 @@ Bool menu_verbose(void) {
 	return verbose;
 }
 
-void menu_print_int(long value) {	
+void menu_print_int(long value) {
 	char c_buf[13];
 	ltoa(value, c_buf, 10);
 	int i = 0;  //clear the pointer
@@ -508,7 +512,9 @@ void menu_lockup (void) {
 	usb_cdc_send_string(USB_ACL, msg);
 	usb_cdc_send_string(USB_CAN, msg);
 	delay_s(1);
+#if V2X_REV <= REV_12
 	PWR_hub_stop();
+#endif
 	delay_s(1);
 	RST_CTRL = true; //force SW reset
 }
@@ -560,10 +566,12 @@ void menu_can_status(void) {
 }
 
 void menu_power_status(void) {
+#if V2X_REV <= REV_12
 	usb_tx_string_P(PSTR("3V3="));
 	if (PWR_query((1<<ENABLE_3V3)))
 			{menu_send_1();}
 	else	{menu_send_0();}
+#endif
 	usb_tx_string_P(PSTR("4V1="));
 	if (PWR_query((1<<ENABLE_4V1)))
 			{menu_send_1();}
@@ -587,14 +595,14 @@ void menu_timer_status (void) {
 			{menu_send_1();}
 	else	{menu_send_0();}
 	usb_tx_string_P(PSTR("UTC="));
-	menu_print_int(time_get());		
+	menu_print_int(time_get());
 	menu_send_n();
 	usb_tx_string_P(PSTR("H24="));
 	if (time_is_current())
 			{menu_send_1();}
 	else	{menu_send_0();}
 	usb_tx_string_P(PSTR("ALM="));
-	menu_print_int(time_alarm_get());		
+	menu_print_int(time_alarm_get());
 	menu_send_n();
 	usb_tx_string_P(PSTR("ALS="));
 	if (time_alarm_active())
diff --git a/V2X_Firmware/src/V2X/V2X_power.c b/V2X_Firmware/src/V2X/V2X_power.c
index 48f1773..0989a60 100644
--- a/V2X_Firmware/src/V2X/V2X_power.c
+++ b/V2X_Firmware/src/V2X/V2X_power.c
@@ -4,7 +4,7 @@
  * /brief V2X board hardware driver functions
  *
  * Author: Jesse Banks (jbanks2)
- **/ 
+ **/
 
 #include "V2X.h"
 
@@ -32,26 +32,38 @@ void PWR_clear(void)
 }
 
 void PWR_push(void) {  //uses shift_register_state to update the shift register
+#if V2X_REV <= REV_12
+/* With 2 shift registers, it is necessary to copy the power control values into
+ * 2 packets, with MSB written first, so that the 2 byte sequence lands on the 
+ * register outputs in the proper order.
+ */
 	uint8_t data[2];
 	data[1] = power_control_state & 0xff;
-	data[0] = (power_control_state >> 8) & 0xff; 
+	data[0] = (power_control_state >> 8) & 0xff;
 	spi_write_packet(SR_SPI, data, 2);
+#elif V2X_REV >= REV_20
+	/* We should be able to send the single byte to the single shift register,
+	 * as long as the bit order has been respected.
+	 */
+	spi_write_packet(SR_SPI, power_control_state, 1);
+#endif
 	PWR_latch();
 }
 
-void PWR_turn_on (uint16_t pins_mask) {  //updates the power state variable but does not update shift register
+void PWR_turn_on (SHIFT_REGISTER_TYPE pins_mask) {  //updates the power state variable but does not update shift register
 	power_control_state |= pins_mask;
 }
 
-void PWR_turn_off(uint16_t pins_mask) {  //updates the power state variable but does not update shift register
+void PWR_turn_off(SHIFT_REGISTER_TYPE pins_mask) {  //updates the power state variable but does not update shift register
 	power_control_state &= ~(pins_mask);
 }
 
-Bool PWR_query(uint16_t mask) {
+Bool PWR_query(SHIFT_REGISTER_TYPE mask) {
 	if ((power_control_state & mask) != 0) {return true;}
 	else {return false;}
 }
 
+#if V2X_REV <= REV_12
 void PWR_hub_start(void) {
 	PWR_turn_on((1<<ENABLE_HUB));
 	PWR_push();
@@ -61,6 +73,7 @@ void PWR_hub_stop(void){
 	PWR_turn_off((1<<ENABLE_HUB));
 	PWR_push();
 }
+#endif
 
 void PWR_host_start(void) {
 	PWR_turn_on((1<<ENABLE_5V0B));
diff --git a/V2X_Firmware/src/V2X/V2X_power.h b/V2X_Firmware/src/V2X/V2X_power.h
index cee85ce..67c8ca2 100644
--- a/V2X_Firmware/src/V2X/V2X_power.h
+++ b/V2X_Firmware/src/V2X/V2X_power.h
@@ -11,21 +11,53 @@
 
 #include "V2X_board.h"
 
+/**
+ * @def SHIFT_REGISTER_TYPE
+ * @brief shift register type, bit length determined by hardware
+ */
+#if V2X_REV <= REV_12
+#define SHIFT_REGISTER_TYPE uint16_t
+#elif V2X_REV >= REV_20
+#define SHIFT_REGISTER_TYPE uint8_t
+#endif
+
 /**
  * @def shift_register_state
  * @brief variable that holds the current power state.
  */
-volatile uint16_t power_control_state;
+volatile SHIFT_REGISTER_TYPE power_control_state;
 
 /**
  * @def STATE_DEFAULT_VALUE
  * @brief default power state. enables 3v3 only
  */
-#define POWER_CONTROL_DEFAULT_VALUE (1<<ENABLE_3V3)|(0<<ENABLE_3V3B)|(0<<ENABLE_3V3C)|(0<<ENABLE_3V3D)|\
-									(0<<ENABLE_4V1)|(0<<ENABLE_5V0)|(0<<ENABLE_5V0B)|(0<<ENABLE_SIM_WAKE)|\
-									(1<<ENABLE_HUB)|(0<<ENABLE_CAN_SLEEP)|(0<<ENABLE_CAN_RESET)|(0<<ENABLE_SIM_PWR_ON)|\
-									(0<<ENABLE_SIM_RESET)|(0<<ENABLE_SIM_RF_OFF)|(0<<ENABLE_SIM_VBUS)|(0<<ENABLE_FTDI_RESET)
-
+#if V2X_REV <= REV_12
+#define POWER_CONTROL_DEFAULT_VALUE (1<<ENABLE_3V3)|        \
+									(0<<ENABLE_3V3B)|       \
+									(0<<ENABLE_3V3C)|       \
+									(0<<ENABLE_3V3D)|       \
+									(0<<ENABLE_4V1)|        \
+									(0<<ENABLE_5V0)|        \
+									(0<<ENABLE_5V0B)|       \
+									(0<<ENABLE_SIM_WAKE)|   \
+									(1<<ENABLE_HUB)|        \
+									(0<<ENABLE_CAN_SLEEP)|  \
+									(0<<ENABLE_CAN_RESET)|  \
+									(0<<ENABLE_SIM_PWR_ON)| \
+									(0<<ENABLE_SIM_RESET)|  \
+									(0<<ENABLE_SIM_RF_OFF)| \
+									(0<<ENABLE_SIM_VBUS)|   \
+									(0<<ENABLE_FTDI_RESET)
+#elif V2X_REV >= REV_20
+#define POWER_CONTROL_DEFAULT_VALUE (0<<ENABLE_4V1)|        \
+									(0<<ENABLE_5V0)|        \
+									(0<<ENABLE_5V0B)|       \
+									(0<<ENABLE_CAN_SLEEP)|  \
+									(0<<ENABLE_CAN_RESET)|  \
+									(0<<ENABLE_SIM_PWR_ON)| \
+									(0<<ENABLE_SIM_RESET)|  \
+									(0<<ENABLE_SIM_WAKE)
+#endif
 /**
  * @def shift_register_init
  * @brief	Resets the shift register, then sets to default values
@@ -57,23 +89,24 @@ void PWR_push(void);
  * @brief Sets bits in the power state variable, in preparation for a state change
  * @param pins_mask bit wise mask of enable/power pins
  **/
-void PWR_turn_on(uint16_t pins_mask);
+void PWR_turn_on(SHIFT_REGISTER_TYPE pins_mask);
 
 /**
  * @def shift_register_clear
  * @brief Clears bits in the power state variable, in preparation for a state change
  * @param pins_mask bit wise mask of enable/power pins
  **/
-void PWR_turn_off(uint16_t pins_mask);
+void PWR_turn_off(SHIFT_REGISTER_TYPE pins_mask);
 
 /**
  * @def PWR_query
- * @brief returns if the  
+ * @brief returns if the
  * @param mask bitwise mask use with power_sequence_outputs
  * @retval if power_status_mask & var_mask != 0 returns true
  */
-Bool PWR_query(uint16_t mask);
+Bool PWR_query(SHIFT_REGISTER_TYPE mask);
 
+#if V2X_REV <= REV_12
 /**
  * @def power_hub_start
  * @brief sends a sequence to disable the USB hub
@@ -85,6 +118,7 @@ void PWR_hub_start(void);
  * @brief sends a sequence to disable the USB hub
  */
 void PWR_hub_stop(void);
+#endif
 
 /**
  * @def PWR_is_5_needed

From 7a3e20ffa3d4f434c81fb26ff58302950e0a2050 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Thu, 9 Mar 2017 11:22:15 -0800
Subject: [PATCH 15/83] Add revision support for pins and ports disabled

---
 V2X_Firmware/src/V2X/V2X_init.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 77a77c2..25f3e9e 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -12,7 +12,9 @@ uint8_t reset_flags = RESET_NONE;
 void pin_init(void)
 {
 		ioport_configure_pin(EXT1_PIN_HUB_STATUS			, IOPORT_DIR_INPUT						);
+#if V2X_REV <= REV_12
 		ioport_configure_pin(EXT1_PIN_HUB_SUSPEND			, IOPORT_DIR_INPUT						);	//NON_REM[0] USB hub Boot Strapping option, strapped by resistor
+#endif
 		ioport_configure_pin(EXT1_PIN_HOST_SHORT_CIRCUIT	, IOPORT_DIR_INPUT						);
 
 		ioport_configure_pin(EXT1_PIN_CAN_TXD				, IOPORT_DIR_INPUT						);
@@ -29,8 +31,10 @@ void pin_init(void)
 		ioport_configure_pin(EXT1_PIN_SR_CLEAR				, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);
 		ioport_configure_pin(EXT1_PIN_SR_LATCH				, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);
 
+#if V2X_REV <= REV_12
 		ioport_configure_pin(EXT1_PIN_HUB_SDA				, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);  //1 for NON_REM[1] USB hub Boot Strapping option
 		ioport_configure_pin(EXT1_PIN_HUB_SCL				, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);	//0 for CFG_SEL USB hub Boot Strapping option
+#endif
 
 		ioport_configure_pin(EXT1_PIN_ACL_RXD				, IOPORT_DIR_INPUT						);
 		ioport_configure_pin(EXT1_PIN_ACL_TXD				, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);

From ef5d7879c29043a72d0bc016b9c8add94ef98ccb Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Thu, 9 Mar 2017 11:26:33 -0800
Subject: [PATCH 16/83] Add revision support for pins and ports disabled

Removal of FTDI in revision 2.0 invalidaes the need for additional channels for Accelerometer
---
 V2X_Firmware/src/V2X/V2X_init.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 77a77c2..be95245 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -32,8 +32,10 @@ void pin_init(void)
 		ioport_configure_pin(EXT1_PIN_HUB_SDA				, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);  //1 for NON_REM[1] USB hub Boot Strapping option
 		ioport_configure_pin(EXT1_PIN_HUB_SCL				, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);	//0 for CFG_SEL USB hub Boot Strapping option
 
+#if V2X_REV <= REV_12
 		ioport_configure_pin(EXT1_PIN_ACL_RXD				, IOPORT_DIR_INPUT						);
 		ioport_configure_pin(EXT1_PIN_ACL_TXD				, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);
+#endif
 
 		ioport_configure_pin(EXT1_PIN_SIM_WAKE				, IOPORT_DIR_INPUT	  					);
 		ioport_configure_pin(EXT1_PIN_SIM_NETWORK			, IOPORT_DIR_INPUT	  					);

From 3d09f3c7665350ba15cedfa2cb5b840aebd0e02f Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 10 Mar 2017 16:08:52 -0800
Subject: [PATCH 17/83] Feedback notes from sync

J provided feedback. These notes reflect changes that should be made to the revision.
---
 V2X_Firmware/src/V2X/V2X_board.h | 61 ++++++++++++++++++--------------
 V2X_Firmware/src/V2X/V2X_init.c  |  2 ++
 V2X_Firmware/src/V2X/V2X_menu.c  |  5 +++
 V2X_Firmware/src/V2X/V2X_power.c |  5 ++-
 V2X_Firmware/src/V2X/V2X_uart.c  | 19 +++++-----
 5 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index 0285080..da77b4a 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -1,7 +1,7 @@
 /**
  * \file V2X_board.h
  *
- * \brief V2X power sequencer board definition XMEGA128A4U 
+ * \brief V2X power sequencer board definition XMEGA128A4U
  *
  * Author: Jesse Banks (jbanks2)
  */
@@ -26,7 +26,7 @@ extern "C" {
 #define REV_20		(20)
 
 /* Board revision in use */
-#define V2X_REV		(REV_12)
+#define V2X_REV		(REV_20)
 
 /** Name string macro */
 #if V2X_REV == REV_12
@@ -156,6 +156,10 @@ extern "C" {
 
 #define BUTTON_COUNT 2
 
+
+/* DELETEME: Quite possibly, the whole buffer switcheroo is not needed anymore,
+ * can probably eliminate the whole buffer setup
+ * */
 /**
  * \name Serial Buffer #0 definitions
  *
@@ -175,9 +179,9 @@ extern "C" {
 #define BUF0_INACTIVE              !BUF0_ACTIVE
 /** @} */
 
-/* Revision 1.2 uses FTDI chip for primary routing. Control must be selected 
+/* Revision 1.2 uses FTDI chip for primary routing. Control must be selected
  * specifically by either the FDTI or the Atmel. Revision 2.0 removes the FDTI
- * chip. 
+ * chip.
  */
 #if V2X_REV == REV_12
 	/**
@@ -200,6 +204,7 @@ extern "C" {
 	/** @} */
 
 	/** Number of on-board buttons */
+	/* DELETEME: this can probably just be eliminated */
 	#define BUFFER_COUNT 2
 #elif V2X_REV >= REV_20
 	#define BUFFER_COUNT 1
@@ -244,6 +249,7 @@ extern "C" {
 #define EXT1_PIN_HUB_STATUS                IOPORT_CREATE_PIN(PORTA,4)
 #define EXT1_PIN_HUB_SUSPEND               IOPORT_CREATE_PIN(PORTA,5)
 #elif V2X_REV >= REV_20
+/* DELETEME: HUB_STATUS unnecessary without FTDI in the mix */
 #define EXT1_PIN_HUB_STATUS                IOPORT_CREATE_PIN(PORTA,3)
 #endif
 #define EXT1_PIN_HOST_SHORT_CIRCUIT        IOPORT_CREATE_PIN(PORTB,1)
@@ -276,7 +282,7 @@ extern "C" {
  * Incorrect because (there may not actually be a TWI device on PORTA)?
  * Irrelevant because we do not use TWI device>?
  */
- 
+
 /** \name TWI definitions
  *  @{
  */
@@ -288,6 +294,7 @@ extern "C" {
 #define TWI_DATA_LENGTH				8
 /** @} */
 
+/*DELETEME: These are likely superfluous */
 /** \name Extension header #1 USART definitions
 *  @{
 */
@@ -297,17 +304,18 @@ extern "C" {
 #define EXT1_ACL_USART              &USARTE0
 /** @} */
 
+/*DELETEME: Doubly superfluous */
  /** \name Extension header #1 SPI definitions
  *  @{
  */
 #define EXT1_SPI_MODULE              &SPIC
- 	
+
 /** @} */
 /** \name Extension header #2 SPI definitions
  *  @{
  */
 #define EXT1_SPI_MODULE              &SPIC
- 	
+
 /** @} */
 
 /*! \name SPI Connections of external ADXL345 Accelerometer
@@ -327,13 +335,13 @@ extern "C" {
 #define ACL_SPI_CLK_MASK      SYSCLK_PORT_C
 //! @}
 
-/*! \name Shift Register Connections 
+/*! \name Shift Register Connections
  *
  * This is used for power and reset sequencing
  *
  */
 #if V2X_REV <= REV_12
-/* Revision 1.2 features two shift registers, accommodating a 16 bit field for 
+/* Revision 1.2 features two shift registers, accommodating a 16 bit field for
  * the following power signals. Note: order is relevant!
  */
 enum power_sequence_outputs {
@@ -352,7 +360,7 @@ enum power_sequence_outputs {
 	ENABLE_SIM_RESET	,
 	ENABLE_SIM_RF_OFF	,
 	ENABLE_SIM_VBUS		,
-	ENABLE_FTDI_RESET	
+	ENABLE_FTDI_RESET
 };
 #elif V2X_REV >= REV_20
 /* Revision 2.0 uses only a single shift register, accommodating an 8 bit field
@@ -373,29 +381,30 @@ enum power_sequence_outputs {
 #define SR_SPI				&SPIC
 //! @}
 
-#define  USART					USARTC0						
-#define  USART_RX_Vect			USARTC0_RXC_vect			
-#define  USART_DRE_Vect			USARTC0_DRE_vect			
-#define  USART_SYSCLK			SYSCLK_USART0				
-#define  USART_PORT				PORTC						
-#define  USART_PORT_PIN_TX		(1<<3)  // PC3 (TXE0)		
-#define  USART_PORT_PIN_RX		(1<<2)  // PC2 (RXE0)		
-#define  USART_PORT_SYSCLK		SYSCLK_PORT_C	
+/* FIXME: Pin definition comments in following are misleading, code is fine */
+#define  USART					USARTC0
+#define  USART_RX_Vect			USARTC0_RXC_vect
+#define  USART_DRE_Vect			USARTC0_DRE_vect
+#define  USART_SYSCLK			SYSCLK_USART0
+#define  USART_PORT				PORTC
+#define  USART_PORT_PIN_TX		(1<<3)  // PC3 (TXE0)
+#define  USART_PORT_PIN_RX		(1<<2)  // PC2 (RXE0)
+#define  USART_PORT_SYSCLK		SYSCLK_PORT_C
 
 #define  USART_BAUDRATE			9600
 #define  USART_CHAR_LENGTH		USART_CHSIZE_8BIT_gc
 #define  USART_PARITY			USART_PMODE_DISABLED_gc
 #define  USART_STOP_BIT			false
 
-#define  USART_SIM              USARTD0						
-#define  USART_SIM_RX_Vect      USARTD0_RXC_vect			
-#define  USART_SIM_DRE_Vect     USARTD0_DRE_vect			
-#define  USART_SIM_SYSCLK       SYSCLK_USART0				
-#define  USART_SIM_PORT         PORTD						
-#define  USART_SIM_PORT_PIN_TX  (1<<3)  // PC3 (TXE0)		
-#define  USART_SIM_PORT_PIN_RX  (1<<2)  // PC2 (RXE0)		
+#define  USART_SIM              USARTD0
+#define  USART_SIM_RX_Vect      USARTD0_RXC_vect
+#define  USART_SIM_DRE_Vect     USARTD0_DRE_vect
+#define  USART_SIM_SYSCLK       SYSCLK_USART0
+#define  USART_SIM_PORT         PORTD
+#define  USART_SIM_PORT_PIN_TX  (1<<3)  // PC3 (TXE0)
+#define  USART_SIM_PORT_PIN_RX  (1<<2)  // PC2 (RXE0)
 #define  USART_SIM_PORT_SYSCLK  SYSCLK_PORT_D
-				
+
 #define  USART_SIM_BAUDRATE		115200
 #define  USART_SIM_CHAR_LENGTH  USART_CHSIZE_8BIT_gc
 #define  USART_SIM_PARITY       USART_PMODE_DISABLED_gc
diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 5c32bb7..6708372 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -11,6 +11,7 @@ uint8_t reset_flags = RESET_NONE;
 
 void pin_init(void)
 {
+	/* DELETEME: HUB_STATUS unnecessary without FTDI in the mix */
 		ioport_configure_pin(EXT1_PIN_HUB_STATUS			, IOPORT_DIR_INPUT						);
 #if V2X_REV <= REV_12
 		ioport_configure_pin(EXT1_PIN_HUB_SUSPEND			, IOPORT_DIR_INPUT						);	//NON_REM[0] USB hub Boot Strapping option, strapped by resistor
@@ -58,6 +59,7 @@ void pin_init(void)
 		ioport_configure_pin(BUTTON_0_PIN					, IOPORT_DIR_INPUT   					);
 		ioport_configure_pin(BUTTON_1_PIN					, IOPORT_DIR_INPUT  | IOPORT_PULL_UP	);  //NON_REM[1] USB hub Boot Strapping option
 
+/* REV_20: don't use this pin at all, let it default to input */
 		ioport_configure_pin(BUF0_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);	//blocks atmel serial path to CAN through buffer
         /* only use FDTI buffer in previous revision */
 	#if V2X_REV <= REV_12
diff --git a/V2X_Firmware/src/V2X/V2X_menu.c b/V2X_Firmware/src/V2X/V2X_menu.c
index b56c851..8d9bb35 100644
--- a/V2X_Firmware/src/V2X/V2X_menu.c
+++ b/V2X_Firmware/src/V2X/V2X_menu.c
@@ -325,6 +325,10 @@ void menu_power (void) {
 			break;
 #endif
 		case '4':  //4v
+		/* FIXME: ensure 3 comes on before turning off 4
+		 * add a func call for pwr_turn_off_4 that does the requisite checking
+		 * rather than setting bits directly here
+		 */
 			usb_tx_string_PV(PSTR("Disabling 4V supply"));
 			PWR_turn_off((1<<ENABLE_4V1)|(1<<ENABLE_SIM_RESET));
 			PWR_push();
@@ -339,6 +343,7 @@ void menu_power (void) {
 			PWR_turn_off((1<<ENABLE_5V0B));
 			PWR_is_5_needed();
 			break;
+/* FIXME: add total shutdown case. suicide all power supplies */
 		default:
 			menu_send_q();
 			break;
diff --git a/V2X_Firmware/src/V2X/V2X_power.c b/V2X_Firmware/src/V2X/V2X_power.c
index 0989a60..9f21adf 100644
--- a/V2X_Firmware/src/V2X/V2X_power.c
+++ b/V2X_Firmware/src/V2X/V2X_power.c
@@ -10,6 +10,7 @@
 
 void PWR_init(void)
 {
+	/*FIXME: Need to drive high 3v3_EN signal here */
 	PWR_clear();							// Clear shift register
 	PWR_latch();							// Latch all internal registers to output
 	power_control_state = POWER_CONTROL_DEFAULT_VALUE;
@@ -34,7 +35,7 @@ void PWR_clear(void)
 void PWR_push(void) {  //uses shift_register_state to update the shift register
 #if V2X_REV <= REV_12
 /* With 2 shift registers, it is necessary to copy the power control values into
- * 2 packets, with MSB written first, so that the 2 byte sequence lands on the 
+ * 2 packets, with MSB written first, so that the 2 byte sequence lands on the
  * register outputs in the proper order.
  */
 	uint8_t data[2];
@@ -94,6 +95,8 @@ void PWR_is_5_needed (void) { //turn off 5v0 if host and can are off
 	PWR_push();
 }
 
+/* FIXME: Add similar logical checks for 4v1 vs 3v3 power controls */
+
 void PWR_can_stop (void) {
 	PWR_turn_off((1<<ENABLE_CAN_RESET));
 	PWR_is_5_needed();
diff --git a/V2X_Firmware/src/V2X/V2X_uart.c b/V2X_Firmware/src/V2X/V2X_uart.c
index 63944b7..2d9becc 100644
--- a/V2X_Firmware/src/V2X/V2X_uart.c
+++ b/V2X_Firmware/src/V2X/V2X_uart.c
@@ -3,14 +3,15 @@
  *
  * Created: 2/12/2016 10:34:41 AM
  *  Author: jbanks2
- */ 
+ */
 
 #include "V2X.h"
 
+/* DELETEME: Likely get rid of this entirely, like the aforementioned buffer cases */
 void canbus_serial_routing(uint8_t source)
 {
 	gpio_set_pin_low(BUF0_PIN);
-	
+
 #if V2X_REV <= REV_12
 	/* use FTDI by default */
 	gpio_set_pin_low(BUF1_PIN);
@@ -25,7 +26,7 @@ void canbus_serial_routing(uint8_t source)
 void uart_config(uint8_t port, usb_cdc_line_coding_t * cfg)
 {
 	if (port != USB_CAN) {return;}
-	
+
 	uint8_t reg_ctrlc;
 	uint16_t bsel;
 
@@ -139,7 +140,7 @@ void uart_rx_notify(uint8_t port) //message received over USB
 				}
 // 			} else { //there was a special character
 // 				//run through the buffer until it is empty
-// 				while (udi_cdc_multi_is_rx_ready(port)) {  
+// 				while (udi_cdc_multi_is_rx_ready(port)) {
 // 					data = udi_cdc_multi_getc(port);
 // 				}
 			}
@@ -155,7 +156,7 @@ void uart_rx_notify(uint8_t port) //message received over USB
 				} else if (data == 'r' || data == 'R') {
 					reset_trigger_SYSTEM();
 				}
-				udi_cdc_multi_putc(port, data);	
+				udi_cdc_multi_putc(port, data);
 			}
 		}
 	}
@@ -166,8 +167,8 @@ ISR(USART_RX_Vect)
 	uint8_t value = USART.DATA;
 	if (CAN_is_controlled() || CAN_is_snooping() || usb_cdc_is_active(USB_CAN) == false) {
 		CAN_new_data(value);
-	} 
-	
+	}
+
 	if (usb_cdc_is_active(USB_CAN) == true){
 		//host is on, send over USB
 		if (0 != (USART.STATUS & (USART_FERR_bm | USART_BUFOVF_bm))) {
@@ -187,8 +188,8 @@ ISR(USART_DRE_Vect)
 {
 	if (CAN_is_controlled() || CAN_is_snooping() || !usb_cdc_is_active(USB_CAN) == true) { //can controller needs to send data
 		CAN_send_data();
-	} 
-	
+	}
+
 	if (usb_cdc_is_active(USB_CAN) == true){  //usb is in control
 		// Data from USB
 		if (udi_cdc_is_rx_ready()) {

From 28eb6c9cc1d9f1ac88b0e1149b90e7a7cf0d149f Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Mon, 13 Mar 2017 10:18:39 -0700
Subject: [PATCH 18/83] Remap LED ports

Leds are mapped to new output compare ports (PORTE, 1, 2, 3).
Though still driven completely by software, future revisions should utilize the Timer0 peripheral to drive the port activity.
---
 V2X_Firmware/src/V2X/V2X_board.h |  8 ++++----
 V2X_Firmware/src/V2X/V2X_led.h   | 11 +++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index c2c95c8..4378f63 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -43,7 +43,7 @@ extern "C" {
 #if V2X_REV == REV_12
 #define LED0_PIN                  IOPORT_CREATE_PIN(PORTB, 0)
 #elif V2X_REV >= REV_20
-#define LED0_PIN                  IOPORT_CREATE_PIN(PORTA, 7)
+#define LED0_PIN                  IOPORT_CREATE_PIN(PORTE, 2)
 #endif
 #define LED0_ACTIVE               true
 #define LED0_INACTIVE             !LED0_ACTIVE
@@ -55,19 +55,19 @@ extern "C" {
 #if V2X_REV == REV_12
 #define LED1_PIN                  IOPORT_CREATE_PIN(PORTA, 6)
 #elif V2X_REV >= REV_20
-#define LED1_PIN                  IOPORT_CREATE_PIN(PORTA, 5)
+#define LED1_PIN                  IOPORT_CREATE_PIN(PORTE, 1)
 #endif
 #define LED1_ACTIVE               true
 #define LED1_INACTIVE             !LED0_ACTIVE
 /** @} */
 
 /** \name LED2 definitions
- *  net: SEQ_LED3 or "GPS" LED
+ *  net: SEQ_LED2 or "GPS" LED
  *  @{ */
 #if V2X_REV == REV_12
 #define LED2_PIN                  IOPORT_CREATE_PIN(PORTA, 7)
 #elif V2X_REV >= REV_20
-#define LED2_PIN                  IOPORT_CREATE_PIN(PORTA, 6)
+#define LED2_PIN                  IOPORT_CREATE_PIN(PORTE, 3)
 #endif
 #define LED2_ACTIVE               true
 #define LED2_INACTIVE             !LED0_ACTIVE
diff --git a/V2X_Firmware/src/V2X/V2X_led.h b/V2X_Firmware/src/V2X/V2X_led.h
index c29ba65..7ea2554 100644
--- a/V2X_Firmware/src/V2X/V2X_led.h
+++ b/V2X_Firmware/src/V2X/V2X_led.h
@@ -9,6 +9,17 @@
 #ifndef V2X_LED_H_
 #define V2X_LED_H_
 
+#if V2X_REV >= REV_20
+/* Revision 2.0:
+ * LED pins have been remapped from the ADC (analog-digital) channel ports to 
+ * OC (output compare). Currently, the pins are driven completely in software, 
+ * on update, which is undesireable and inefficient.
+ * In the future, the LEDs should be driven by using PWM from Timer0, so that 
+ * updates are sent only when necessary, and the LEDs are driven by hardware
+ * peripheral.
+ */
+#endif
+
 /**
  * @def charge_pump_toggle
  * @brief Causes the pin driving the charge pump circuit to toggle state HIGH<>LOW

From 72254aeb9c6149ff460db2d1d92e43aeb022a115 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Mon, 13 Mar 2017 14:15:14 -0700
Subject: [PATCH 19/83] Relegate more to old revision

Move extraneous more defines, inits, and func calls to Rev 1.2.
---
 V2X_Firmware/src/V2X/V2X_board.h | 61 ++++++++++++++++----------------
 V2X_Firmware/src/V2X/V2X_init.c  |  7 ++--
 V2X_Firmware/src/V2X/V2X_uart.c  |  5 ++-
 3 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index 05e194e..4681f37 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -157,6 +157,7 @@ extern "C" {
 #define BUTTON_COUNT 2
 
 
+#if V2X_REV == REV_12
 /* DELETEME: Quite possibly, the whole buffer switcheroo is not needed anymore,
  * can probably eliminate the whole buffer setup
  * */
@@ -183,31 +184,29 @@ extern "C" {
  * specifically by either the FDTI or the Atmel. Revision 2.0 removes the FDTI
  * chip.
  */
-#if V2X_REV == REV_12
-	/**
-	* \name Serial Buffer #1 definitions
-	*
-	* Makes FTDI active communicator with ELM/STN device
-	*
-	*  @{ */
-	#define BUF_1_NAME             "Buffer FTDI Active"
-	#define BUF_1_PIN              BUF1_PIN
-	#define BUF_1_ACTIVE           BUF1_ACTIVE
-	#define BUF_1_INACTIVE         BUF1_INACTIVE
-	/** @} */
-
-	/** \name BUF1 definitions
-	*  @{ */
-	#define BUF1_PIN                   IOPORT_CREATE_PIN(PORTB, 3)
-	#define BUF1_ACTIVE                true
-	#define BUF1_INACTIVE              !BUF1_ACTIVE
-	/** @} */
-
-	/** Number of on-board buttons */
-	/* DELETEME: this can probably just be eliminated */
-	#define BUFFER_COUNT 2
-#elif V2X_REV >= REV_20
-	#define BUFFER_COUNT 1
+/**
+* \name Serial Buffer #1 definitions
+*
+* Makes FTDI active communicator with ELM/STN device
+*
+*  @{ */
+#define BUF_1_NAME             "Buffer FTDI Active"
+#define BUF_1_PIN              BUF1_PIN
+#define BUF_1_ACTIVE           BUF1_ACTIVE
+#define BUF_1_INACTIVE         BUF1_INACTIVE
+/** @} */
+
+/** \name BUF1 definitions
+*  @{ */
+#define BUF1_PIN                   IOPORT_CREATE_PIN(PORTB, 3)
+#define BUF1_ACTIVE                true
+#define BUF1_INACTIVE              !BUF1_ACTIVE
+/** @} */
+
+/** Number of on-board buttons */
+/* DELETEME: this can probably just be eliminated */
+#define BUFFER_COUNT 2
+#define BUFFER_COUNT 1
 #endif
 
 /** \name CP0 definitions
@@ -248,7 +247,6 @@ extern "C" {
 #if V2X_REV <= REV_12
 #define EXT1_PIN_HUB_STATUS                IOPORT_CREATE_PIN(PORTA,4)
 #define EXT1_PIN_HUB_SUSPEND               IOPORT_CREATE_PIN(PORTA,5)
-#elif V2X_REV >= REV_20
 /* DELETEME: HUB_STATUS unnecessary without FTDI in the mix */
 #define EXT1_PIN_HUB_STATUS                IOPORT_CREATE_PIN(PORTA,3)
 #endif
@@ -294,6 +292,7 @@ extern "C" {
 #define TWI_DATA_LENGTH				8
 /** @} */
 
+#if V2X_REV <=	REV_12
 /*DELETEME: These are likely superfluous */
 /** \name Extension header #1 USART definitions
 *  @{
@@ -315,6 +314,7 @@ extern "C" {
  *  @{
  */
 #define EXT1_SPI_MODULE              &SPIC
+#endif
 
 /** @} */
 
@@ -381,14 +381,13 @@ enum power_sequence_outputs {
 #define SR_SPI				&SPIC
 //! @}
 
-/* FIXME: Pin definition comments in following are misleading, code is fine */
 #define  USART					USARTC0
 #define  USART_RX_Vect			USARTC0_RXC_vect
 #define  USART_DRE_Vect			USARTC0_DRE_vect
 #define  USART_SYSCLK			SYSCLK_USART0
 #define  USART_PORT				PORTC
-#define  USART_PORT_PIN_TX		(1<<3)  // PC3 (TXE0)
-#define  USART_PORT_PIN_RX		(1<<2)  // PC2 (RXE0)
+#define  USART_PORT_PIN_TX		(1<<3)  
+#define  USART_PORT_PIN_RX		(1<<2) 
 #define  USART_PORT_SYSCLK		SYSCLK_PORT_C
 
 #define  USART_BAUDRATE			9600
@@ -401,8 +400,8 @@ enum power_sequence_outputs {
 #define  USART_SIM_DRE_Vect     USARTD0_DRE_vect
 #define  USART_SIM_SYSCLK       SYSCLK_USART0
 #define  USART_SIM_PORT         PORTD
-#define  USART_SIM_PORT_PIN_TX  (1<<3)  // PC3 (TXE0)
-#define  USART_SIM_PORT_PIN_RX  (1<<2)  // PC2 (RXE0)
+#define  USART_SIM_PORT_PIN_TX  (1<<3)
+#define  USART_SIM_PORT_PIN_RX  (1<<2)
 #define  USART_SIM_PORT_SYSCLK  SYSCLK_PORT_D
 
 #define  USART_SIM_BAUDRATE		115200
diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 6708372..d232f64 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -11,9 +11,9 @@ uint8_t reset_flags = RESET_NONE;
 
 void pin_init(void)
 {
+#if V2X_REV <= REV_12
 	/* DELETEME: HUB_STATUS unnecessary without FTDI in the mix */
 		ioport_configure_pin(EXT1_PIN_HUB_STATUS			, IOPORT_DIR_INPUT						);
-#if V2X_REV <= REV_12
 		ioport_configure_pin(EXT1_PIN_HUB_SUSPEND			, IOPORT_DIR_INPUT						);	//NON_REM[0] USB hub Boot Strapping option, strapped by resistor
 #endif
 		ioport_configure_pin(EXT1_PIN_HOST_SHORT_CIRCUIT	, IOPORT_DIR_INPUT						);
@@ -59,10 +59,10 @@ void pin_init(void)
 		ioport_configure_pin(BUTTON_0_PIN					, IOPORT_DIR_INPUT   					);
 		ioport_configure_pin(BUTTON_1_PIN					, IOPORT_DIR_INPUT  | IOPORT_PULL_UP	);  //NON_REM[1] USB hub Boot Strapping option
 
+	#if V2X_REV <= REV_12
 /* REV_20: don't use this pin at all, let it default to input */
 		ioport_configure_pin(BUF0_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);	//blocks atmel serial path to CAN through buffer
         /* only use FDTI buffer in previous revision */
-	#if V2X_REV <= REV_12
 		ioport_configure_pin(BUF1_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);	//enables FTDI serial path to CAN through buffer
 	#endif
 
@@ -96,7 +96,10 @@ void v2x_board_init(void)
 	ACL_init();								//configures, but does not start sampling
 	GSM_usart_init();						//starts direct serial channel to the SIM module
 	CAN_uart_start();						//starts direct serial channel to the ELM module
+#if V2X_REV <= REV_12
+	/* Only applies to buffers. Not needed Rev 2.0 */
 	canbus_serial_routing(AVR_ROUTING);		//cause the serial 3-state buffer to route the serial path from the ELM to the FTDI
+#endif
 	udc_start();							//start stack and vbus monitoring
 #if V2X_REV <= REV_12
 	PWR_hub_start();						//connect the hub to the computer
diff --git a/V2X_Firmware/src/V2X/V2X_uart.c b/V2X_Firmware/src/V2X/V2X_uart.c
index 2d9becc..e01b33d 100644
--- a/V2X_Firmware/src/V2X/V2X_uart.c
+++ b/V2X_Firmware/src/V2X/V2X_uart.c
@@ -7,21 +7,20 @@
 
 #include "V2X.h"
 
+#if V2X_REV <= REV_12
 /* DELETEME: Likely get rid of this entirely, like the aforementioned buffer cases */
 void canbus_serial_routing(uint8_t source)
 {
 	gpio_set_pin_low(BUF0_PIN);
 
-#if V2X_REV <= REV_12
 	/* use FTDI by default */
 	gpio_set_pin_low(BUF1_PIN);
 	if		(source == FTDI_ROUTING)	{gpio_set_pin_high(BUF1_PIN);}
 	else  /*(source == AVR_ROUTING)*/	{gpio_set_pin_high(BUF0_PIN);}
-#else
 	/* use Atmel */
 	gpio_set_pin_high(BUF0_PIN);
-#endif
 }
+#endif
 
 void uart_config(uint8_t port, usb_cdc_line_coding_t * cfg)
 {

From e9445e0ab8ce0ed6d78c6d784c2e03300f242ed4 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 14 Mar 2017 10:40:32 -0700
Subject: [PATCH 20/83] rev-power: create and init 3 volt power pin

Map new pin for 3v power manipulation.
3v power is intended for use when 4v is disabled. Please do not operate with both enabled.
Enable both together briefly only when switching from 4v to 3v to keep CPU alive.
---
 V2X_Firmware/src/V2X/V2X_board.h | 13 +++++++++++--
 V2X_Firmware/src/V2X/V2X_init.c  |  2 ++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index 4681f37..3151bd7 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -37,6 +37,15 @@ extern "C" {
 #endif
 /** @} */
 
+/** \name 3v3 power pin definition
+ * Activate to maintain power to CPU
+ */
+#if V2X_REV >= REV_20
+#define PWR_3V3_PIN				  IOPORT_CREATE_PIN(PORTA, 4)
+#define PWR_3V3_ACTIVE			  true
+#define PWR_3V3_INACTIVE		  !3V3_ACTIVE
+#endif
+
 /** \name LED0 definitions
  *  net: SEQ_LED3 or "PWR" LED
  *  @{ */
@@ -386,8 +395,8 @@ enum power_sequence_outputs {
 #define  USART_DRE_Vect			USARTC0_DRE_vect
 #define  USART_SYSCLK			SYSCLK_USART0
 #define  USART_PORT				PORTC
-#define  USART_PORT_PIN_TX		(1<<3)  
-#define  USART_PORT_PIN_RX		(1<<2) 
+#define  USART_PORT_PIN_TX		(1<<3)
+#define  USART_PORT_PIN_RX		(1<<2)
 #define  USART_PORT_SYSCLK		SYSCLK_PORT_C
 
 #define  USART_BAUDRATE			9600
diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index d232f64..ba04140 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -72,6 +72,8 @@ void pin_init(void)
 		 */
 		ioport_configure_pin(CHARGEPUMP_0_PIN				, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);
 	#endif
+	/* 3v3 pin init, low by default... */
+	ioport_configure_pin(PWR_3V3_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);
 }
 
 /* This function is meant to contain board-specific initialization code

From 2d343ae858c6f0b036b60c280c29e9947e9e3c82 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Wed, 15 Mar 2017 10:43:28 -0700
Subject: [PATCH 21/83] Add power manipulation revision compatability support

Adds new control options to power and menu allowing for explicit operation of 4v and 3v supplies.
It is critical that 4v and 3v are not enabled simultaneously, or for as little together as possible.
Therefore, 4v manipulation will explicitly check and manipulate 3v for exclusion. 3v is necessary to keep the CPU alive.

Currently, the board power supplies, capacitors and configuration should allow for enough time that the handoff between 4v and 3v can be done exclusively, ie that one can be disabled safely and there should be sufficient residual power for a window to turn the other on.
This has not been tested, and will need to be verified on the prototype.
---
 V2X_Firmware/src/V2X/V2X_menu.c  |  21 ++++++
 V2X_Firmware/src/V2X/V2X_power.c | 111 ++++++++++++++++++++++++++++++-
 V2X_Firmware/src/V2X/V2X_power.h |  39 +++++++++++
 3 files changed, 169 insertions(+), 2 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_menu.c b/V2X_Firmware/src/V2X/V2X_menu.c
index 8d9bb35..297d064 100644
--- a/V2X_Firmware/src/V2X/V2X_menu.c
+++ b/V2X_Firmware/src/V2X/V2X_menu.c
@@ -330,8 +330,12 @@ void menu_power (void) {
 		 * rather than setting bits directly here
 		 */
 			usb_tx_string_PV(PSTR("Disabling 4V supply"));
+#if V2X_REV <= REV_12
 			PWR_turn_off((1<<ENABLE_4V1)|(1<<ENABLE_SIM_RESET));
 			PWR_push();
+#elif V2X_REV >= REV_20
+			PWR_4_stop();
+#endif
 			break;
 		case '5':  //5v
 			usb_tx_string_PV(PSTR("Disabling 5V supply"));
@@ -339,11 +343,20 @@ void menu_power (void) {
 			PWR_push();
 			break;
 		case 'h':  //host
+		/* FIXME: Menu should not be calling power state bit manipulation directly
+		 * Manipulation of the host should be abstracted for both enable and disable
+		 * cases.
+		 */
 			usb_tx_string_PV(PSTR("Disabling Host power supply"));
 			PWR_turn_off((1<<ENABLE_5V0B));
 			PWR_is_5_needed();
 			break;
+#if V2X_REV >= REV_20
 /* FIXME: add total shutdown case. suicide all power supplies */
+		case 'a': // disable all. shutdown.
+			PWR_shutdown();
+			break;
+#endif
 		default:
 			menu_send_q();
 			break;
@@ -360,8 +373,12 @@ void menu_power (void) {
 #endif
 		case '4':  //4v
 			usb_tx_string_PV(PSTR("Enabling 4V supply"));
+#if V2X_REV <= REV_12
 			PWR_turn_on((1<<ENABLE_4V1));
 			PWR_push();
+#elif V2X_REV >= REV_20
+			PWR_4_start();
+#endif
 			break;
 		case '5':  //5v
 			usb_tx_string_PV(PSTR("Enabling 5V supply"));
@@ -369,6 +386,10 @@ void menu_power (void) {
 			PWR_push();
 			break;
 		case 'h':  //host
+		/* FIXME: Menu should not be calling power state bit manipulation directly
+		 * Manipulation of the host should be abstracted for both enable and disable
+		 * cases.
+		 */
 			usb_tx_string_PV(PSTR("Enabling Host power supply"));
 			PWR_turn_on((1<<ENABLE_5V0B));
 			PWR_push();
diff --git a/V2X_Firmware/src/V2X/V2X_power.c b/V2X_Firmware/src/V2X/V2X_power.c
index 9f21adf..138ea05 100644
--- a/V2X_Firmware/src/V2X/V2X_power.c
+++ b/V2X_Firmware/src/V2X/V2X_power.c
@@ -10,10 +10,20 @@
 
 void PWR_init(void)
 {
-	/*FIXME: Need to drive high 3v3_EN signal here */
+#if V2X_REV >= REV_20
+
+	/* Need to drive high 3v3_EN signal here, to ensure CPU operation.
+	 * A later check will turn off 3v if we have chosen to enable 4v
+	 */
+	PWR_3_start();
+	#endif
 	PWR_clear();							// Clear shift register
 	PWR_latch();							// Latch all internal registers to output
 	power_control_state = POWER_CONTROL_DEFAULT_VALUE;
+	#if V2X_REV >= REV_20
+	/* Additional check, if 4v was enabled by default config, please disable 3v */
+	PWR_3_is_needed();
+	#endif
 	PWR_push();		//update shift register state
 	delay_ms(100);				//allow power to stabilize
 }
@@ -76,6 +86,86 @@ void PWR_hub_stop(void){
 }
 #endif
 
+#if V2X_REV >= REV_20
+/* 3 volt power pin manipulation
+ * Use with caution! 3v should only be enabled when not using 4v
+ * When transitioning to 3v power only, enable 3v immediately before disabling
+ * 4v.
+ */
+void PWR_3_start(void) {
+	/* TODO:
+	 * Set 3v3 pin high
+	 */
+	gpio_set_pin_high(PWR_3V3_PIN);
+}
+
+/* 3 volt power pin manipulation
+ * Use with caution! Please disable 3v immediately after enabling 4v.
+ * Disabling 3v AND 4v will result in power loss to CPU. V2X system will
+ * require manual restart.
+ */
+
+void PWR_3_stop(void) {
+	/* TODO:
+	 * Set 3v3 pin low
+	 */
+	gpio_set_pin_low(PWR_3V3_PIN);
+}
+
+void PWR_3_is_needed(void) {
+	/* Check to see if 3v should be switched off due to 4v being enabled */
+	if (power_control_state & (1<<ENABLE_4V1))
+	{
+		PWR_3_stop();
+	}
+}
+
+void PWR_4_start(void) {
+	/* TODO:
+	 * drop 3v pin
+	 * Enable 4v
+	 * push new config
+	 * wait for power to stabilize
+	 */
+	PWR_3_stop();
+	PWR_turn_on(1<<ENABLE_4V1);
+	PWR_push();
+}
+
+void PWR_4_stop(void) {
+	/* TODO:
+	 * (wait 3us?)
+	 * disable 4v
+	 * push new config
+	 * Enable 3v pin, to keep atmel alive
+	 */
+	PWR_turn_off((1<<ENABLE_SIM_RESET)|(1<<ENABLE_4V1));
+	PWR_push();
+	PWR_3_start();
+}
+
+/* FIXME: Kill case. Kill all power without holding 3v. This is the suicide case for
+ * manual restart
+ */
+
+void PWR_shutdown(void) {
+	/* TODO
+	 * this really will kill all power, because we mean to.
+	 */
+	PWR_turn_off((1<<ENABLE_4V1)|        \
+				 (1<<ENABLE_5V0)|        \
+				 (1<<ENABLE_5V0B)|       \
+				 (1<<ENABLE_CAN_SLEEP)|  \
+				 (1<<ENABLE_CAN_RESET)|  \
+				 (1<<ENABLE_SIM_PWR_ON)| \
+				 (1<<ENABLE_SIM_RESET)|  \
+				 (1<<ENABLE_SIM_WAKE));
+	PWR_push();
+	PWR_3_stop();
+}
+
+#endif
+
 void PWR_host_start(void) {
 	PWR_turn_on((1<<ENABLE_5V0B));
 	PWR_is_5_needed();
@@ -95,7 +185,9 @@ void PWR_is_5_needed (void) { //turn off 5v0 if host and can are off
 	PWR_push();
 }
 
-/* FIXME: Add similar logical checks for 4v1 vs 3v3 power controls */
+/* FIXME: Add similar logical checks for 4v1 vs 3v3 power controls
+ * power_is_4_needed, power_is_3_needed
+ */
 
 void PWR_can_stop (void) {
 	PWR_turn_off((1<<ENABLE_CAN_RESET));
@@ -109,13 +201,28 @@ void PWR_can_start (void) {
 };
 
 void PWR_gsm_stop(void) {
+	/* FIXME: Instead of calling power settings directly, call for power enabled
+	 * required, something along the lines of the power_is_4_needed
+	 */
+#if V2X_REV <= REV_12
 	PWR_turn_off((1<<ENABLE_SIM_RESET)|(1<<ENABLE_4V1));
+#elif V2X_REV >= REV_20
+	PWR_turn_off(1<<ENABLE_SIM_RESET);
+#endif
 	PWR_push();
 }
 
 void PWR_gsm_start(void) {
+	/* FIXME: Instead of calling power settings directly, call for power enabled
+	 * required, something along the lines of the power_is_4_needed
+	 */
+#if V2X_REV <= REV_12
 	PWR_turn_on((1<<ENABLE_SIM_RESET)|(1<<ENABLE_4V1));  //release the reset
 	PWR_push();
+#elif V2X_REV >= REV_20
+	PWR_turn_on(1<<ENABLE_SIM_RESET);
+	PWR_4_start();
+#endif
 	delay_ms(100);							//let power come up
 	PWR_turn_on((1<<ENABLE_SIM_PWR_ON));
 	PWR_push();
diff --git a/V2X_Firmware/src/V2X/V2X_power.h b/V2X_Firmware/src/V2X/V2X_power.h
index 67c8ca2..1a5503a 100644
--- a/V2X_Firmware/src/V2X/V2X_power.h
+++ b/V2X_Firmware/src/V2X/V2X_power.h
@@ -120,6 +120,45 @@ void PWR_hub_start(void);
 void PWR_hub_stop(void);
 #endif
 
+#if V2X_REV >= REV_20
+/**
+ * @def PWR_3_start
+ * @brief enable 3v pin
+ */
+void PWR_3_start(void);
+
+/**
+ * @def PWR_3_stop
+ * @brief disable 3v pin
+ */
+void PWR_3_stop(void);
+
+/**
+ * @def PWR_3_is_needed
+ * @brief check if 3v pin should be disabled
+ */
+void PWR_3_is_needed(void);
+
+/**
+ * @def PWR_4_start
+ * @brief Enable 4v power supply, disabling 3v pin
+ */
+void PWR_4_start(void);
+
+/**
+ * @def PWR_4_stop
+ * @brief Disable 4v power supply, after enabling 3v pin to keep CPU alive
+ */
+void PWR_4_stop(void);
+
+/**
+ * @def PWR_shutdown
+ * @brief Disable all power. Manual restart of board required.
+ */
+void PWR_shutdown(void);
+
+#endif
+
 /**
  * @def PWR_is_5_needed
  * @brief turns off 5v rail if unused

From 1c7bff951704859ab84c98b3ea2e4f97714013c3 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Wed, 22 Mar 2017 11:39:43 -0700
Subject: [PATCH 22/83] typo and formatting adjustments for board definitions

---
 V2X_Firmware/src/V2X/V2X_board.h | 35 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index 3151bd7..e105039 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -41,18 +41,18 @@ extern "C" {
  * Activate to maintain power to CPU
  */
 #if V2X_REV >= REV_20
-#define PWR_3V3_PIN				  IOPORT_CREATE_PIN(PORTA, 4)
+#define PWR_3V3_PIN				  IOPORT_CREATE_PIN(PORTA,4)
 #define PWR_3V3_ACTIVE			  true
-#define PWR_3V3_INACTIVE		  !3V3_ACTIVE
+#define PWR_3V3_INACTIVE		  !PWR_3V3_ACTIVE
 #endif
 
 /** \name LED0 definitions
  *  net: SEQ_LED3 or "PWR" LED
  *  @{ */
-#if V2X_REV == REV_12
-	#define LED0_PIN                  IOPORT_CREATE_PIN(PORTB, 0)
+#if V2X_REV <= REV_12
+#define LED0_PIN                  IOPORT_CREATE_PIN(PORTB,0)
 #elif V2X_REV >= REV_20
-#define LED0_PIN                  IOPORT_CREATE_PIN(PORTE, 2)
+#define LED0_PIN                  IOPORT_CREATE_PIN(PORTE,2)
 #endif
 #define LED0_ACTIVE               true
 #define LED0_INACTIVE             !LED0_ACTIVE
@@ -61,10 +61,10 @@ extern "C" {
 /** \name LED1 definitions
  *  net: SEQ_LED1 or "M2M" LED
  *  @{ */
-#if V2X_REV == REV_12
-	#define LED1_PIN                  IOPORT_CREATE_PIN(PORTA, 6)
+#if V2X_REV <= REV_12
+#define LED1_PIN                  IOPORT_CREATE_PIN(PORTA,6)
 #elif V2X_REV >= REV_20
-#define LED1_PIN                  IOPORT_CREATE_PIN(PORTE, 1)
+#define LED1_PIN                  IOPORT_CREATE_PIN(PORTE,1)
 #endif
 #define LED1_ACTIVE               true
 #define LED1_INACTIVE             !LED0_ACTIVE
@@ -73,10 +73,10 @@ extern "C" {
 /** \name LED2 definitions
  *  net: SEQ_LED2 or "GPS" LED
  *  @{ */
-#if V2X_REV == REV_12
-	#define LED2_PIN                  IOPORT_CREATE_PIN(PORTA, 7)
+#if V2X_REV <= REV_12
+#define LED2_PIN                  IOPORT_CREATE_PIN(PORTA,7)
 #elif V2X_REV >= REV_20
-#define LED2_PIN                  IOPORT_CREATE_PIN(PORTE, 3)
+#define LED2_PIN                  IOPORT_CREATE_PIN(PORTE,3)
 #endif
 #define LED2_ACTIVE               true
 #define LED2_INACTIVE             !LED0_ACTIVE
@@ -127,7 +127,7 @@ extern "C" {
 
 /** \name SW0 definitions
  *  @{ */
-#define SW0_PIN                   IOPORT_CREATE_PIN(PORTA, 0)
+#define SW0_PIN                   IOPORT_CREATE_PIN(PORTA,0)
 #define SW0_ACTIVE                true
 #define SW0_INACTIVE              !SW0_ACTIVE
 /** @} */
@@ -146,7 +146,7 @@ extern "C" {
 
 /** \name SW1 definitions
  *  @{ */
-#define SW1_PIN                   IOPORT_CREATE_PIN(PORTD, 5)
+#define SW1_PIN                   IOPORT_CREATE_PIN(PORTD,5)
 #define SW1_ACTIVE                FALSE
 #define SW1_INACTIVE              !SW1_ACTIVE
 /** @} */
@@ -184,7 +184,7 @@ extern "C" {
 
 /** \name BUF0 definitions
  *  @{ */
-#define BUF0_PIN                   IOPORT_CREATE_PIN(PORTB, 2)
+#define BUF0_PIN                   IOPORT_CREATE_PIN(PORTB,2)
 #define BUF0_ACTIVE                true
 #define BUF0_INACTIVE              !BUF0_ACTIVE
 /** @} */
@@ -207,7 +207,7 @@ extern "C" {
 
 /** \name BUF1 definitions
 *  @{ */
-#define BUF1_PIN                   IOPORT_CREATE_PIN(PORTB, 3)
+#define BUF1_PIN                   IOPORT_CREATE_PIN(PORTB,3)
 #define BUF1_ACTIVE                true
 #define BUF1_INACTIVE              !BUF1_ACTIVE
 /** @} */
@@ -220,7 +220,7 @@ extern "C" {
 
 /** \name CP0 definitions
  *  @{ */
-#define CP0_PIN                   IOPORT_CREATE_PIN(PORTA, 1)
+#define CP0_PIN                   IOPORT_CREATE_PIN(PORTA,1)
 #define CP0_ACTIVE                true
 #define CP0_INACTIVE              !CP0_ACTIVE
 /** @} */
@@ -257,8 +257,8 @@ extern "C" {
 #define EXT1_PIN_HUB_STATUS                IOPORT_CREATE_PIN(PORTA,4)
 #define EXT1_PIN_HUB_SUSPEND               IOPORT_CREATE_PIN(PORTA,5)
 /* DELETEME: HUB_STATUS unnecessary without FTDI in the mix */
-#define EXT1_PIN_HUB_STATUS                IOPORT_CREATE_PIN(PORTA,3)
 #endif
+#define EXT1_PIN_HUB_STATUS                IOPORT_CREATE_PIN(PORTA,3)
 #define EXT1_PIN_HOST_SHORT_CIRCUIT        IOPORT_CREATE_PIN(PORTB,1)
 #define EXT1_PIN_SR_CLEAR                  IOPORT_CREATE_PIN(PORTC,0)
 #define EXT1_PIN_SR_LATCH                  IOPORT_CREATE_PIN(PORTC,1)
@@ -283,6 +283,7 @@ extern "C" {
 #define EXT1_PIN_SIM_PWR                   IOPORT_CREATE_PIN(PORTD,4)
 #define EXT1_PIN_SEQ_RXD                   IOPORT_CREATE_PIN(PORTD,6) //RX SIGNAL (PORT D RXD1) FROM FTDI MODULE FOR SEQ AT INTERFACE, ALSO USB DM
 #define EXT1_PIN_SEQ_TXD                   IOPORT_CREATE_PIN(PORTD,7) //TX SIGNAL (PORT D TXD1) TO FTDI MODULE FOR SEQ AT INTERFACE, ALSO USB DP
+/* FIXME: Add definition for HUB_PWR_PRT1 pin, on PORTA,3 ?? */
 /** @} */
 
 /* FIXME: Is the following TWI definition incorrect, or irrelevant?

From 585117877e4e440d1d8cda9c3dc96c9a28491760 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Wed, 22 Mar 2017 11:41:32 -0700
Subject: [PATCH 23/83] led logic inverted in revision 2.0

led pins low to activate.
This allows for the on/off function calls to remain consistent and abstracted
---
 V2X_Firmware/src/V2X/V2X_led.h | 51 ++++++++++++++++++++++++++++++----
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_led.h b/V2X_Firmware/src/V2X/V2X_led.h
index 0b20e73..1aa5595 100644
--- a/V2X_Firmware/src/V2X/V2X_led.h
+++ b/V2X_Firmware/src/V2X/V2X_led.h
@@ -3,7 +3,7 @@
  *
  * Created: 2/12/2016 11:02:14 AM
  *  Author: jbanks2
- */ 
+ */
 
 
 #ifndef V2X_LED_H_
@@ -11,10 +11,10 @@
 
 #if V2X_REV >= REV_20
 /* Revision 2.0:
- * LED pins have been remapped from the ADC (analog-digital) channel ports to 
- * OC (output compare). Currently, the pins are driven completely in software, 
+ * LED pins have been remapped from the ADC (analog-digital) channel ports to
+ * OC (output compare). Currently, the pins are driven completely in software,
  * on update, which is undesireable and inefficient.
- * In the future, the LEDs should be driven by using PWM from Timer0, so that 
+ * In the future, the LEDs should be driven by using PWM from Timer0, so that
  * updates are sent only when necessary, and the LEDs are driven by hardware
  * peripheral.
  */
@@ -28,6 +28,7 @@
 inline static void charge_pump_toggle(void) {gpio_toggle_pin(CHARGEPUMP_0_PIN); }
 #endif
 
+#if V2X_REV <= REV_12
 /**
  * @def led_0_on
  * @brief Causes the pin driving the RED POWER LED to turn ON
@@ -38,7 +39,7 @@ inline static void led_0_on		(void) {gpio_set_pin_high(LED_0_PIN);	}
  * @def led_0_off
  * @brief Causes the pin driving the RED POWER LED to turn OFF
  **/
-inline static void led_0_off	(void) {gpio_set_pin_low(LED_0_PIN);	}		  
+inline static void led_0_off	(void) {gpio_set_pin_low(LED_0_PIN);	}
 
 /**
  * @def led_1_on
@@ -64,6 +65,46 @@ inline static void led_2_on		(void) {gpio_set_pin_high(LED_2_PIN);	}
  **/
 inline static void led_2_off	(void) {gpio_set_pin_low(LED_2_PIN);	}
 
+#elif V2X_REV >= REV_20
+
+/**
+ * @def led_0_on
+ * @brief Causes the pin driving the RED POWER LED to turn ON
+ **/
+inline static void led_0_on		(void) {gpio_set_pin_low(LED_0_PIN);	}
+
+/**
+ * @def led_0_off
+ * @brief Causes the pin driving the RED POWER LED to turn OFF
+ **/
+inline static void led_0_off	(void) {gpio_set_pin_high(LED_0_PIN);	}
+
+/**
+ * @def led_1_on
+ * @brief Causes the pin driving the GREEN GSM LED to turn ON
+ **/
+inline static void led_1_on		(void) {gpio_set_pin_low(LED_1_PIN);	}
+
+/**
+ * @def led_1_off
+ * @brief Causes the pin driving the GREEN GSM LED to turn OFF
+ **/
+inline static void led_1_off	(void) {gpio_set_pin_high(LED_1_PIN);	}
+
+/**
+ * @def led_2_on
+ * @brief Causes the pin driving the BLUE GPS LED to turn ON
+ **/
+inline static void led_2_on		(void) {gpio_set_pin_low(LED_2_PIN);	}
+
+/**
+ * @def led_2_off
+ * @brief Causes the pin driving the BLUE GPS LED to turn OFF
+ **/
+inline static void led_2_off	(void) {gpio_set_pin_high(LED_2_PIN);	}
+
+#endif
+
 /**
  * @def led_update
  * @brief Updates the leds

From d7e7ba8b4919054597346ca799a5cc8718b75ac1 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Wed, 22 Mar 2017 11:47:08 -0700
Subject: [PATCH 24/83] (temp commit) disable init functions that appear to
 affect startup adversely

This is a collection of notes to fix items that have been disabled temporarily that were preventing the board from starting, and in some cases appear to be restarting.
Each of these items will have to be addressed, and analyzed against this revision 2.0, in particular:
- sleep manager (sleepmgr_enter_sleep())
- reset_processor()
- button_init() and button_service()

Additionally:
- GSM_modem_init()
-CAN_elm_init()
have been disabled while troubleshooting the power issues. We are unable to determine yet why the shift register seems to not be honoring the bits to turn on the 5v power.
---
 V2X_Firmware/src/V2X/V2X_init.c | 20 +++++++++++++++++---
 V2X_Firmware/src/main.c         | 10 +++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index b48e4cc..88f83a0 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -16,6 +16,7 @@ void pin_init(void)
 		ioport_configure_pin(EXT1_PIN_HUB_STATUS			, IOPORT_DIR_INPUT						);
 		ioport_configure_pin(EXT1_PIN_HUB_SUSPEND			, IOPORT_DIR_INPUT						);	//NON_REM[0] USB hub Boot Strapping option, strapped by resistor
 #endif
+		ioport_configure_pin(EXT1_PIN_HUB_STATUS			, IOPORT_DIR_INPUT						);
 		ioport_configure_pin(EXT1_PIN_HOST_SHORT_CIRCUIT	, IOPORT_DIR_INPUT						);
 
 		ioport_configure_pin(EXT1_PIN_CAN_TXD				, IOPORT_DIR_INPUT						);
@@ -52,9 +53,17 @@ void pin_init(void)
 		ioport_configure_pin(EXT1_PIN_SEQ_RXD				, IOPORT_DIR_INPUT						);
 		ioport_configure_pin(EXT1_PIN_SEQ_TXD				, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);
 
+#if 1
+//high here turns leds off because of inverse logic in rev 2.0
+		ioport_configure_pin(LED_0_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);
+		ioport_configure_pin(LED_1_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);
+		ioport_configure_pin(LED_2_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);
+#endif
+#if 0
 		ioport_configure_pin(LED_0_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);
 		ioport_configure_pin(LED_1_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);
 		ioport_configure_pin(LED_2_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);
+#endif
 
 		ioport_configure_pin(BUTTON_0_PIN					, IOPORT_DIR_INPUT   					);
 		ioport_configure_pin(BUTTON_1_PIN					, IOPORT_DIR_INPUT  | IOPORT_PULL_UP	);  //NON_REM[1] USB hub Boot Strapping option
@@ -74,7 +83,11 @@ void pin_init(void)
 	#endif
 #if V2X_REV >= REV_20
 	/* 3v3 pin init, low by default... */
+	#if 1
 	ioport_configure_pin(PWR_3V3_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);
+	#else
+	ioport_configure_pin(PWR_3V3_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);
+	#endif
 #endif
 
 }
@@ -97,7 +110,8 @@ void v2x_board_init(void)
 	eeprom_init();							//verifies eeprom safe for use
 	menu_init();							//loads menu settings
 	time_init();							//starts the RTC
-	button_init();							//init button stuffs
+	// FIXME: bug ? : Doesn't seem to allow past button check, disabling this allows for continuation
+	//button_init();							//init button stuffs
 	ACL_init();								//configures, but does not start sampling
 	GSM_usart_init();						//starts direct serial channel to the SIM module
 	CAN_uart_start();						//starts direct serial channel to the ELM module
@@ -112,8 +126,8 @@ void v2x_board_init(void)
 
 	//autostart all systems
 	delay_ms(500);
-	GSM_modem_init();
-	CAN_elm_init();
+	// GSM_modem_init();
+	// CAN_elm_init();
 	ACL_set_sample_on();
 	PWR_host_start();
 }
diff --git a/V2X_Firmware/src/main.c b/V2X_Firmware/src/main.c
index b495b33..987b407 100644
--- a/V2X_Firmware/src/main.c
+++ b/V2X_Firmware/src/main.c
@@ -32,12 +32,14 @@ int main ()
 	v2x_board_init();	//configure pins and initial safe condition
 
 	while (1){
-		sleepmgr_enter_sleep();		//go to sleep until interrupt
+		//sleepmgr_enter_sleep();		//go to sleep until interrupt
 		#if V2X_REV <= REV_12
 			charge_pump_toggle();		//charge pump pin needs toggled to create boost voltage for LEDs
 		#endif
-		reset_processor();			//look for pending resets
-		button_service();			//SCAN and report the button 
+		//FIXME: bug here of some kind, sleep/or wd might be resetting proc
+		//reset_processor();			//look for pending resets
+		// FIXME: BUG HERE  not allowing progress past button check
+		//button_service();			//SCAN and report the button
 		#if V2X_REV <= REV_12
 			charge_pump_toggle();		//charge pump pin needs toggled to create boost voltage for LEDs
 		#endif
@@ -52,5 +54,7 @@ int main ()
 		#if V2X_REV <= REV_12
 			charge_pump_toggle();		//charge pump pin needs toggled to create boost voltage for LEDs
 		#endif
+		//use leds for debugging
+		led_update();
 	}
 }

From 4036961fa8fa8fa1ea4d7aafc866932f1e34e1e6 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 24 Mar 2017 16:35:23 -0700
Subject: [PATCH 25/83] (temp commit)

Further troubleshooting. Reenabled most things, actually.
Inconsistent operation.
SIMCOM chip not responding.
blarg
Created a bunch of junk for printing out the usb transmissions. Should delete that in the future.
---
 V2X_Firmware/src/V2X/V2X_init.c  |  4 +--
 V2X_Firmware/src/V2X/V2X_menu.c  | 45 +++++++++++++++++++++++++++++++-
 V2X_Firmware/src/V2X/V2X_power.c |  8 +++---
 V2X_Firmware/src/V2X/V2X_uart.c  |  5 ++++
 V2X_Firmware/src/main.c          |  6 ++---
 5 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 88f83a0..1197d7e 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -126,8 +126,8 @@ void v2x_board_init(void)
 
 	//autostart all systems
 	delay_ms(500);
-	// GSM_modem_init();
-	// CAN_elm_init();
+	GSM_modem_init();
+	CAN_elm_init();
 	ACL_set_sample_on();
 	PWR_host_start();
 }
diff --git a/V2X_Firmware/src/V2X/V2X_menu.c b/V2X_Firmware/src/V2X/V2X_menu.c
index 297d064..b5dc6b6 100644
--- a/V2X_Firmware/src/V2X/V2X_menu.c
+++ b/V2X_Firmware/src/V2X/V2X_menu.c
@@ -17,20 +17,63 @@ void menu_init(void) {
 }
 
 void menu_add_to_command(char value) {
+#if 0
+	usb_tx_string_P(PSTR("menu add got char: \r"));
+	usb_cdc_send_byte(USB_CMD, value);
+#endif
 	if (value == 8 || value == 0x7f) {//if backspace or delete
 		int leng = strlen(CMD_buffer); //get buffer sting length
 		if (leng > 0) {	//if length not 0
 			CMD_buffer[leng-1] = '\0';	//null out the last char
 		}
 	} else if (value > 0x20 && value < 0x7E ) {		//if in ascii set
-		strcat(CMD_buffer, &value);					//store to buffer
+#if 0
+		usb_tx_string_P(PSTR("About to concat this char into cmd buffer: \r"));
+		usb_cdc_send_byte(USB_CMD, value);
+#endif
+		char char_str[2] = {'?','\0'};
+		char_str[0] = value;
+		strcat(CMD_buffer, char_str);					//store to buffer
+#if 0
+		// DELETEME: sanity check on strcat function
+		// strcat(CMD_buffer, "X");
+		// strcat(CMD_buffer, 0x25);
+		// DELETEME: print what is going to be added to the command
+		usb_tx_string_P(PSTR("Added character to command, here is the new buffer: \r"));
+
+
+		// force lookup?
+		char* cmd_temp_ptr = CMD_buffer;
+		char temp_char = CMD_buffer[1];
+		//print new buffer we just augmented
+		for (int i = 0; i < 15; i++)
+		{
+			usb_cdc_send_byte(USB_CMD, CMD_buffer[i]);
+		}
+#endif
+
 	}
 }
 
 void menu_main(void) {
+#if 0
+	// DELETEME: printing raw command received
+	usb_tx_string_P(PSTR("MENU GOT COMMAND RAW: \r"));
+	for (int i = 0; i < 15; i++)
+	{
+		usb_cdc_send_byte(USB_CMD, CMD_buffer[i]);
+	}
+#endif
 	for(int i = 0; i < 4; i++){
 		CMD_buffer[i] = tolower(CMD_buffer[i]);
 	}
+#if 0
+	// DELETEME: /* reprint buffer for testing */
+	usb_tx_string_P(PSTR("Got command: \r"));
+	for(int i = 0; i < 10; i++){
+		usb_cdc_send_byte(USB_CMD, CMD_buffer[i]);
+	}
+#endif
 	if (CMD_buffer[0] == 'v' && CMD_buffer[1] == 'x') {
 		switch(CMD_buffer[2]) {
 			case 'i': //information
diff --git a/V2X_Firmware/src/V2X/V2X_power.c b/V2X_Firmware/src/V2X/V2X_power.c
index 138ea05..9f5f380 100644
--- a/V2X_Firmware/src/V2X/V2X_power.c
+++ b/V2X_Firmware/src/V2X/V2X_power.c
@@ -10,12 +10,12 @@
 
 void PWR_init(void)
 {
-#if V2X_REV >= REV_20
+	#if V2X_REV >= REV_20
 
 	/* Need to drive high 3v3_EN signal here, to ensure CPU operation.
 	 * A later check will turn off 3v if we have chosen to enable 4v
 	 */
-	PWR_3_start();
+	PWR_3_start(); 
 	#endif
 	PWR_clear();							// Clear shift register
 	PWR_latch();							// Latch all internal registers to output
@@ -226,7 +226,9 @@ void PWR_gsm_start(void) {
 	delay_ms(100);							//let power come up
 	PWR_turn_on((1<<ENABLE_SIM_PWR_ON));
 	PWR_push();
-	delay_ms(150);							//let chip detect
+	//adjusting power wait due to manual for simchip
+	//delay_ms(150);							//let chip detect
+	delay_ms(550);
 	PWR_turn_off((1<<ENABLE_SIM_PWR_ON));
 	PWR_push();					//clear the start bit
 }
diff --git a/V2X_Firmware/src/V2X/V2X_uart.c b/V2X_Firmware/src/V2X/V2X_uart.c
index e01b33d..d9712aa 100644
--- a/V2X_Firmware/src/V2X/V2X_uart.c
+++ b/V2X_Firmware/src/V2X/V2X_uart.c
@@ -117,6 +117,11 @@ void uart_rx_notify(uint8_t port) //message received over USB
 	}else if (port == USB_CMD) {
 		while (udi_cdc_multi_is_rx_ready(port)) {  //is there data
  			data = udi_cdc_multi_getc(port);	//get 1 char of data
+#if 0
+			// DELETEME: // DEBUG: printing data as it comes
+			usb_cdc_send_byte(port, data);
+			usb_tx_string_P(PSTR("\r"));
+#endif
 // 			if (data == '?'						//allow '?'
 // 			||  data == '-'						//minus sign
 // 			||  data == '+'						//plus
diff --git a/V2X_Firmware/src/main.c b/V2X_Firmware/src/main.c
index 987b407..eebc5fd 100644
--- a/V2X_Firmware/src/main.c
+++ b/V2X_Firmware/src/main.c
@@ -32,12 +32,12 @@ int main ()
 	v2x_board_init();	//configure pins and initial safe condition
 
 	while (1){
-		//sleepmgr_enter_sleep();		//go to sleep until interrupt
+		sleepmgr_enter_sleep();		//go to sleep until interrupt
 		#if V2X_REV <= REV_12
 			charge_pump_toggle();		//charge pump pin needs toggled to create boost voltage for LEDs
 		#endif
 		//FIXME: bug here of some kind, sleep/or wd might be resetting proc
-		//reset_processor();			//look for pending resets
+		reset_processor();			//look for pending resets
 		// FIXME: BUG HERE  not allowing progress past button check
 		//button_service();			//SCAN and report the button
 		#if V2X_REV <= REV_12
@@ -54,7 +54,5 @@ int main ()
 		#if V2X_REV <= REV_12
 			charge_pump_toggle();		//charge pump pin needs toggled to create boost voltage for LEDs
 		#endif
-		//use leds for debugging
-		led_update();
 	}
 }

From 36a1ed177c6a1a96ee1c8a77067c895319a31f86 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 28 Mar 2017 08:52:34 -0700
Subject: [PATCH 26/83] BUGFIX! Major issue  in power control

Wow, how embarrassing! Passing a value to a funciton that expects a pointer will result in unexpected consequences! Rookie mistake!
Anyway, this fixes most major issues with power control and allows the correct byte to be sent to the shift register.
---
 V2X_Firmware/src/V2X/V2X_power.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/V2X_Firmware/src/V2X/V2X_power.c b/V2X_Firmware/src/V2X/V2X_power.c
index 9f5f380..085152e 100644
--- a/V2X_Firmware/src/V2X/V2X_power.c
+++ b/V2X_Firmware/src/V2X/V2X_power.c
@@ -56,7 +56,7 @@ void PWR_push(void) {  //uses shift_register_state to update the shift register
 	/* We should be able to send the single byte to the single shift register,
 	 * as long as the bit order has been respected.
 	 */
-	spi_write_packet(SR_SPI, power_control_state, 1);
+	spi_write_packet(SR_SPI, &power_control_state, 1);
 #endif
 	PWR_latch();
 }

From d347b0e87baf55e914406cda62a9db0c8d72eac5 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 28 Mar 2017 16:12:06 -0700
Subject: [PATCH 27/83] Hold Simcom power pin longer for start

Procedure required by new 7100a. Future versions should introduce compile time branches for operating the chips differently/optimally
---
 V2X_Firmware/src/V2X/V2X_init.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 1197d7e..ad1081a 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -163,7 +163,9 @@ void reset_processor(void) {
 			menu_send_CTL();
 			usb_tx_string_P(PSTR("GSM restarting\r>"));
 			PWR_gsm_stop();
-			delay_ms(100);
+			// delay_ms(100);
+			//FIXME: longer hold for gsm restart
+			delay_ms(500);
 			GSM_modem_init();
 			reset_flags &= ~(1<<RESET_GSM);
 		}

From 0e76db599f843ef1623e1397f22df4f056b4ae52 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 28 Mar 2017 16:14:15 -0700
Subject: [PATCH 28/83] Accommodate SIMCOM7100A during detection phase

Also some typo fixes in comments
---
 V2X_Firmware/src/V2X/V2X_gsm.c |  7 ++++++-
 V2X_Firmware/src/V2X/V2X_gsm.h | 18 +++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_gsm.c b/V2X_Firmware/src/V2X/V2X_gsm.c
index 2a502fd..f41af0a 100644
--- a/V2X_Firmware/src/V2X/V2X_gsm.c
+++ b/V2X_Firmware/src/V2X/V2X_gsm.c
@@ -199,7 +199,12 @@ void GSM_control_start (char * responce_buffer){
 			usb_tx_string_P(PSTR("SIM5320A device detected\r>"));
 			job_set_timeout(SYS_GSM, 2);
 			GSM_subsequence_state = GSM_subssequence_5;  //got expected response, go to next step
-		} else if (strcmp_P(responce_buffer, PSTR("OK")) == 0){	//did not see matching device ID
+		} else if (strcmp_P(responce_buffer, PSTR("Model: SIMCOM_SIM7100A")) == 0) { //got new version of simcom chip
+			menu_send_CTL();
+			usb_tx_string_P(PSTR("SIM7100A device detected\r>"));
+			job_set_timeout(SYS_GSM, 2);
+			GSM_subsequence_state = GSM_subssequence_5;  //got expected response, go to next step
+		}	else if (strcmp_P(responce_buffer, PSTR("OK")) == 0) {	//did not see matching device ID
 			GSM_subsequence_state = GSM_subssequence_FAIL;
 			job_clear_timeout(SYS_GSM);
 			GSM_control(responce_buffer);
diff --git a/V2X_Firmware/src/V2X/V2X_gsm.h b/V2X_Firmware/src/V2X/V2X_gsm.h
index dcd221d..fa1dc69 100644
--- a/V2X_Firmware/src/V2X/V2X_gsm.h
+++ b/V2X_Firmware/src/V2X/V2X_gsm.h
@@ -3,7 +3,7 @@
  *
  * Created: 2/12/2016 11:01:18 AM
  *  Author: jbanks2
- */ 
+ */
 
 
 #ifndef V2X_GSM_H_
@@ -11,20 +11,20 @@
 
 /**
  * @def simcard_status
- * @brief detection of SIMCARD by socket switch 
- * returns "true" if SIMCARD installed 
+ * @brief detection of SIMCARD by socket switch
+ * returns "true" if SIMCARD installed
  **/
 inline static bool simcard_status(void) {return 1-ioport_get_pin_level(SW1_PIN);}
 	/**
  * @def sim_power_status
- * @brief detection of SIMCARD by socket switch 
- * returns "true" if SIMCARD installed 
+ * @brief detection of SIM module by pin
+ * returns "true" if SIM module is powered
  **/
 inline static bool sim_power_status(void) {return ioport_get_pin_level(EXT1_PIN_SIM_PWR);}
 /**
  * @def sim_net_status
- * @brief detection of SIMCARD by socket switch 
- * returns "true" if SIMCARD installed 
+ * @brief detection of SIM network status pin
+ * returns "true" if SIM network pin detected
  **/
 inline static bool sim_net_status(void) {return ioport_get_pin_level(EXT1_PIN_SIM_NETWORK);}
 
@@ -87,7 +87,7 @@ enum GSM_sequence_states {
 	GSM_state_time_get,
 	GSM_state_wake_host
 	};
-	
+
 /**
  * @def GSM_sequence_states
  * @brief generic switch for moving through control substates
@@ -105,7 +105,7 @@ enum GSM_subsequence_states {
 	GSM_subssequence_10,
 	GSM_subssequence_FAIL
 	};
-	
+
 /**
  * @def GSM_control
  * @brief head of the controller sequencer, sends calls into corect module

From 8a87393d0e7e893878911f51cddb3c19106643bd Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 28 Mar 2017 16:28:14 -0700
Subject: [PATCH 29/83] SIMCOM chip model support

Board defines for simcom models 5320a and 7100a
---
 V2X_Firmware/src/V2X/V2X_board.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index e105039..a4e899c 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -37,6 +37,12 @@ extern "C" {
 #endif
 /** @} */
 
+/* Defines for SIMCOM GSM chip on board. Compile time choice.
+ */
+#define SIMCOM_SIM5320A		(0)
+#define SIMCOM_SIM7100A		(1)
+#define SIMCOM 				SIMCOM_SIM7100A
+
 /** \name 3v3 power pin definition
  * Activate to maintain power to CPU
  */

From 6b72420bc07af0d13d107e493d0d8c186f1eff34 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Wed, 29 Mar 2017 11:11:04 -0700
Subject: [PATCH 30/83] Enable 4v for gsm and atmel normal operation

---
 V2X_Firmware/src/V2X/V2X_power.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/V2X_Firmware/src/V2X/V2X_power.h b/V2X_Firmware/src/V2X/V2X_power.h
index 1a5503a..0a90faa 100644
--- a/V2X_Firmware/src/V2X/V2X_power.h
+++ b/V2X_Firmware/src/V2X/V2X_power.h
@@ -49,7 +49,7 @@ volatile SHIFT_REGISTER_TYPE power_control_state;
 									(0<<ENABLE_SIM_VBUS)|   \
 									(0<<ENABLE_FTDI_RESET)
 #elif V2X_REV >= REV_20
-#define POWER_CONTROL_DEFAULT_VALUE (0<<ENABLE_4V1)|        \
+#define POWER_CONTROL_DEFAULT_VALUE (1<<ENABLE_4V1)|        \
 									(0<<ENABLE_5V0)|        \
 									(0<<ENABLE_5V0B)|       \
 									(0<<ENABLE_CAN_SLEEP)|  \

From c092639595546f80e6ab6545c2d82c4c2d34e694 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Wed, 29 Mar 2017 11:11:36 -0700
Subject: [PATCH 31/83] (temp commit) Disable GSM auto start sequence while
 troubleshooting

---
 V2X_Firmware/src/V2X/V2X_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index ad1081a..12790fa 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -126,7 +126,7 @@ void v2x_board_init(void)
 
 	//autostart all systems
 	delay_ms(500);
-	GSM_modem_init();
+	//GSM_modem_init();
 	CAN_elm_init();
 	ACL_set_sample_on();
 	PWR_host_start();

From 277c073912348c4265a681ada20c84de7507e679 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Wed, 29 Mar 2017 11:12:13 -0700
Subject: [PATCH 32/83] Account for IMEISV in SIMCOM 7100a

---
 V2X_Firmware/src/V2X/V2X_gsm.c | 41 ++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_gsm.c b/V2X_Firmware/src/V2X/V2X_gsm.c
index f41af0a..b7874a5 100644
--- a/V2X_Firmware/src/V2X/V2X_gsm.c
+++ b/V2X_Firmware/src/V2X/V2X_gsm.c
@@ -3,7 +3,7 @@
  *
  * Created: 2/12/2016 11:01:08 AM
  *  Author: jbanks2
- */ 
+ */
 
 #include "V2X.h"
 
@@ -64,7 +64,7 @@ ISR(USART_SIM_RX_Vect)
 }
 
 ISR(USART_SIM_DRE_Vect)
-{		
+{
 	if (CTL_bytes_to_send(&GSM, BUFFER_OUT)) { //if bytes left to send
 		USART_SIM.DATA = CTL_next_byte(&GSM, BUFFER_OUT);
 	} else { //clean up
@@ -126,7 +126,7 @@ void GSM_control_check (char * responce_buffer){
 		if (strcmp_P(responce_buffer, PSTR("START")) == 0) {
 			GSM_subsequence_state = GSM_subssequence_3;  //got expected response, go to next step
 			GSM_control_check(responce_buffer);
-		} 
+		}
 		job_check_fail(SYS_GSM);
 		break;
 	case GSM_subssequence_3: //check for SIM power LED state
@@ -138,7 +138,7 @@ void GSM_control_check (char * responce_buffer){
 		} else { //try a reset
 			menu_send_CTL();
 			usb_tx_string_P(PSTR("GSM rebooting\r>"));
-			PWR_gsm_stop(); 
+			PWR_gsm_stop();
 			PWR_gsm_start();
 			GSM_subsequence_state = GSM_subssequence_2;
 			job_set_timeout(SYS_GSM, 10); //give SIM module 10 seconds to start
@@ -157,7 +157,7 @@ void GSM_control_check (char * responce_buffer){
 			GSM_subsequence_state = GSM_subssequence_1;  //got expected response, go to next step
 			GSM_sequence_state = GSM_state_start;
 			GSM_control(responce_buffer); //start next state
-		} 
+		}
 		job_check_fail(SYS_GSM);
 		break;
 	case GSM_subssequence_FAIL:
@@ -184,8 +184,8 @@ void GSM_control_start (char * responce_buffer){
 			usb_tx_string_P(PSTR("GSM Echo off\r>"));
 			GSM_subsequence_state = GSM_subssequence_3; //move to response state
 			GSM_control(responce_buffer);
-		} 
-		job_check_fail(SYS_GSM);		
+		}
+		job_check_fail(SYS_GSM);
 		break;
 	case GSM_subssequence_3:
 		CTL_add_string_to_buffer_P(&GSM, BUFFER_OUT, PSTR("ATI\r")); //compose message
@@ -213,6 +213,11 @@ void GSM_control_start (char * responce_buffer){
 		break;
 	case GSM_subssequence_5:
 		clear_buffer(stng);
+        /* FIXME: operational divergence SIMCOM 5320a vs 7100a 
+		 * 5320a stores prints out "IMEI: ..."
+		 * 7100a prints out "IMEISV: ..."
+		 */
+#if SIMCOM == SIMCOM_SIM5320A
 		for (int i = 0; i < 5; i++) {stng[i] = responce_buffer[i];} //move first 4 to compare
 		if (strcmp_P(stng, PSTR("IMEI:")) == 0) {
 			clear_buffer(imei);
@@ -223,6 +228,18 @@ void GSM_control_start (char * responce_buffer){
 			job_set_timeout(SYS_GSM, 2);
 			GSM_subsequence_state = GSM_subssequence_6;  //got expected response, go to next step
 		}
+#elif SIMCOM == SIMCOM_SIM7100A
+		for (int i = 0; i < 7; i++) {stng[i] = responce_buffer[i];} //move first 6 to compare
+		if (strcmp_P(stng, PSTR("IMEISV:")) == 0) {
+			clear_buffer(imei);
+			strcat(imei, responce_buffer+8);
+			menu_send_CTL();
+			usb_tx_string_P(PSTR("IMEISV captured "));
+			menu_send_n_st();
+			job_set_timeout(SYS_GSM, 2);
+			GSM_subsequence_state = GSM_subssequence_6;  //got expected response, go to next step
+		}
+#endif
 		job_check_fail(SYS_GSM);
 		break;
 	case GSM_subssequence_6:
@@ -295,7 +312,7 @@ void GSM_time_sync (char * responce_buffer) {
 	case GSM_subssequence_3:
 		if (strcmp_P(responce_buffer, PSTR("OK")) == 0) {
 			GSM_sequence_state = GSM_state_idle;
-			
+
 			job_clear_timeout(SYS_GSM);
 		}
 		job_check_fail(SYS_GSM);
@@ -314,11 +331,11 @@ void show_buffer(char * buffer) {
 	usb_tx_string_P(PSTR("\""));
 	usb_cdc_send_string(USB_CMD, buffer);
 	usb_tx_string_P(PSTR("\""));
-	
+
 }
 
 void GSM_parse_gps_info (char * responce_buffer) {
-	
+
 	char * start_ptr = strchr(responce_buffer, ':') + 1;
 	for (int i = 0; start_ptr[i] != ','; i++) {
 		latitude[i] = start_ptr[i];	//copy lat string
@@ -345,13 +362,13 @@ void GSM_parse_gps_info (char * responce_buffer) {
 	for (int i = 0; start_ptr[i] != ','; i++) {
 		time[i] = start_ptr[i];	//copy time string
 	}
-			
+
 	if (atoi(date) != 0) { //this logic wont work on Jan 1 2100
 		time_set_by_strings(date, time);
 		menu_send_CTL();
 		usb_tx_string_P(PSTR("GPS time sync @ "));
 		time_print_human_readable();
-		menu_send_n_st();	
+		menu_send_n_st();
 	}
 }
 

From e7572f1598a392cb9c13dbb32942c3ab89cf5183 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 31 Mar 2017 08:35:46 -0700
Subject: [PATCH 33/83] Fix: new CGPSINFO format used by 7100a

The new output format generated by 7100a on requesting AT+CGPSINFO is off by one character from previous version.
This was creating a bug where the job would respawn too quickly.
This ensures the time check should only spawn about once per minute again.
---
 V2X_Firmware/src/V2X/V2X_gsm.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/V2X_Firmware/src/V2X/V2X_gsm.c b/V2X_Firmware/src/V2X/V2X_gsm.c
index b7874a5..eac2770 100644
--- a/V2X_Firmware/src/V2X/V2X_gsm.c
+++ b/V2X_Firmware/src/V2X/V2X_gsm.c
@@ -302,7 +302,14 @@ void GSM_time_sync (char * responce_buffer) {
 		break;
 	case GSM_subssequence_2:
 		for (int i = 0; i < 10; i++) {stng[i] = responce_buffer[i];} //move first 10 to compare
+		// format for this string is altered in simcom version
+		// 5320a: "+CGPSINFO:,,,,,,,,"  == [10] ','
+		// 7100a: "+CGPSINFO: ,,,,,,,," == [11] ','
+#if SIMCOM == SIMCOM_SIM5320A
 		if (strcmp_P(stng, PSTR("+CGPSINFO:")) == 0 && responce_buffer[10] != ',') {
+#elif SIMCOM == SIMCOM_SIM7100A
+		if (strcmp_P(stng, PSTR("+CGPSINFO:")) == 0 && responce_buffer[11] != ',') {
+#endif
 			GSM_parse_gps_info(responce_buffer);
 			GSM_subsequence_state = GSM_subssequence_3;
 			job_set_timeout(SYS_GSM, 2);

From 2f99c6e0ff87f4f20002c37b3c5cd0290a083e6a Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 31 Mar 2017 14:21:10 -0700
Subject: [PATCH 34/83] Add gsm power off command

Expose interface for sending power off AT command to gsm.
This is useful for the power system to be able to safely shut down the running modem if there is a serial connection.
---
 V2X_Firmware/src/V2X/V2X_gsm.c | 5 +++++
 V2X_Firmware/src/V2X/V2X_gsm.h | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/V2X_Firmware/src/V2X/V2X_gsm.c b/V2X_Firmware/src/V2X/V2X_gsm.c
index eac2770..cfe5161 100644
--- a/V2X_Firmware/src/V2X/V2X_gsm.c
+++ b/V2X_Firmware/src/V2X/V2X_gsm.c
@@ -385,4 +385,9 @@ void GSM_control_fail (void) {
 
 char * GSM_get_imei (void) {
 	return &imei;
+}
+
+void GSM_command_power_off(void) {
+	CTL_add_string_to_buffer_P(&GSM, BUFFER_OUT, PSTR("AT+CPOF\r")); //compose message
+	CTL_mark_for_processing(&GSM, BUFFER_OUT);
 }
\ No newline at end of file
diff --git a/V2X_Firmware/src/V2X/V2X_gsm.h b/V2X_Firmware/src/V2X/V2X_gsm.h
index fa1dc69..af4dc7a 100644
--- a/V2X_Firmware/src/V2X/V2X_gsm.h
+++ b/V2X_Firmware/src/V2X/V2X_gsm.h
@@ -173,4 +173,9 @@ void GSM_control_fail (void);
  */
 char * GSM_get_imei (void);
 
+/**
+ *@def GSM_power_off
+ *@brief send a shutdown command to the gsm
+ */
+void GSM_command_power_off(void);
 #endif /* V2X_GSM_H_ */
\ No newline at end of file

From 3c95283ef7e0ad76e1c60b53372c2814760003b2 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 31 Mar 2017 14:27:13 -0700
Subject: [PATCH 35/83] Add gsm reset control to power management

Add explicit call to reset gsm. Please use with caution.
---
 V2X_Firmware/src/V2X/V2X_power.c |  9 +++++++++
 V2X_Firmware/src/V2X/V2X_power.h | 12 +++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_power.c b/V2X_Firmware/src/V2X/V2X_power.c
index 085152e..0524228 100644
--- a/V2X_Firmware/src/V2X/V2X_power.c
+++ b/V2X_Firmware/src/V2X/V2X_power.c
@@ -232,3 +232,12 @@ void PWR_gsm_start(void) {
 	PWR_turn_off((1<<ENABLE_SIM_PWR_ON));
 	PWR_push();					//clear the start bit
 }
+
+/* Force GSM reset. Please use with caution */
+void PWR_gsm_reset(void) {
+	PWR_turn_off(1<<ENABLE_SIM_RESET);
+	PWR_push();
+	delay_ms(50);
+	PWR_turn_on(1<<ENABLE_SIM_RESET);
+	PWR_push();
+}
diff --git a/V2X_Firmware/src/V2X/V2X_power.h b/V2X_Firmware/src/V2X/V2X_power.h
index 0a90faa..ccc7f64 100644
--- a/V2X_Firmware/src/V2X/V2X_power.h
+++ b/V2X_Firmware/src/V2X/V2X_power.h
@@ -191,14 +191,20 @@ void PWR_can_start (void);
 
 /**
  * @def GSM_start
- * @brief sends a sequence to enable the SIM5320 module
+ * @brief sends a sequence to enable the SIM module
  */
 void PWR_gsm_start(void);
 
 /**
- * @def power_sim_reset
- * @brief sends a sequence to disable the SIM5320 module
+ * @def PWR_gsm_stop
+ * @brief sends a sequence to disable the SIM module
  */
 void PWR_gsm_stop(void);
 
+/**
+ * @def power_sim_reset
+ * @brief Forces reset of the SIM module. Please use sparingly, with caution.
+ */
+void PWR_gsm_reset(void);
+
 #endif /* V2X_DRIVERS_H_ */
\ No newline at end of file

From c6dbc2eeee219da064a9a5017ce492580b13221d Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 31 Mar 2017 14:32:36 -0700
Subject: [PATCH 36/83] Enable gsm auto start on board power up

Enable this again, for testing and the forseeable future
---
 V2X_Firmware/src/V2X/V2X_init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 12790fa..3e4f6cd 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -49,7 +49,7 @@ void pin_init(void)
 		//ioport_configure_pin(EXT1_PIN_SIM_TXD				, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);
 		//ioport_configure_pin(EXT1_PIN_SIM_RXD				, IOPORT_DIR_INPUT						);
 
-		ioport_configure_pin(EXT1_PIN_SIM_PWR				, IOPORT_DIR_INPUT	  					);
+		ioport_configure_pin(EXT1_PIN_SIM_PWR				, IOPORT_DIR_INPUT						);
 		ioport_configure_pin(EXT1_PIN_SEQ_RXD				, IOPORT_DIR_INPUT						);
 		ioport_configure_pin(EXT1_PIN_SEQ_TXD				, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);
 
@@ -126,7 +126,7 @@ void v2x_board_init(void)
 
 	//autostart all systems
 	delay_ms(500);
-	//GSM_modem_init();
+	GSM_modem_init();
 	CAN_elm_init();
 	ACL_set_sample_on();
 	PWR_host_start();

From d677ba76eb2021d2cb0b04c98e94b7f5893c2225 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Mon, 3 Apr 2017 09:21:38 -0700
Subject: [PATCH 37/83] Reenable button startup

--resolved: button start routine could adversely affect usb communication upon restart after board reprogramming (mounting usb was being used as a shorthand measure of startup success). button initialization does not appear to affect normal start routines or operation.
---
 V2X_Firmware/src/V2X/V2X_init.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 3e4f6cd..5ef1cd7 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -110,8 +110,7 @@ void v2x_board_init(void)
 	eeprom_init();							//verifies eeprom safe for use
 	menu_init();							//loads menu settings
 	time_init();							//starts the RTC
-	// FIXME: bug ? : Doesn't seem to allow past button check, disabling this allows for continuation
-	//button_init();							//init button stuffs
+	button_init();							//init button stuffs
 	ACL_init();								//configures, but does not start sampling
 	GSM_usart_init();						//starts direct serial channel to the SIM module
 	CAN_uart_start();						//starts direct serial channel to the ELM module

From b48552d4c93dfdf43885ef87445c74d7b8b12154 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Mon, 3 Apr 2017 10:21:17 -0700
Subject: [PATCH 38/83] Reset of GSM uses RESET

Explicitly uses reset case for GSM.
Because the power management for GSM has been altered to follow the manual recommendations about clean shutdown, RESET is now employed in the reset or restart section of the GSM menu.
---
 V2X_Firmware/src/V2X/V2X_init.c | 5 ++---
 V2X_Firmware/src/V2X/V2X_menu.c | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 5ef1cd7..8edd05a 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -161,9 +161,8 @@ void reset_processor(void) {
 		if (reset_flags & (1<<RESET_GSM)) {
 			menu_send_CTL();
 			usb_tx_string_P(PSTR("GSM restarting\r>"));
-			PWR_gsm_stop();
-			// delay_ms(100);
-			//FIXME: longer hold for gsm restart
+			// Forces reset of GSM
+			PWR_gsm_reset();
 			delay_ms(500);
 			GSM_modem_init();
 			reset_flags &= ~(1<<RESET_GSM);
diff --git a/V2X_Firmware/src/V2X/V2X_menu.c b/V2X_Firmware/src/V2X/V2X_menu.c
index b5dc6b6..cab1fa2 100644
--- a/V2X_Firmware/src/V2X/V2X_menu.c
+++ b/V2X_Firmware/src/V2X/V2X_menu.c
@@ -288,7 +288,7 @@ void menu_modem (void) {
 		break;
 	case 'r':  //reset
 		reset_trigger_GSM();
-		usb_tx_string_PV(PSTR("GSM restarting"));
+		usb_tx_string_PV(PSTR("GSM RESET"));
 		break;
 	case 'q':
 		menu_modem_status();
@@ -303,7 +303,7 @@ void menu_modem (void) {
  		break;
 	case '?':
 	default:
-		usb_tx_string_P(PSTR("*** Modem Menu ***\rE: Enable\rD: Disable\rR: Restart\rI: Subsystem Information\rQ: Query status\rX: AT Command Pass through\r"));
+		usb_tx_string_P(PSTR("*** Modem Menu ***\rE: Enable\rD: Disable\rR: RESET. Emergency use.\rI: Subsystem Information\rQ: Query status\rX: AT Command Pass through\r"));
 		break;
 	}
 }

From 28b15d579c18f575d38f33d7d73e32dd80c147ea Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Mon, 3 Apr 2017 11:51:23 -0700
Subject: [PATCH 39/83] Address compatability concerns for GSM startup

Introduces a slight divergence in startup case handling for Rev[1.2/2.0] and SIMCOM[5320a/7100a].
Main differences and issues handled:
7100a:
- startup time greater than 5320a, more generous wait times required before checking communication.
- START message does not appear to be transmitted by 7100a. This could be operator error on this developer's part. In any case, the state to check for this inital message was too unreliable in the new version and has been removed.
- In new version, instead of machine checking for power states before trying serial communication, will just start the power to GSM and wait a generous time to initiate first com. This is potentially because of the work around power situation on the proto board, and should be double checked at a later time in development. Works fine and reliably, if a bit heavy handedly, for now, though.
---
 V2X_Firmware/src/V2X/V2X_gsm.c | 38 +++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_gsm.c b/V2X_Firmware/src/V2X/V2X_gsm.c
index cfe5161..89f9f59 100644
--- a/V2X_Firmware/src/V2X/V2X_gsm.c
+++ b/V2X_Firmware/src/V2X/V2X_gsm.c
@@ -111,17 +111,41 @@ void GSM_control (char * responce_buffer) {
 
 void GSM_control_check (char * responce_buffer){
 	switch (GSM_subsequence_state) {
+	/*This power check is actually not optimal for supporting both board versions
+	/* ...In Rev20 the SIM is not the only thing on the 4v rail, so we can't rely
+	/*on the operational convention of it being disabled/enabled as a check
+	/* for the SIM's absolute state
+	/*
+	/* Works fine for Rev1.2, needs help on Rev2.0.
+	 */
 	case GSM_subssequence_1:  //check module power
-		if (PWR_query((1<<ENABLE_4V1))) { //is the module power on?
-			GSM_subsequence_state = GSM_subssequence_3; 
+#if V2X_REV <= REV_12
+		if (PWR_query((1<<ENABLE_4V1)) && sim_power_status()) { //is the module power on?
+			GSM_subsequence_state = GSM_subssequence_3;
 			GSM_control_check(responce_buffer);
 		} else { //if not power it up
 			usb_tx_string_P(PSTR("\rCTL>>>:Power up GSM\r"));  //does not need end of string, exits through menu
 			PWR_gsm_start();
+#if SIMCOM == SIMCOM_SIM5320A
 			GSM_subsequence_state = GSM_subssequence_2;
 			job_set_timeout(SYS_GSM, 10); //give SIM module 10 seconds to start
+#elif SIMCOM == SIMCOM_SIM7100A
+			GSM_subsequence_state = GSM_subssequence_3; //skip 2, 7100a doesn't appear to have "START"
+			job_set_timeout(SYS_GSM, 25); //give SIM module 25 seconds to start
+#endif
 		}
+#elif V2X_REV >= REV_20
+			usb_tx_string_P(PSTR("\rCTL>>>:Power up GSM\r"));  //does not need end of string, exits through menu
+			PWR_gsm_start();
+			GSM_subsequence_state = GSM_subssequence_3;
+			job_set_timeout(SYS_GSM, 20); //give SIM module 10 seconds to start
+#endif
 		break;
+#if SIMCOM == SIMCOM_SIM5320A
+	/* 7100a does not appear to send the START message, so has real trouble
+	/* with this step. This appears to be why just sending the machine to subsequence_3
+	/* has been more reliable with the new version
+	 */
 	case GSM_subssequence_2: //Module clean boot, look for "start"
 		if (strcmp_P(responce_buffer, PSTR("START")) == 0) {
 			GSM_subsequence_state = GSM_subssequence_3;  //got expected response, go to next step
@@ -129,7 +153,8 @@ void GSM_control_check (char * responce_buffer){
 		}
 		job_check_fail(SYS_GSM);
 		break;
-	case GSM_subssequence_3: //check for SIM power LED state
+#endif
+	case GSM_subssequence_3: //check for SIM power state
 		if (sim_power_status()) {
 			menu_send_CTL();
 			usb_tx_string_P(PSTR("GSM is powered\r>"));
@@ -138,10 +163,9 @@ void GSM_control_check (char * responce_buffer){
 		} else { //try a reset
 			menu_send_CTL();
 			usb_tx_string_P(PSTR("GSM rebooting\r>"));
-			PWR_gsm_stop();
 			PWR_gsm_start();
-			GSM_subsequence_state = GSM_subssequence_2;
-			job_set_timeout(SYS_GSM, 10); //give SIM module 10 seconds to start
+			GSM_subsequence_state = GSM_subssequence_3; // Check for power again
+			job_set_timeout(SYS_GSM, 20); //give SIM module 20 seconds to start
 		}
 		break;
 	case GSM_subssequence_6: //check for command responce
@@ -213,7 +237,7 @@ void GSM_control_start (char * responce_buffer){
 		break;
 	case GSM_subssequence_5:
 		clear_buffer(stng);
-        /* FIXME: operational divergence SIMCOM 5320a vs 7100a 
+        /* Operational divergence SIMCOM 5320a vs 7100a
 		 * 5320a stores prints out "IMEI: ..."
 		 * 7100a prints out "IMEISV: ..."
 		 */

From c9e845c86c30c6fce5632411c60242427f61c736 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Mon, 3 Apr 2017 15:31:41 -0700
Subject: [PATCH 40/83] Tentative: power procedures

Currently working power procedures.
This section is the least tested, due to the work around nature of the prototype hardware.
Please reevaluate and test when the correct board has been built.

TODO: Please use power pin in new revision, instead of relying exclusively on AT shutdown command (which would fail if there was no communication with the modem).
Also, please confer with original designer about power management (power pin, reset pin, etc)
---
 V2X_Firmware/src/V2X/V2X_power.c | 61 +++++++++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 5 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_power.c b/V2X_Firmware/src/V2X/V2X_power.c
index 0524228..ff28859 100644
--- a/V2X_Firmware/src/V2X/V2X_power.c
+++ b/V2X_Firmware/src/V2X/V2X_power.c
@@ -15,7 +15,7 @@ void PWR_init(void)
 	/* Need to drive high 3v3_EN signal here, to ensure CPU operation.
 	 * A later check will turn off 3v if we have chosen to enable 4v
 	 */
-	PWR_3_start(); 
+	PWR_3_start();
 	#endif
 	PWR_clear();							// Clear shift register
 	PWR_latch();							// Latch all internal registers to output
@@ -205,9 +205,26 @@ void PWR_gsm_stop(void) {
 	 * required, something along the lines of the power_is_4_needed
 	 */
 #if V2X_REV <= REV_12
-	PWR_turn_off((1<<ENABLE_SIM_RESET)|(1<<ENABLE_4V1));
+	//PWR_turn_off((1<<ENABLE_SIM_RESET)|(1<<ENABLE_4V1));
+	// FIXME: testing performance of just disabling power pin on old board...
+	// somehow this pin is not actually shutting down the simcom. manual says
+	// power off should take place many seconds after holding it down...
+	// NOTE: testing that the old wasn't just shutting down due to lack of power...
+	// PWR_turn_off(1<<ENABLE_4V1);
+	GSM_command_power_off();
+	PWR_turn_on(1<<ENABLE_SIM_PWR_ON);
 #elif V2X_REV >= REV_20
-	PWR_turn_off(1<<ENABLE_SIM_RESET);
+	//FIXME: Documentation indicates that the RESET pin is perhaps not ideal for
+	// normal use
+	//PWR_turn_off(1<<ENABLE_SIM_RESET);
+	//PWR_turn_off(1<<ENABLE_SIM_PWR_ON);
+	// FIXME: Trying to send a power off command to simcom instead
+	GSM_command_power_off();
+	// FIXME: might need a delay, or some way to check if the has shut off, and if
+	// not, then hold power low or resort to reset
+	// Also, please verify that this works on the Rev2.0 prototype properly:
+	// Should be the same board logic as the Rev1.2 case, but test each:
+	//PWR_turn_on(1<<ENABLE_SIM_PWR_ON);
 #endif
 	PWR_push();
 }
@@ -217,18 +234,52 @@ void PWR_gsm_start(void) {
 	 * required, something along the lines of the power_is_4_needed
 	 */
 #if V2X_REV <= REV_12
+	//FIXME: Trying one extra measure to get the sim to respond using only the power pin...
+	PWR_turn_off(1<<ENABLE_SIM_RESET);
+	PWR_push();
+	delay_ms(500);
 	PWR_turn_on((1<<ENABLE_SIM_RESET)|(1<<ENABLE_4V1));  //release the reset
 	PWR_push();
+
+	//NOTE: If the power pin is our means of manipulating the power state of the sim...
+	// then we will want to add one extra check to see the state we last set
+	// because the activation sequence requires an initial high-drop-high, the
+	// pin might have to be verified as being high first...
+	// NOTE: We really should make accommodations for the fact that the logic is
+	// reversed on this particular setting
+	// 	if (PWR_query(1<<ENABLE_SIM_PWR_ON))
+	if (sim_power_status())
+	{
+		PWR_turn_off((1<<ENABLE_SIM_PWR_ON));
+		PWR_push();
+		delay_ms(500);
+	}
 #elif V2X_REV >= REV_20
 	PWR_turn_on(1<<ENABLE_SIM_RESET);
 	PWR_4_start();
 #endif
-	delay_ms(100);							//let power come up
+	// FIXME: add greater delay to accommodate the 7100a?
+	// delay_ms(100);							//let power come up
+	//
+
+	//NOTE: If the power pin is our means of manipulating the power state of the sim...
+	// then we will want to add one extra check to see the state we last set
+	// because the activation sequence requires an initial high-drop-high, the
+	// pin might have to be verified as being high first...
+	// NOTE: We really should make accommodations for the fact that the logic is
+	// reversed on this particular setting
+ 	if (PWR_query(1<<ENABLE_SIM_PWR_ON))
+	{
+		PWR_turn_off((1<<ENABLE_SIM_PWR_ON));
+		PWR_push();
+		delay_ms(500);
+	}
+
 	PWR_turn_on((1<<ENABLE_SIM_PWR_ON));
 	PWR_push();
 	//adjusting power wait due to manual for simchip
 	//delay_ms(150);							//let chip detect
-	delay_ms(550);
+	delay_ms(250);
 	PWR_turn_off((1<<ENABLE_SIM_PWR_ON));
 	PWR_push();					//clear the start bit
 }

From 2e813d7781e4bf9f47a772fb252ada926e30d871 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Mon, 3 Apr 2017 15:35:20 -0700
Subject: [PATCH 41/83] Use simcom7100a as primary gsm for now

---
 V2X_Firmware/src/V2X/V2X_board.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index a4e899c..c16288c 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -42,6 +42,7 @@ extern "C" {
 #define SIMCOM_SIM5320A		(0)
 #define SIMCOM_SIM7100A		(1)
 #define SIMCOM 				SIMCOM_SIM7100A
+//#define SIMCOM 				SIMCOM_SIM5320A
 
 /** \name 3v3 power pin definition
  * Activate to maintain power to CPU

From fd89b4bfe5479fa40286e63fd9bfd023e27e182a Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Mon, 3 Apr 2017 15:36:00 -0700
Subject: [PATCH 42/83] Obligatory cproj commit

Nothing to see here
---
 V2X_Firmware/V2X.cproj | 841 +++++++++++++++++++++--------------------
 1 file changed, 426 insertions(+), 415 deletions(-)

diff --git a/V2X_Firmware/V2X.cproj b/V2X_Firmware/V2X.cproj
index 25174da..bac57b5 100644
--- a/V2X_Firmware/V2X.cproj
+++ b/V2X_Firmware/V2X.cproj
@@ -29,175 +29,175 @@
     <ExternalProgrammingToolCommand />
     <AsfFrameworkConfig>
       <framework-data>
-  <options>
-    <option id="common.boards" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="common.drivers.nvm" value="Add" config="no_extmem" content-id="Atmel.ASF" />
-    <option id="common.services.calendar" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="common.services.basic.clock" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="common.services.basic.cpu" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="common.services.delay" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="common.services.basic.gpio" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="common.services.ioport" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="common.services.basic.serial" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="common.services.basic.sleepmgr" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="common.services.basic.spi_master" value="Add" config="standard_spi" content-id="Atmel.ASF" />
-    <option id="common.services.storage.ctrl_access" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="common.services.usb.class.device" value="Add" config="composite" content-id="Atmel.ASF" />
-    <option id="common.utils.interrupt" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="common.utils.stdio.stdio_serial" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="thirdparty.wireless.addons.sio2host" value="Add" config="usb" content-id="Atmel.ASF" />
-    <option id="xmega.drivers.ac" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="xmega.drivers.adc" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="xmega.drivers.cpu" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="xmega.drivers.dma" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="xmega.drivers.ioport" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="xmega.drivers.nvm" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="xmega.drivers.pmic" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="xmega.drivers.rtc" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="xmega.drivers.sleep" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="xmega.drivers.spi" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="xmega.drivers.tc" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="xmega.drivers.usart" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="xmega.drivers.wdt" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="xmega.services.pwm" value="Add" config="" content-id="Atmel.ASF" />
-    <option id="common.boards.user_board.common" value="Add" config="" content-id="Atmel.ASF" />
-  </options>
-  <configurations>
-    <configuration key="config.xmega.drivers.usb.device.sleepmgr" value="with_sleepmgr" default="with_sleepmgr" content-id="Atmel.ASF" />
-    <configuration key="config.common.utils.stdio.stdio_usb.composite" value="disable" default="disable" content-id="Atmel.ASF" />
-    <configuration key="config.common.services.usb.class.cdc.device.composite" value="disable" default="disable" content-id="Atmel.ASF" />
-    <configuration key="config.common.services.usb.class.hid.device.generic.composite" value="disable" default="disable" content-id="Atmel.ASF" />
-    <configuration key="config.common.services.usb.class.hid.device.keyboard.composite" value="disable" default="disable" content-id="Atmel.ASF" />
-    <configuration key="config.common.services.usb.class.hid.device.mouse.composite" value="disable" default="disable" content-id="Atmel.ASF" />
-    <configuration key="config.common.services.usb.class.msc.device.composite" value="disable" default="disable" content-id="Atmel.ASF" />
-    <configuration key="config.common.services.usb.class.phdc.device.composite" value="disable" default="disable" content-id="Atmel.ASF" />
-    <configuration key="config.common.services.usb.class.vendor.device.composite" value="disable" default="disable" content-id="Atmel.ASF" />
-  </configurations>
-  <files>
-    <file path="src/main.c" framework="" version="" source="common/applications/user_application/main.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/config/conf_board.h" framework="" version="" source="common/applications/user_application/user_board/config/conf_board.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/calendar/calendar.c" framework="" version="3.27.3" source="common\services\calendar\calendar.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/calendar/calendar.h" framework="" version="3.27.3" source="common\services\calendar\calendar.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/hugemem/avr8/avr8_hugemem.c" framework="" version="3.27.3" source="common\services\hugemem\avr8\avr8_hugemem.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/hugemem/hugemem.h" framework="" version="3.27.3" source="common\services\hugemem\hugemem.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/hugemem/avr8/hugemem.h" framework="" version="3.27.3" source="common\services\hugemem\avr8\hugemem.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/hugemem/generic/hugemem.h" framework="" version="3.27.3" source="common\services\hugemem\generic\hugemem.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/storage/ctrl_access/ctrl_access.c" framework="" version="3.27.3" source="common\services\storage\ctrl_access\ctrl_access.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/storage/ctrl_access/ctrl_access.h" framework="" version="3.27.3" source="common\services\storage\ctrl_access\ctrl_access.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/Config/conf_access.h" framework="" version="3.27.3" source="common\services\storage\ctrl_access\module_config\conf_access.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/ac/ac.c" framework="" version="3.27.3" source="xmega\drivers\ac\ac.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/ac/ac.h" framework="" version="3.27.3" source="xmega\drivers\ac\ac.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/cpu/ccp.s" framework="" version="3.27.3" source="xmega\drivers\cpu\ccp.s" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/cpu/xmega_reset_cause.h" framework="" version="3.27.3" source="xmega\drivers\cpu\xmega_reset_cause.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/cpu/ccp.h" framework="" version="3.27.3" source="xmega\drivers\cpu\ccp.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/dma/dma.c" framework="" version="3.27.3" source="xmega\drivers\dma\dma.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/dma/dma.h" framework="" version="3.27.3" source="xmega\drivers\dma\dma.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/nvm/nvm.c" framework="" version="3.27.3" source="xmega\drivers\nvm\nvm.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/nvm/nvm_asm.s" framework="" version="3.27.3" source="xmega\drivers\nvm\nvm_asm.s" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/nvm/nvm.h" framework="" version="3.27.3" source="xmega\drivers\nvm\nvm.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/pmic/pmic.h" framework="" version="3.27.3" source="xmega\drivers\pmic\pmic.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/rtc/rtc.c" framework="" version="3.27.3" source="xmega\drivers\rtc\rtc.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/rtc/rtc.h" framework="" version="3.27.3" source="xmega\drivers\rtc\rtc.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/Config/conf_rtc.h" framework="" version="3.27.3" source="xmega\drivers\rtc\module_config\conf_rtc.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/sleep/sleep.h" framework="" version="3.27.3" source="xmega\drivers\sleep\sleep.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/spi/spi.c" framework="" version="3.27.3" source="xmega\drivers\spi\spi.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/spi/spi.h" framework="" version="3.27.3" source="xmega\drivers\spi\spi.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/tc/tc.c" framework="" version="3.27.3" source="xmega\drivers\tc\tc.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/tc/tc.h" framework="" version="3.27.3" source="xmega\drivers\tc\tc.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/wdt/wdt.c" framework="" version="3.27.3" source="xmega\drivers\wdt\wdt.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/wdt/wdt.h" framework="" version="3.27.3" source="xmega\drivers\wdt\wdt.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/services/pwm/pwm.c" framework="" version="3.27.3" source="xmega\services\pwm\pwm.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/services/pwm/pwm.h" framework="" version="3.27.3" source="xmega\services\pwm\pwm.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/drivers/nvm/xmega/xmega_nvm.c" framework="" version="3.27.3" source="common\drivers\nvm\xmega\xmega_nvm.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/drivers/nvm/common_nvm.h" framework="" version="3.27.3" source="common\drivers\nvm\common_nvm.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/Config/conf_nvm.h" framework="" version="3.27.3" source="common\drivers\nvm\xmega\module_config\conf_nvm.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/clock/xmega/sysclk.c" framework="" version="3.27.3" source="common\services\clock\xmega\sysclk.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/clock/pll.h" framework="" version="3.27.3" source="common\services\clock\pll.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/clock/genclk.h" framework="" version="3.27.3" source="common\services\clock\genclk.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/clock/osc.h" framework="" version="3.27.3" source="common\services\clock\osc.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/clock/xmega/pll.h" framework="" version="3.27.3" source="common\services\clock\xmega\pll.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/clock/xmega/sysclk.h" framework="" version="3.27.3" source="common\services\clock\xmega\sysclk.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/clock/xmega/osc.h" framework="" version="3.27.3" source="common\services\clock\xmega\osc.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/clock/sysclk.h" framework="" version="3.27.3" source="common\services\clock\sysclk.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/Config/conf_clock.h" framework="" version="3.27.3" source="common\services\clock\xmega\module_config_usb\conf_clock.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/delay/delay.h" framework="" version="3.27.3" source="common\services\delay\delay.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/delay/xmega/cycle_counter.h" framework="" version="3.27.3" source="common\services\delay\xmega\cycle_counter.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/gpio/gpio.h" framework="" version="3.27.3" source="common\services\gpio\gpio.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/gpio/xmega_gpio/xmega_gpio.h" framework="" version="3.27.3" source="common\services\gpio\xmega_gpio\xmega_gpio.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/ioport/xmega/ioport_compat.c" framework="" version="3.27.3" source="common\services\ioport\xmega\ioport_compat.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/ioport/xmega/ioport_compat.h" framework="" version="3.27.3" source="common\services\ioport\xmega\ioport_compat.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/ioport/xmega/ioport.h" framework="" version="3.27.3" source="common\services\ioport\xmega\ioport.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/ioport/ioport.h" framework="" version="3.27.3" source="common\services\ioport\ioport.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/serial/usart_serial.c" framework="" version="3.27.3" source="common\services\serial\usart_serial.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/serial/xmega_usart/usart_serial.h" framework="" version="3.27.3" source="common\services\serial\xmega_usart\usart_serial.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/serial/serial.h" framework="" version="3.27.3" source="common\services\serial\serial.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/Config/conf_usart_serial.h" framework="" version="3.27.3" source="common\services\serial\xmega_usart\module_config\conf_usart_serial.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/sleepmgr/xmega/sleepmgr.c" framework="" version="3.27.3" source="common\services\sleepmgr\xmega\sleepmgr.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/sleepmgr/sleepmgr.h" framework="" version="3.27.3" source="common\services\sleepmgr\sleepmgr.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/sleepmgr/xmega/sleepmgr.h" framework="" version="3.27.3" source="common\services\sleepmgr\xmega\sleepmgr.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/Config/conf_sleepmgr.h" framework="" version="3.27.3" source="common\services\sleepmgr\xmega\module_config\conf_sleepmgr.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/spi/xmega_spi/spi_master.c" framework="" version="3.27.3" source="common\services\spi\xmega_spi\spi_master.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/spi/spi_master.h" framework="" version="3.27.3" source="common\services\spi\spi_master.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/spi/xmega_spi/spi_master.h" framework="" version="3.27.3" source="common\services\spi\xmega_spi\spi_master.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/Config/conf_spi_master.h" framework="" version="3.27.3" source="common\services\spi\xmega_spi\module_config\conf_spi_master.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/usb/usb_atmel.h" framework="" version="3.27.3" source="common\services\usb\usb_atmel.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/usb/usb_protocol.h" framework="" version="3.27.3" source="common\services\usb\usb_protocol.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/usb/class/cdc/usb_protocol_cdc.h" framework="" version="3.27.3" source="common\services\usb\class\cdc\usb_protocol_cdc.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/usb/class/cdc/device/udi_cdc.c" framework="" version="3.27.3" source="common\services\usb\class\cdc\device\udi_cdc.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/usb/class/cdc/device/udi_cdc_desc.c" framework="" version="3.27.3" source="common\services\usb\class\cdc\device\udi_cdc_desc.c" changed="False" content-id="Atmel.ASF" />
-    <file path="atmel_devices_cdc.cat" framework="" version="3.27.3" source="common\services\usb\class\cdc\device\atmel_devices_cdc.cat" changed="False" content-id="Atmel.ASF" />
-    <file path="atmel_devices_cdc.inf" framework="" version="3.27.3" source="common\services\usb\class\cdc\device\atmel_devices_cdc.inf" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/usb/class/cdc/device/udi_cdc.h" framework="" version="3.27.3" source="common\services\usb\class\cdc\device\udi_cdc.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/usb/class/cdc/device/udi_cdc_conf.h" framework="" version="3.27.3" source="common\services\usb\class\cdc\device\udi_cdc_conf.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/Config/conf_usb.h" framework="" version="3.27.3" source="common\services\usb\class\cdc\device\module_config\conf_usb.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/usb/udc/udc.c" framework="" version="3.27.3" source="common\services\usb\udc\udc.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/usb/udc/udc.h" framework="" version="3.27.3" source="common\services\usb\udc\udc.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/usb/udc/udd.h" framework="" version="3.27.3" source="common\services\usb\udc\udd.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/usb/udc/udc_desc.h" framework="" version="3.27.3" source="common\services\usb\udc\udc_desc.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/usb/udc/udi.h" framework="" version="3.27.3" source="common\services\usb\udc\udi.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/utils/stdio/read.c" framework="" version="3.27.3" source="common\utils\stdio\read.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/utils/stdio/write.c" framework="" version="3.27.3" source="common\utils\stdio\write.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/utils/stdio/stdio_serial/stdio_serial.h" framework="" version="3.27.3" source="common\utils\stdio\stdio_serial\stdio_serial.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/utils/stdio/stdio_usb/stdio_usb.c" framework="" version="3.27.3" source="common\utils\stdio\stdio_usb\stdio_usb.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/utils/stdio/stdio_usb/stdio_usb.h" framework="" version="3.27.3" source="common\utils\stdio\stdio_usb\stdio_usb.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/thirdparty/wireless/addons/sio2host/usb/sio2host.c" framework="" version="3.27.3" source="thirdparty\wireless\addons\sio2host\usb\sio2host.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/thirdparty/wireless/addons/sio2host/usb/sio2host.h" framework="" version="3.27.3" source="thirdparty\wireless\addons\sio2host\usb\sio2host.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/Config/conf_sio2host.h" framework="" version="3.27.3" source="thirdparty\wireless\addons\sio2host\module_config\conf_sio2host.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/adc/xmega_aau/adc_aau.c" framework="" version="3.27.3" source="xmega\drivers\adc\xmega_aau\adc_aau.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/adc/adc.c" framework="" version="3.27.3" source="xmega\drivers\adc\adc.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/adc/adc.h" framework="" version="3.27.3" source="xmega\drivers\adc\adc.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/Config/conf_adc.h" framework="" version="3.27.3" source="xmega\drivers\adc\module_config\conf_adc.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/usart/usart.c" framework="" version="3.27.3" source="xmega\drivers\usart\usart.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/usart/usart.h" framework="" version="3.27.3" source="xmega\drivers\usart\usart.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/usb/usb_device.c" framework="" version="3.27.3" source="xmega\drivers\usb\usb_device.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/drivers/usb/usb_device.h" framework="" version="3.27.3" source="xmega\drivers\usb\usb_device.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/services/cpu/reset_cause.h" framework="" version="3.27.3" source="common\services\cpu\reset_cause.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/boards/user_board/user_board.h" framework="" version="3.27.3" source="common\boards\user_board\user_board.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/boards/user_board/init.c" framework="" version="3.27.3" source="common\boards\user_board\init.c" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/boards/board.h" framework="" version="3.27.3" source="common\boards\board.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/utils/progmem.h" framework="" version="3.27.3" source="xmega\utils\progmem.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/utils/assembler.h" framework="" version="3.27.3" source="xmega\utils\assembler.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/utils/bit_handling/clz_ctz.h" framework="" version="3.27.3" source="xmega\utils\bit_handling\clz_ctz.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/utils/preprocessor/preprocessor.h" framework="" version="3.27.3" source="xmega\utils\preprocessor\preprocessor.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/utils/preprocessor/stringz.h" framework="" version="3.27.3" source="xmega\utils\preprocessor\stringz.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/utils/preprocessor/tpaste.h" framework="" version="3.27.3" source="xmega\utils\preprocessor\tpaste.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/utils/compiler.h" framework="" version="3.27.3" source="xmega\utils\compiler.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/utils/status_codes.h" framework="" version="3.27.3" source="xmega\utils\status_codes.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/utils/preprocessor/mrepeat.h" framework="" version="3.27.3" source="xmega\utils\preprocessor\mrepeat.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/xmega/utils/assembler/gas.h" framework="" version="3.27.3" source="xmega\utils\assembler\gas.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/utils/interrupt.h" framework="" version="3.27.3" source="common\utils\interrupt.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/utils/interrupt/interrupt_avr8.h" framework="" version="3.27.3" source="common\utils\interrupt\interrupt_avr8.h" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/utils/make/Makefile.avr.in" framework="" version="3.27.3" source="common\utils\make\Makefile.avr.in" changed="False" content-id="Atmel.ASF" />
-    <file path="src/ASF/common/utils/parts.h" framework="" version="3.27.3" source="common\utils\parts.h" changed="False" content-id="Atmel.ASF" />
-  </files>
-  <documentation help="http://asf.atmel.com/docs/3.27.3/common.applications.user_application.user_board.xmegaau/html/index.html" />
-  <offline-documentation help="" />
-  <dependencies>
-    <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.27.3" />
-  </dependencies>
-  <project id="common.applications.user_application.user_board.xmegaau" value="Add" config="" content-id="Atmel.ASF" />
-  <board id="board.user_board.xmegaau" value="Add" config="" content-id="Atmel.ASF" />
-</framework-data>
+        <options>
+          <option id="common.boards" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="common.drivers.nvm" value="Add" config="no_extmem" content-id="Atmel.ASF" />
+          <option id="common.services.calendar" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="common.services.basic.clock" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="common.services.basic.cpu" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="common.services.delay" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="common.services.basic.gpio" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="common.services.ioport" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="common.services.basic.serial" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="common.services.basic.sleepmgr" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="common.services.basic.spi_master" value="Add" config="standard_spi" content-id="Atmel.ASF" />
+          <option id="common.services.storage.ctrl_access" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="common.services.usb.class.device" value="Add" config="composite" content-id="Atmel.ASF" />
+          <option id="common.utils.interrupt" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="common.utils.stdio.stdio_serial" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="thirdparty.wireless.addons.sio2host" value="Add" config="usb" content-id="Atmel.ASF" />
+          <option id="xmega.drivers.ac" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="xmega.drivers.adc" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="xmega.drivers.cpu" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="xmega.drivers.dma" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="xmega.drivers.ioport" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="xmega.drivers.nvm" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="xmega.drivers.pmic" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="xmega.drivers.rtc" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="xmega.drivers.sleep" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="xmega.drivers.spi" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="xmega.drivers.tc" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="xmega.drivers.usart" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="xmega.drivers.wdt" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="xmega.services.pwm" value="Add" config="" content-id="Atmel.ASF" />
+          <option id="common.boards.user_board.common" value="Add" config="" content-id="Atmel.ASF" />
+        </options>
+        <configurations>
+          <configuration key="config.xmega.drivers.usb.device.sleepmgr" value="with_sleepmgr" default="with_sleepmgr" content-id="Atmel.ASF" />
+          <configuration key="config.common.utils.stdio.stdio_usb.composite" value="disable" default="disable" content-id="Atmel.ASF" />
+          <configuration key="config.common.services.usb.class.cdc.device.composite" value="disable" default="disable" content-id="Atmel.ASF" />
+          <configuration key="config.common.services.usb.class.hid.device.generic.composite" value="disable" default="disable" content-id="Atmel.ASF" />
+          <configuration key="config.common.services.usb.class.hid.device.keyboard.composite" value="disable" default="disable" content-id="Atmel.ASF" />
+          <configuration key="config.common.services.usb.class.hid.device.mouse.composite" value="disable" default="disable" content-id="Atmel.ASF" />
+          <configuration key="config.common.services.usb.class.msc.device.composite" value="disable" default="disable" content-id="Atmel.ASF" />
+          <configuration key="config.common.services.usb.class.phdc.device.composite" value="disable" default="disable" content-id="Atmel.ASF" />
+          <configuration key="config.common.services.usb.class.vendor.device.composite" value="disable" default="disable" content-id="Atmel.ASF" />
+        </configurations>
+        <files>
+          <file path="src/main.c" framework="" version="" source="common/applications/user_application/main.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/config/conf_board.h" framework="" version="" source="common/applications/user_application/user_board/config/conf_board.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/calendar/calendar.c" framework="" version="3.27.3" source="common\services\calendar\calendar.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/calendar/calendar.h" framework="" version="3.27.3" source="common\services\calendar\calendar.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/hugemem/avr8/avr8_hugemem.c" framework="" version="3.27.3" source="common\services\hugemem\avr8\avr8_hugemem.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/hugemem/hugemem.h" framework="" version="3.27.3" source="common\services\hugemem\hugemem.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/hugemem/avr8/hugemem.h" framework="" version="3.27.3" source="common\services\hugemem\avr8\hugemem.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/hugemem/generic/hugemem.h" framework="" version="3.27.3" source="common\services\hugemem\generic\hugemem.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/storage/ctrl_access/ctrl_access.c" framework="" version="3.27.3" source="common\services\storage\ctrl_access\ctrl_access.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/storage/ctrl_access/ctrl_access.h" framework="" version="3.27.3" source="common\services\storage\ctrl_access\ctrl_access.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/Config/conf_access.h" framework="" version="3.27.3" source="common\services\storage\ctrl_access\module_config\conf_access.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/ac/ac.c" framework="" version="3.27.3" source="xmega\drivers\ac\ac.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/ac/ac.h" framework="" version="3.27.3" source="xmega\drivers\ac\ac.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/cpu/ccp.s" framework="" version="3.27.3" source="xmega\drivers\cpu\ccp.s" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/cpu/xmega_reset_cause.h" framework="" version="3.27.3" source="xmega\drivers\cpu\xmega_reset_cause.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/cpu/ccp.h" framework="" version="3.27.3" source="xmega\drivers\cpu\ccp.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/dma/dma.c" framework="" version="3.27.3" source="xmega\drivers\dma\dma.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/dma/dma.h" framework="" version="3.27.3" source="xmega\drivers\dma\dma.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/nvm/nvm.c" framework="" version="3.27.3" source="xmega\drivers\nvm\nvm.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/nvm/nvm_asm.s" framework="" version="3.27.3" source="xmega\drivers\nvm\nvm_asm.s" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/nvm/nvm.h" framework="" version="3.27.3" source="xmega\drivers\nvm\nvm.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/pmic/pmic.h" framework="" version="3.27.3" source="xmega\drivers\pmic\pmic.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/rtc/rtc.c" framework="" version="3.27.3" source="xmega\drivers\rtc\rtc.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/rtc/rtc.h" framework="" version="3.27.3" source="xmega\drivers\rtc\rtc.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/Config/conf_rtc.h" framework="" version="3.27.3" source="xmega\drivers\rtc\module_config\conf_rtc.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/sleep/sleep.h" framework="" version="3.27.3" source="xmega\drivers\sleep\sleep.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/spi/spi.c" framework="" version="3.27.3" source="xmega\drivers\spi\spi.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/spi/spi.h" framework="" version="3.27.3" source="xmega\drivers\spi\spi.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/tc/tc.c" framework="" version="3.27.3" source="xmega\drivers\tc\tc.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/tc/tc.h" framework="" version="3.27.3" source="xmega\drivers\tc\tc.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/wdt/wdt.c" framework="" version="3.27.3" source="xmega\drivers\wdt\wdt.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/wdt/wdt.h" framework="" version="3.27.3" source="xmega\drivers\wdt\wdt.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/services/pwm/pwm.c" framework="" version="3.27.3" source="xmega\services\pwm\pwm.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/services/pwm/pwm.h" framework="" version="3.27.3" source="xmega\services\pwm\pwm.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/drivers/nvm/xmega/xmega_nvm.c" framework="" version="3.27.3" source="common\drivers\nvm\xmega\xmega_nvm.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/drivers/nvm/common_nvm.h" framework="" version="3.27.3" source="common\drivers\nvm\common_nvm.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/Config/conf_nvm.h" framework="" version="3.27.3" source="common\drivers\nvm\xmega\module_config\conf_nvm.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/clock/xmega/sysclk.c" framework="" version="3.27.3" source="common\services\clock\xmega\sysclk.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/clock/pll.h" framework="" version="3.27.3" source="common\services\clock\pll.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/clock/genclk.h" framework="" version="3.27.3" source="common\services\clock\genclk.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/clock/osc.h" framework="" version="3.27.3" source="common\services\clock\osc.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/clock/xmega/pll.h" framework="" version="3.27.3" source="common\services\clock\xmega\pll.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/clock/xmega/sysclk.h" framework="" version="3.27.3" source="common\services\clock\xmega\sysclk.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/clock/xmega/osc.h" framework="" version="3.27.3" source="common\services\clock\xmega\osc.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/clock/sysclk.h" framework="" version="3.27.3" source="common\services\clock\sysclk.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/Config/conf_clock.h" framework="" version="3.27.3" source="common\services\clock\xmega\module_config_usb\conf_clock.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/delay/delay.h" framework="" version="3.27.3" source="common\services\delay\delay.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/delay/xmega/cycle_counter.h" framework="" version="3.27.3" source="common\services\delay\xmega\cycle_counter.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/gpio/gpio.h" framework="" version="3.27.3" source="common\services\gpio\gpio.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/gpio/xmega_gpio/xmega_gpio.h" framework="" version="3.27.3" source="common\services\gpio\xmega_gpio\xmega_gpio.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/ioport/xmega/ioport_compat.c" framework="" version="3.27.3" source="common\services\ioport\xmega\ioport_compat.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/ioport/xmega/ioport_compat.h" framework="" version="3.27.3" source="common\services\ioport\xmega\ioport_compat.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/ioport/xmega/ioport.h" framework="" version="3.27.3" source="common\services\ioport\xmega\ioport.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/ioport/ioport.h" framework="" version="3.27.3" source="common\services\ioport\ioport.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/serial/usart_serial.c" framework="" version="3.27.3" source="common\services\serial\usart_serial.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/serial/xmega_usart/usart_serial.h" framework="" version="3.27.3" source="common\services\serial\xmega_usart\usart_serial.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/serial/serial.h" framework="" version="3.27.3" source="common\services\serial\serial.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/Config/conf_usart_serial.h" framework="" version="3.27.3" source="common\services\serial\xmega_usart\module_config\conf_usart_serial.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/sleepmgr/xmega/sleepmgr.c" framework="" version="3.27.3" source="common\services\sleepmgr\xmega\sleepmgr.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/sleepmgr/sleepmgr.h" framework="" version="3.27.3" source="common\services\sleepmgr\sleepmgr.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/sleepmgr/xmega/sleepmgr.h" framework="" version="3.27.3" source="common\services\sleepmgr\xmega\sleepmgr.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/Config/conf_sleepmgr.h" framework="" version="3.27.3" source="common\services\sleepmgr\xmega\module_config\conf_sleepmgr.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/spi/xmega_spi/spi_master.c" framework="" version="3.27.3" source="common\services\spi\xmega_spi\spi_master.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/spi/spi_master.h" framework="" version="3.27.3" source="common\services\spi\spi_master.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/spi/xmega_spi/spi_master.h" framework="" version="3.27.3" source="common\services\spi\xmega_spi\spi_master.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/Config/conf_spi_master.h" framework="" version="3.27.3" source="common\services\spi\xmega_spi\module_config\conf_spi_master.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/usb/usb_atmel.h" framework="" version="3.27.3" source="common\services\usb\usb_atmel.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/usb/usb_protocol.h" framework="" version="3.27.3" source="common\services\usb\usb_protocol.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/usb/class/cdc/usb_protocol_cdc.h" framework="" version="3.27.3" source="common\services\usb\class\cdc\usb_protocol_cdc.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/usb/class/cdc/device/udi_cdc.c" framework="" version="3.27.3" source="common\services\usb\class\cdc\device\udi_cdc.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/usb/class/cdc/device/udi_cdc_desc.c" framework="" version="3.27.3" source="common\services\usb\class\cdc\device\udi_cdc_desc.c" changed="False" content-id="Atmel.ASF" />
+          <file path="atmel_devices_cdc.cat" framework="" version="3.27.3" source="common\services\usb\class\cdc\device\atmel_devices_cdc.cat" changed="False" content-id="Atmel.ASF" />
+          <file path="atmel_devices_cdc.inf" framework="" version="3.27.3" source="common\services\usb\class\cdc\device\atmel_devices_cdc.inf" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/usb/class/cdc/device/udi_cdc.h" framework="" version="3.27.3" source="common\services\usb\class\cdc\device\udi_cdc.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/usb/class/cdc/device/udi_cdc_conf.h" framework="" version="3.27.3" source="common\services\usb\class\cdc\device\udi_cdc_conf.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/Config/conf_usb.h" framework="" version="3.27.3" source="common\services\usb\class\cdc\device\module_config\conf_usb.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/usb/udc/udc.c" framework="" version="3.27.3" source="common\services\usb\udc\udc.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/usb/udc/udc.h" framework="" version="3.27.3" source="common\services\usb\udc\udc.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/usb/udc/udd.h" framework="" version="3.27.3" source="common\services\usb\udc\udd.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/usb/udc/udc_desc.h" framework="" version="3.27.3" source="common\services\usb\udc\udc_desc.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/usb/udc/udi.h" framework="" version="3.27.3" source="common\services\usb\udc\udi.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/utils/stdio/read.c" framework="" version="3.27.3" source="common\utils\stdio\read.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/utils/stdio/write.c" framework="" version="3.27.3" source="common\utils\stdio\write.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/utils/stdio/stdio_serial/stdio_serial.h" framework="" version="3.27.3" source="common\utils\stdio\stdio_serial\stdio_serial.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/utils/stdio/stdio_usb/stdio_usb.c" framework="" version="3.27.3" source="common\utils\stdio\stdio_usb\stdio_usb.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/utils/stdio/stdio_usb/stdio_usb.h" framework="" version="3.27.3" source="common\utils\stdio\stdio_usb\stdio_usb.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/thirdparty/wireless/addons/sio2host/usb/sio2host.c" framework="" version="3.27.3" source="thirdparty\wireless\addons\sio2host\usb\sio2host.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/thirdparty/wireless/addons/sio2host/usb/sio2host.h" framework="" version="3.27.3" source="thirdparty\wireless\addons\sio2host\usb\sio2host.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/Config/conf_sio2host.h" framework="" version="3.27.3" source="thirdparty\wireless\addons\sio2host\module_config\conf_sio2host.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/adc/xmega_aau/adc_aau.c" framework="" version="3.27.3" source="xmega\drivers\adc\xmega_aau\adc_aau.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/adc/adc.c" framework="" version="3.27.3" source="xmega\drivers\adc\adc.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/adc/adc.h" framework="" version="3.27.3" source="xmega\drivers\adc\adc.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/Config/conf_adc.h" framework="" version="3.27.3" source="xmega\drivers\adc\module_config\conf_adc.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/usart/usart.c" framework="" version="3.27.3" source="xmega\drivers\usart\usart.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/usart/usart.h" framework="" version="3.27.3" source="xmega\drivers\usart\usart.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/usb/usb_device.c" framework="" version="3.27.3" source="xmega\drivers\usb\usb_device.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/drivers/usb/usb_device.h" framework="" version="3.27.3" source="xmega\drivers\usb\usb_device.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/services/cpu/reset_cause.h" framework="" version="3.27.3" source="common\services\cpu\reset_cause.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/boards/user_board/user_board.h" framework="" version="3.27.3" source="common\boards\user_board\user_board.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/boards/user_board/init.c" framework="" version="3.27.3" source="common\boards\user_board\init.c" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/boards/board.h" framework="" version="3.27.3" source="common\boards\board.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/utils/progmem.h" framework="" version="3.27.3" source="xmega\utils\progmem.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/utils/assembler.h" framework="" version="3.27.3" source="xmega\utils\assembler.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/utils/bit_handling/clz_ctz.h" framework="" version="3.27.3" source="xmega\utils\bit_handling\clz_ctz.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/utils/preprocessor/preprocessor.h" framework="" version="3.27.3" source="xmega\utils\preprocessor\preprocessor.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/utils/preprocessor/stringz.h" framework="" version="3.27.3" source="xmega\utils\preprocessor\stringz.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/utils/preprocessor/tpaste.h" framework="" version="3.27.3" source="xmega\utils\preprocessor\tpaste.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/utils/compiler.h" framework="" version="3.27.3" source="xmega\utils\compiler.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/utils/status_codes.h" framework="" version="3.27.3" source="xmega\utils\status_codes.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/utils/preprocessor/mrepeat.h" framework="" version="3.27.3" source="xmega\utils\preprocessor\mrepeat.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/xmega/utils/assembler/gas.h" framework="" version="3.27.3" source="xmega\utils\assembler\gas.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/utils/interrupt.h" framework="" version="3.27.3" source="common\utils\interrupt.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/utils/interrupt/interrupt_avr8.h" framework="" version="3.27.3" source="common\utils\interrupt\interrupt_avr8.h" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/utils/make/Makefile.avr.in" framework="" version="3.27.3" source="common\utils\make\Makefile.avr.in" changed="False" content-id="Atmel.ASF" />
+          <file path="src/ASF/common/utils/parts.h" framework="" version="3.27.3" source="common\utils\parts.h" changed="False" content-id="Atmel.ASF" />
+        </files>
+        <documentation help="http://asf.atmel.com/docs/3.27.3/common.applications.user_application.user_board.xmegaau/html/index.html" />
+        <offline-documentation help="" />
+        <dependencies>
+          <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.27.3" />
+        </dependencies>
+        <project id="common.applications.user_application.user_board.xmegaau" value="Add" config="" content-id="Atmel.ASF" />
+        <board id="board.user_board.xmegaau" value="Add" config="" content-id="Atmel.ASF" />
+      </framework-data>
     </AsfFrameworkConfig>
     <avrtool>com.atmel.avrdbg.tool.avrdragon</avrtool>
     <avrtoolinterface>PDI</avrtoolinterface>
@@ -214,261 +214,272 @@
       <ToolName>AVR Dragon</ToolName>
     </com_atmel_avrdbg_tool_avrdragon>
     <TriggerUpgrade>true</TriggerUpgrade>
+    <com_atmel_avrdbg_tool_simulator>
+      <ToolOptions xmlns="">
+        <InterfaceProperties>
+        </InterfaceProperties>
+        <InterfaceName>
+        </InterfaceName>
+      </ToolOptions>
+      <ToolType xmlns="">com.atmel.avrdbg.tool.simulator</ToolType>
+      <ToolNumber xmlns="">
+      </ToolNumber>
+      <ToolName xmlns="">Simulator</ToolName>
+    </com_atmel_avrdbg_tool_simulator>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <ToolchainSettings>
       <AvrGcc>
-  <avrgcc.common.Device>-mmcu=atxmega128a4u -B "%24(PackRepoDir)\atmel\XMEGAA_DFP\1.0.36\gcc\dev\atxmega128a4u"</avrgcc.common.Device>
-  <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
-  <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
-  <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
-  <avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
-  <avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
-  <avrgcc.compiler.symbols.DefSymbols>
-    <ListValues>
-      <Value>NDEBUG</Value>
-      <Value>IOPORT_XMEGA_COMPAT</Value>
-      <Value>BOARD=USER_BOARD</Value>
-    </ListValues>
-  </avrgcc.compiler.symbols.DefSymbols>
-  <avrgcc.compiler.directories.IncludePaths>
-    <ListValues>
-      <Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.0.36\include</Value>
-      <Value>../common/applications/user_application/user_board/config</Value>
-      <Value>../src/config</Value>
-      <Value>../src</Value>
-      <Value>../src/ASF/common/services/calendar</Value>
-      <Value>../src/ASF/common/services/hugemem</Value>
-      <Value>../src/ASF/common/services/storage/ctrl_access</Value>
-      <Value>../src/ASF/xmega/drivers/ac</Value>
-      <Value>../src/ASF/xmega/drivers/cpu</Value>
-      <Value>../src/ASF/xmega/drivers/dma</Value>
-      <Value>../src/ASF/xmega/drivers/nvm</Value>
-      <Value>../src/ASF/xmega/drivers/pmic</Value>
-      <Value>../src/ASF/xmega/drivers/rtc</Value>
-      <Value>../src/ASF/xmega/drivers/sleep</Value>
-      <Value>../src/ASF/xmega/drivers/spi</Value>
-      <Value>../src/ASF/xmega/drivers/tc</Value>
-      <Value>../src/ASF/xmega/drivers/wdt</Value>
-      <Value>../src/ASF/xmega/services/pwm</Value>
-      <Value>../src/ASF/common/drivers/nvm</Value>
-      <Value>../src/ASF/common/services/clock</Value>
-      <Value>../src/ASF/common/services/delay</Value>
-      <Value>../src/ASF/common/services/gpio</Value>
-      <Value>../src/ASF/common/services/ioport</Value>
-      <Value>../src/ASF/common/services/serial/xmega_usart</Value>
-      <Value>../src/ASF/common/services/serial</Value>
-      <Value>../src/ASF/common/services/sleepmgr</Value>
-      <Value>../src/ASF/common/services/spi/xmega_spi</Value>
-      <Value>../src/ASF/common/services/spi</Value>
-      <Value>../src/ASF/common/services/usb</Value>
-      <Value>../src/ASF/common/services/usb/class/cdc</Value>
-      <Value>../src/ASF/common/services/usb/class/cdc/device</Value>
-      <Value>../src/ASF/common/services/usb/udc</Value>
-      <Value>../src/ASF/common/utils/stdio/stdio_serial</Value>
-      <Value>../src/ASF/common/utils/stdio/stdio_usb</Value>
-      <Value>../src/ASF/thirdparty/wireless/addons/sio2host/usb</Value>
-      <Value>../src/ASF/xmega/drivers/adc</Value>
-      <Value>../src/ASF/xmega/drivers/usart</Value>
-      <Value>../src/ASF/xmega/drivers/usb</Value>
-      <Value>../src/ASF/common/services/cpu</Value>
-      <Value>../src/ASF/common/boards/user_board</Value>
-      <Value>../src/ASF/common/boards</Value>
-      <Value>../src/ASF/xmega/utils/preprocessor</Value>
-      <Value>../src/ASF/xmega/utils</Value>
-      <Value>../src/ASF/common/utils</Value>
-    </ListValues>
-  </avrgcc.compiler.directories.IncludePaths>
-  <avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
-  <avrgcc.compiler.optimization.OtherFlags>-fdata-sections</avrgcc.compiler.optimization.OtherFlags>
-  <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
-  <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
-  <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
-  <avrgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -fno-strict-aliasing -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax</avrgcc.compiler.miscellaneous.OtherFlags>
-  <avrgcc.linker.libraries.Libraries>
-    <ListValues>
-      <Value>libm</Value>
-    </ListValues>
-  </avrgcc.linker.libraries.Libraries>
-  <avrgcc.linker.miscellaneous.LinkerFlags>-Wl,--relax</avrgcc.linker.miscellaneous.LinkerFlags>
-  <avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=USER_BOARD</avrgcc.assembler.general.AssemblerFlags>
-  <avrgcc.assembler.general.IncludePaths>
-    <ListValues>
-      <Value>../common/applications/user_application/user_board/config</Value>
-      <Value>../src/config</Value>
-      <Value>../src</Value>
-      <Value>../src/ASF/common/services/calendar</Value>
-      <Value>../src/ASF/common/services/hugemem</Value>
-      <Value>../src/ASF/common/services/storage/ctrl_access</Value>
-      <Value>../src/ASF/xmega/drivers/ac</Value>
-      <Value>../src/ASF/xmega/drivers/cpu</Value>
-      <Value>../src/ASF/xmega/drivers/dma</Value>
-      <Value>../src/ASF/xmega/drivers/nvm</Value>
-      <Value>../src/ASF/xmega/drivers/pmic</Value>
-      <Value>../src/ASF/xmega/drivers/rtc</Value>
-      <Value>../src/ASF/xmega/drivers/sleep</Value>
-      <Value>../src/ASF/xmega/drivers/spi</Value>
-      <Value>../src/ASF/xmega/drivers/tc</Value>
-      <Value>../src/ASF/xmega/drivers/wdt</Value>
-      <Value>../src/ASF/xmega/services/pwm</Value>
-      <Value>../src/ASF/common/drivers/nvm</Value>
-      <Value>../src/ASF/common/services/clock</Value>
-      <Value>../src/ASF/common/services/delay</Value>
-      <Value>../src/ASF/common/services/gpio</Value>
-      <Value>../src/ASF/common/services/ioport</Value>
-      <Value>../src/ASF/common/services/serial/xmega_usart</Value>
-      <Value>../src/ASF/common/services/serial</Value>
-      <Value>../src/ASF/common/services/sleepmgr</Value>
-      <Value>../src/ASF/common/services/spi/xmega_spi</Value>
-      <Value>../src/ASF/common/services/spi</Value>
-      <Value>../src/ASF/common/services/usb</Value>
-      <Value>../src/ASF/common/services/usb/class/cdc</Value>
-      <Value>../src/ASF/common/services/usb/class/cdc/device</Value>
-      <Value>../src/ASF/common/services/usb/udc</Value>
-      <Value>../src/ASF/common/utils/stdio/stdio_serial</Value>
-      <Value>../src/ASF/common/utils/stdio/stdio_usb</Value>
-      <Value>../src/ASF/thirdparty/wireless/addons/sio2host/usb</Value>
-      <Value>../src/ASF/xmega/drivers/adc</Value>
-      <Value>../src/ASF/xmega/drivers/usart</Value>
-      <Value>../src/ASF/xmega/drivers/usb</Value>
-      <Value>../src/ASF/common/services/cpu</Value>
-      <Value>../src/ASF/common/boards/user_board</Value>
-      <Value>../src/ASF/common/boards</Value>
-      <Value>../src/ASF/xmega/utils/preprocessor</Value>
-      <Value>../src/ASF/xmega/utils</Value>
-      <Value>../src/ASF/common/utils</Value>
-    </ListValues>
-  </avrgcc.assembler.general.IncludePaths>
-</AvrGcc>
+        <avrgcc.common.Device>-mmcu=atxmega128a4u -B "%24(PackRepoDir)\atmel\XMEGAA_DFP\1.0.36\gcc\dev\atxmega128a4u"</avrgcc.common.Device>
+        <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
+        <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
+        <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
+        <avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
+        <avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
+        <avrgcc.compiler.symbols.DefSymbols>
+          <ListValues>
+            <Value>NDEBUG</Value>
+            <Value>IOPORT_XMEGA_COMPAT</Value>
+            <Value>BOARD=USER_BOARD</Value>
+          </ListValues>
+        </avrgcc.compiler.symbols.DefSymbols>
+        <avrgcc.compiler.directories.IncludePaths>
+          <ListValues>
+            <Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.0.36\include</Value>
+            <Value>../common/applications/user_application/user_board/config</Value>
+            <Value>../src/config</Value>
+            <Value>../src</Value>
+            <Value>../src/ASF/common/services/calendar</Value>
+            <Value>../src/ASF/common/services/hugemem</Value>
+            <Value>../src/ASF/common/services/storage/ctrl_access</Value>
+            <Value>../src/ASF/xmega/drivers/ac</Value>
+            <Value>../src/ASF/xmega/drivers/cpu</Value>
+            <Value>../src/ASF/xmega/drivers/dma</Value>
+            <Value>../src/ASF/xmega/drivers/nvm</Value>
+            <Value>../src/ASF/xmega/drivers/pmic</Value>
+            <Value>../src/ASF/xmega/drivers/rtc</Value>
+            <Value>../src/ASF/xmega/drivers/sleep</Value>
+            <Value>../src/ASF/xmega/drivers/spi</Value>
+            <Value>../src/ASF/xmega/drivers/tc</Value>
+            <Value>../src/ASF/xmega/drivers/wdt</Value>
+            <Value>../src/ASF/xmega/services/pwm</Value>
+            <Value>../src/ASF/common/drivers/nvm</Value>
+            <Value>../src/ASF/common/services/clock</Value>
+            <Value>../src/ASF/common/services/delay</Value>
+            <Value>../src/ASF/common/services/gpio</Value>
+            <Value>../src/ASF/common/services/ioport</Value>
+            <Value>../src/ASF/common/services/serial/xmega_usart</Value>
+            <Value>../src/ASF/common/services/serial</Value>
+            <Value>../src/ASF/common/services/sleepmgr</Value>
+            <Value>../src/ASF/common/services/spi/xmega_spi</Value>
+            <Value>../src/ASF/common/services/spi</Value>
+            <Value>../src/ASF/common/services/usb</Value>
+            <Value>../src/ASF/common/services/usb/class/cdc</Value>
+            <Value>../src/ASF/common/services/usb/class/cdc/device</Value>
+            <Value>../src/ASF/common/services/usb/udc</Value>
+            <Value>../src/ASF/common/utils/stdio/stdio_serial</Value>
+            <Value>../src/ASF/common/utils/stdio/stdio_usb</Value>
+            <Value>../src/ASF/thirdparty/wireless/addons/sio2host/usb</Value>
+            <Value>../src/ASF/xmega/drivers/adc</Value>
+            <Value>../src/ASF/xmega/drivers/usart</Value>
+            <Value>../src/ASF/xmega/drivers/usb</Value>
+            <Value>../src/ASF/common/services/cpu</Value>
+            <Value>../src/ASF/common/boards/user_board</Value>
+            <Value>../src/ASF/common/boards</Value>
+            <Value>../src/ASF/xmega/utils/preprocessor</Value>
+            <Value>../src/ASF/xmega/utils</Value>
+            <Value>../src/ASF/common/utils</Value>
+          </ListValues>
+        </avrgcc.compiler.directories.IncludePaths>
+        <avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
+        <avrgcc.compiler.optimization.OtherFlags>-fdata-sections</avrgcc.compiler.optimization.OtherFlags>
+        <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
+        <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
+        <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
+        <avrgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -fno-strict-aliasing -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax</avrgcc.compiler.miscellaneous.OtherFlags>
+        <avrgcc.linker.libraries.Libraries>
+          <ListValues>
+            <Value>libm</Value>
+          </ListValues>
+        </avrgcc.linker.libraries.Libraries>
+        <avrgcc.linker.miscellaneous.LinkerFlags>-Wl,--relax</avrgcc.linker.miscellaneous.LinkerFlags>
+        <avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=USER_BOARD</avrgcc.assembler.general.AssemblerFlags>
+        <avrgcc.assembler.general.IncludePaths>
+          <ListValues>
+            <Value>../common/applications/user_application/user_board/config</Value>
+            <Value>../src/config</Value>
+            <Value>../src</Value>
+            <Value>../src/ASF/common/services/calendar</Value>
+            <Value>../src/ASF/common/services/hugemem</Value>
+            <Value>../src/ASF/common/services/storage/ctrl_access</Value>
+            <Value>../src/ASF/xmega/drivers/ac</Value>
+            <Value>../src/ASF/xmega/drivers/cpu</Value>
+            <Value>../src/ASF/xmega/drivers/dma</Value>
+            <Value>../src/ASF/xmega/drivers/nvm</Value>
+            <Value>../src/ASF/xmega/drivers/pmic</Value>
+            <Value>../src/ASF/xmega/drivers/rtc</Value>
+            <Value>../src/ASF/xmega/drivers/sleep</Value>
+            <Value>../src/ASF/xmega/drivers/spi</Value>
+            <Value>../src/ASF/xmega/drivers/tc</Value>
+            <Value>../src/ASF/xmega/drivers/wdt</Value>
+            <Value>../src/ASF/xmega/services/pwm</Value>
+            <Value>../src/ASF/common/drivers/nvm</Value>
+            <Value>../src/ASF/common/services/clock</Value>
+            <Value>../src/ASF/common/services/delay</Value>
+            <Value>../src/ASF/common/services/gpio</Value>
+            <Value>../src/ASF/common/services/ioport</Value>
+            <Value>../src/ASF/common/services/serial/xmega_usart</Value>
+            <Value>../src/ASF/common/services/serial</Value>
+            <Value>../src/ASF/common/services/sleepmgr</Value>
+            <Value>../src/ASF/common/services/spi/xmega_spi</Value>
+            <Value>../src/ASF/common/services/spi</Value>
+            <Value>../src/ASF/common/services/usb</Value>
+            <Value>../src/ASF/common/services/usb/class/cdc</Value>
+            <Value>../src/ASF/common/services/usb/class/cdc/device</Value>
+            <Value>../src/ASF/common/services/usb/udc</Value>
+            <Value>../src/ASF/common/utils/stdio/stdio_serial</Value>
+            <Value>../src/ASF/common/utils/stdio/stdio_usb</Value>
+            <Value>../src/ASF/thirdparty/wireless/addons/sio2host/usb</Value>
+            <Value>../src/ASF/xmega/drivers/adc</Value>
+            <Value>../src/ASF/xmega/drivers/usart</Value>
+            <Value>../src/ASF/xmega/drivers/usb</Value>
+            <Value>../src/ASF/common/services/cpu</Value>
+            <Value>../src/ASF/common/boards/user_board</Value>
+            <Value>../src/ASF/common/boards</Value>
+            <Value>../src/ASF/xmega/utils/preprocessor</Value>
+            <Value>../src/ASF/xmega/utils</Value>
+            <Value>../src/ASF/common/utils</Value>
+          </ListValues>
+        </avrgcc.assembler.general.IncludePaths>
+      </AvrGcc>
     </ToolchainSettings>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <ToolchainSettings>
       <AvrGcc>
-  <avrgcc.common.Device>-mmcu=atxmega128a4u -B "%24(PackRepoDir)\atmel\XMEGAA_DFP\1.0.36\gcc\dev\atxmega128a4u"</avrgcc.common.Device>
-  <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
-  <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
-  <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
-  <avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
-  <avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
-  <avrgcc.compiler.symbols.DefSymbols>
-    <ListValues>
-      <Value>DEBUG</Value>
-      <Value>IOPORT_XMEGA_COMPAT</Value>
-      <Value>BOARD=USER_BOARD</Value>
-    </ListValues>
-  </avrgcc.compiler.symbols.DefSymbols>
-  <avrgcc.compiler.directories.IncludePaths>
-    <ListValues>
-      <Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.0.36\include</Value>
-      <Value>../common/applications/user_application/user_board/config</Value>
-      <Value>../src/config</Value>
-      <Value>../src</Value>
-      <Value>../src/ASF/common/services/calendar</Value>
-      <Value>../src/ASF/common/services/hugemem</Value>
-      <Value>../src/ASF/common/services/storage/ctrl_access</Value>
-      <Value>../src/ASF/xmega/drivers/ac</Value>
-      <Value>../src/ASF/xmega/drivers/cpu</Value>
-      <Value>../src/ASF/xmega/drivers/dma</Value>
-      <Value>../src/ASF/xmega/drivers/nvm</Value>
-      <Value>../src/ASF/xmega/drivers/pmic</Value>
-      <Value>../src/ASF/xmega/drivers/rtc</Value>
-      <Value>../src/ASF/xmega/drivers/sleep</Value>
-      <Value>../src/ASF/xmega/drivers/spi</Value>
-      <Value>../src/ASF/xmega/drivers/tc</Value>
-      <Value>../src/ASF/xmega/drivers/wdt</Value>
-      <Value>../src/ASF/xmega/services/pwm</Value>
-      <Value>../src/ASF/common/drivers/nvm</Value>
-      <Value>../src/ASF/common/services/clock</Value>
-      <Value>../src/ASF/common/services/delay</Value>
-      <Value>../src/ASF/common/services/gpio</Value>
-      <Value>../src/ASF/common/services/ioport</Value>
-      <Value>../src/ASF/common/services/serial/xmega_usart</Value>
-      <Value>../src/ASF/common/services/serial</Value>
-      <Value>../src/ASF/common/services/sleepmgr</Value>
-      <Value>../src/ASF/common/services/spi/xmega_spi</Value>
-      <Value>../src/ASF/common/services/spi</Value>
-      <Value>../src/ASF/common/services/usb</Value>
-      <Value>../src/ASF/common/services/usb/class/cdc</Value>
-      <Value>../src/ASF/common/services/usb/class/cdc/device</Value>
-      <Value>../src/ASF/common/services/usb/udc</Value>
-      <Value>../src/ASF/common/utils/stdio/stdio_serial</Value>
-      <Value>../src/ASF/common/utils/stdio/stdio_usb</Value>
-      <Value>../src/ASF/thirdparty/wireless/addons/sio2host/usb</Value>
-      <Value>../src/ASF/xmega/drivers/adc</Value>
-      <Value>../src/ASF/xmega/drivers/usart</Value>
-      <Value>../src/ASF/xmega/drivers/usb</Value>
-      <Value>../src/ASF/common/services/cpu</Value>
-      <Value>../src/ASF/common/boards/user_board</Value>
-      <Value>../src/ASF/common/boards</Value>
-      <Value>../src/ASF/xmega/utils/preprocessor</Value>
-      <Value>../src/ASF/xmega/utils</Value>
-      <Value>../src/ASF/common/utils</Value>
-    </ListValues>
-  </avrgcc.compiler.directories.IncludePaths>
-  <avrgcc.compiler.optimization.level>Optimize (-O1)</avrgcc.compiler.optimization.level>
-  <avrgcc.compiler.optimization.OtherFlags>-fdata-sections</avrgcc.compiler.optimization.OtherFlags>
-  <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
-  <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
-  <avrgcc.compiler.optimization.DebugLevel>Maximum (-g3)</avrgcc.compiler.optimization.DebugLevel>
-  <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
-  <avrgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -fno-strict-aliasing -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax</avrgcc.compiler.miscellaneous.OtherFlags>
-  <avrgcc.linker.libraries.Libraries>
-    <ListValues>
-      <Value>libm</Value>
-    </ListValues>
-  </avrgcc.linker.libraries.Libraries>
-  <avrgcc.linker.miscellaneous.LinkerFlags>-Wl,--relax</avrgcc.linker.miscellaneous.LinkerFlags>
-  <avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=USER_BOARD</avrgcc.assembler.general.AssemblerFlags>
-  <avrgcc.assembler.general.IncludePaths>
-    <ListValues>
-      <Value>../common/applications/user_application/user_board/config</Value>
-      <Value>../src/config</Value>
-      <Value>../src</Value>
-      <Value>../src/ASF/common/services/calendar</Value>
-      <Value>../src/ASF/common/services/hugemem</Value>
-      <Value>../src/ASF/common/services/storage/ctrl_access</Value>
-      <Value>../src/ASF/xmega/drivers/ac</Value>
-      <Value>../src/ASF/xmega/drivers/cpu</Value>
-      <Value>../src/ASF/xmega/drivers/dma</Value>
-      <Value>../src/ASF/xmega/drivers/nvm</Value>
-      <Value>../src/ASF/xmega/drivers/pmic</Value>
-      <Value>../src/ASF/xmega/drivers/rtc</Value>
-      <Value>../src/ASF/xmega/drivers/sleep</Value>
-      <Value>../src/ASF/xmega/drivers/spi</Value>
-      <Value>../src/ASF/xmega/drivers/tc</Value>
-      <Value>../src/ASF/xmega/drivers/wdt</Value>
-      <Value>../src/ASF/xmega/services/pwm</Value>
-      <Value>../src/ASF/common/drivers/nvm</Value>
-      <Value>../src/ASF/common/services/clock</Value>
-      <Value>../src/ASF/common/services/delay</Value>
-      <Value>../src/ASF/common/services/gpio</Value>
-      <Value>../src/ASF/common/services/ioport</Value>
-      <Value>../src/ASF/common/services/serial/xmega_usart</Value>
-      <Value>../src/ASF/common/services/serial</Value>
-      <Value>../src/ASF/common/services/sleepmgr</Value>
-      <Value>../src/ASF/common/services/spi/xmega_spi</Value>
-      <Value>../src/ASF/common/services/spi</Value>
-      <Value>../src/ASF/common/services/usb</Value>
-      <Value>../src/ASF/common/services/usb/class/cdc</Value>
-      <Value>../src/ASF/common/services/usb/class/cdc/device</Value>
-      <Value>../src/ASF/common/services/usb/udc</Value>
-      <Value>../src/ASF/common/utils/stdio/stdio_serial</Value>
-      <Value>../src/ASF/common/utils/stdio/stdio_usb</Value>
-      <Value>../src/ASF/thirdparty/wireless/addons/sio2host/usb</Value>
-      <Value>../src/ASF/xmega/drivers/adc</Value>
-      <Value>../src/ASF/xmega/drivers/usart</Value>
-      <Value>../src/ASF/xmega/drivers/usb</Value>
-      <Value>../src/ASF/common/services/cpu</Value>
-      <Value>../src/ASF/common/boards/user_board</Value>
-      <Value>../src/ASF/common/boards</Value>
-      <Value>../src/ASF/xmega/utils/preprocessor</Value>
-      <Value>../src/ASF/xmega/utils</Value>
-      <Value>../src/ASF/common/utils</Value>
-    </ListValues>
-  </avrgcc.assembler.general.IncludePaths>
-  <avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
-</AvrGcc>
+        <avrgcc.common.Device>-mmcu=atxmega128a4u -B "%24(PackRepoDir)\atmel\XMEGAA_DFP\1.0.36\gcc\dev\atxmega128a4u"</avrgcc.common.Device>
+        <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
+        <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
+        <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
+        <avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
+        <avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
+        <avrgcc.compiler.symbols.DefSymbols>
+          <ListValues>
+            <Value>DEBUG</Value>
+            <Value>IOPORT_XMEGA_COMPAT</Value>
+            <Value>BOARD=USER_BOARD</Value>
+          </ListValues>
+        </avrgcc.compiler.symbols.DefSymbols>
+        <avrgcc.compiler.directories.IncludePaths>
+          <ListValues>
+            <Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.0.36\include</Value>
+            <Value>../common/applications/user_application/user_board/config</Value>
+            <Value>../src/config</Value>
+            <Value>../src</Value>
+            <Value>../src/ASF/common/services/calendar</Value>
+            <Value>../src/ASF/common/services/hugemem</Value>
+            <Value>../src/ASF/common/services/storage/ctrl_access</Value>
+            <Value>../src/ASF/xmega/drivers/ac</Value>
+            <Value>../src/ASF/xmega/drivers/cpu</Value>
+            <Value>../src/ASF/xmega/drivers/dma</Value>
+            <Value>../src/ASF/xmega/drivers/nvm</Value>
+            <Value>../src/ASF/xmega/drivers/pmic</Value>
+            <Value>../src/ASF/xmega/drivers/rtc</Value>
+            <Value>../src/ASF/xmega/drivers/sleep</Value>
+            <Value>../src/ASF/xmega/drivers/spi</Value>
+            <Value>../src/ASF/xmega/drivers/tc</Value>
+            <Value>../src/ASF/xmega/drivers/wdt</Value>
+            <Value>../src/ASF/xmega/services/pwm</Value>
+            <Value>../src/ASF/common/drivers/nvm</Value>
+            <Value>../src/ASF/common/services/clock</Value>
+            <Value>../src/ASF/common/services/delay</Value>
+            <Value>../src/ASF/common/services/gpio</Value>
+            <Value>../src/ASF/common/services/ioport</Value>
+            <Value>../src/ASF/common/services/serial/xmega_usart</Value>
+            <Value>../src/ASF/common/services/serial</Value>
+            <Value>../src/ASF/common/services/sleepmgr</Value>
+            <Value>../src/ASF/common/services/spi/xmega_spi</Value>
+            <Value>../src/ASF/common/services/spi</Value>
+            <Value>../src/ASF/common/services/usb</Value>
+            <Value>../src/ASF/common/services/usb/class/cdc</Value>
+            <Value>../src/ASF/common/services/usb/class/cdc/device</Value>
+            <Value>../src/ASF/common/services/usb/udc</Value>
+            <Value>../src/ASF/common/utils/stdio/stdio_serial</Value>
+            <Value>../src/ASF/common/utils/stdio/stdio_usb</Value>
+            <Value>../src/ASF/thirdparty/wireless/addons/sio2host/usb</Value>
+            <Value>../src/ASF/xmega/drivers/adc</Value>
+            <Value>../src/ASF/xmega/drivers/usart</Value>
+            <Value>../src/ASF/xmega/drivers/usb</Value>
+            <Value>../src/ASF/common/services/cpu</Value>
+            <Value>../src/ASF/common/boards/user_board</Value>
+            <Value>../src/ASF/common/boards</Value>
+            <Value>../src/ASF/xmega/utils/preprocessor</Value>
+            <Value>../src/ASF/xmega/utils</Value>
+            <Value>../src/ASF/common/utils</Value>
+          </ListValues>
+        </avrgcc.compiler.directories.IncludePaths>
+        <avrgcc.compiler.optimization.OtherFlags>-fdata-sections</avrgcc.compiler.optimization.OtherFlags>
+        <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
+        <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
+        <avrgcc.compiler.optimization.DebugLevel>Maximum (-g3)</avrgcc.compiler.optimization.DebugLevel>
+        <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
+        <avrgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -fno-strict-aliasing -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax</avrgcc.compiler.miscellaneous.OtherFlags>
+        <avrgcc.linker.libraries.Libraries>
+          <ListValues>
+            <Value>libm</Value>
+          </ListValues>
+        </avrgcc.linker.libraries.Libraries>
+        <avrgcc.linker.miscellaneous.LinkerFlags>-Wl,--relax</avrgcc.linker.miscellaneous.LinkerFlags>
+        <avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=USER_BOARD</avrgcc.assembler.general.AssemblerFlags>
+        <avrgcc.assembler.general.IncludePaths>
+          <ListValues>
+            <Value>../common/applications/user_application/user_board/config</Value>
+            <Value>../src/config</Value>
+            <Value>../src</Value>
+            <Value>../src/ASF/common/services/calendar</Value>
+            <Value>../src/ASF/common/services/hugemem</Value>
+            <Value>../src/ASF/common/services/storage/ctrl_access</Value>
+            <Value>../src/ASF/xmega/drivers/ac</Value>
+            <Value>../src/ASF/xmega/drivers/cpu</Value>
+            <Value>../src/ASF/xmega/drivers/dma</Value>
+            <Value>../src/ASF/xmega/drivers/nvm</Value>
+            <Value>../src/ASF/xmega/drivers/pmic</Value>
+            <Value>../src/ASF/xmega/drivers/rtc</Value>
+            <Value>../src/ASF/xmega/drivers/sleep</Value>
+            <Value>../src/ASF/xmega/drivers/spi</Value>
+            <Value>../src/ASF/xmega/drivers/tc</Value>
+            <Value>../src/ASF/xmega/drivers/wdt</Value>
+            <Value>../src/ASF/xmega/services/pwm</Value>
+            <Value>../src/ASF/common/drivers/nvm</Value>
+            <Value>../src/ASF/common/services/clock</Value>
+            <Value>../src/ASF/common/services/delay</Value>
+            <Value>../src/ASF/common/services/gpio</Value>
+            <Value>../src/ASF/common/services/ioport</Value>
+            <Value>../src/ASF/common/services/serial/xmega_usart</Value>
+            <Value>../src/ASF/common/services/serial</Value>
+            <Value>../src/ASF/common/services/sleepmgr</Value>
+            <Value>../src/ASF/common/services/spi/xmega_spi</Value>
+            <Value>../src/ASF/common/services/spi</Value>
+            <Value>../src/ASF/common/services/usb</Value>
+            <Value>../src/ASF/common/services/usb/class/cdc</Value>
+            <Value>../src/ASF/common/services/usb/class/cdc/device</Value>
+            <Value>../src/ASF/common/services/usb/udc</Value>
+            <Value>../src/ASF/common/utils/stdio/stdio_serial</Value>
+            <Value>../src/ASF/common/utils/stdio/stdio_usb</Value>
+            <Value>../src/ASF/thirdparty/wireless/addons/sio2host/usb</Value>
+            <Value>../src/ASF/xmega/drivers/adc</Value>
+            <Value>../src/ASF/xmega/drivers/usart</Value>
+            <Value>../src/ASF/xmega/drivers/usb</Value>
+            <Value>../src/ASF/common/services/cpu</Value>
+            <Value>../src/ASF/common/boards/user_board</Value>
+            <Value>../src/ASF/common/boards</Value>
+            <Value>../src/ASF/xmega/utils/preprocessor</Value>
+            <Value>../src/ASF/xmega/utils</Value>
+            <Value>../src/ASF/common/utils</Value>
+          </ListValues>
+        </avrgcc.assembler.general.IncludePaths>
+        <avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
+      </AvrGcc>
     </ToolchainSettings>
   </PropertyGroup>
   <ItemGroup>

From e66dcbc6cf6620db9fe1b5789d81bf8d3fabb55e Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 4 Apr 2017 09:41:13 -0700
Subject: [PATCH 43/83] Compatability for revision information in menu

Also remove extraneous commented code in menus
---
 V2X_Firmware/src/V2X/V2X_menu.c | 57 ++++++---------------------------
 1 file changed, 10 insertions(+), 47 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_menu.c b/V2X_Firmware/src/V2X/V2X_menu.c
index cab1fa2..68cfd56 100644
--- a/V2X_Firmware/src/V2X/V2X_menu.c
+++ b/V2X_Firmware/src/V2X/V2X_menu.c
@@ -17,68 +17,33 @@ void menu_init(void) {
 }
 
 void menu_add_to_command(char value) {
-#if 0
-	usb_tx_string_P(PSTR("menu add got char: \r"));
-	usb_cdc_send_byte(USB_CMD, value);
-#endif
 	if (value == 8 || value == 0x7f) {//if backspace or delete
 		int leng = strlen(CMD_buffer); //get buffer sting length
 		if (leng > 0) {	//if length not 0
 			CMD_buffer[leng-1] = '\0';	//null out the last char
 		}
 	} else if (value > 0x20 && value < 0x7E ) {		//if in ascii set
-#if 0
-		usb_tx_string_P(PSTR("About to concat this char into cmd buffer: \r"));
-		usb_cdc_send_byte(USB_CMD, value);
-#endif
 		char char_str[2] = {'?','\0'};
 		char_str[0] = value;
 		strcat(CMD_buffer, char_str);					//store to buffer
-#if 0
-		// DELETEME: sanity check on strcat function
-		// strcat(CMD_buffer, "X");
-		// strcat(CMD_buffer, 0x25);
-		// DELETEME: print what is going to be added to the command
-		usb_tx_string_P(PSTR("Added character to command, here is the new buffer: \r"));
-
-
-		// force lookup?
-		char* cmd_temp_ptr = CMD_buffer;
-		char temp_char = CMD_buffer[1];
-		//print new buffer we just augmented
-		for (int i = 0; i < 15; i++)
-		{
-			usb_cdc_send_byte(USB_CMD, CMD_buffer[i]);
-		}
-#endif
 
 	}
 }
 
 void menu_main(void) {
-#if 0
-	// DELETEME: printing raw command received
-	usb_tx_string_P(PSTR("MENU GOT COMMAND RAW: \r"));
-	for (int i = 0; i < 15; i++)
-	{
-		usb_cdc_send_byte(USB_CMD, CMD_buffer[i]);
-	}
-#endif
 	for(int i = 0; i < 4; i++){
 		CMD_buffer[i] = tolower(CMD_buffer[i]);
 	}
-#if 0
-	// DELETEME: /* reprint buffer for testing */
-	usb_tx_string_P(PSTR("Got command: \r"));
-	for(int i = 0; i < 10; i++){
-		usb_cdc_send_byte(USB_CMD, CMD_buffer[i]);
-	}
-#endif
 	if (CMD_buffer[0] == 'v' && CMD_buffer[1] == 'x') {
 		switch(CMD_buffer[2]) {
 			case 'i': //information
+#if V2X_REV <= REV_12
 				usb_tx_string_P(PSTR("Vehicle to Everything (V2X) RVI Node 2016\rOpen source hardware and software\rHW Rev1.2 \rSW Rev0.1\r"));
 				break;
+#elif V2X_REV >= REV_20
+				usb_tx_string_P(PSTR("Vehicle to Everything (V2X) RVI Node 2016\rOpen source hardware and software\rHW Rev1.2 \rSW Rev0.1\r"));
+				break;
+#endif
 			case 'j': //Jaguar
 				usb_tx_string_P(PSTR("\r\r   ,ggp@@@@mgg,,\r,$Q$(`S@@$;g$$$$$@$@@gg,\r;gP'$@gg)$$@@$@@@$(L$$||$$@g,\r  `g$P`  ``*%@@@P`)Eg|||lLLL||$Bgg,\r    `       ,gg$$@gg,`$..``$Z$$$$$EB$$@g,\r         @P`pgg$$$||`)gggg;,,     |$$$|$$$@g,\r         9w&    '*^^` ``*P#9BB00000$$$@|`$$$g|Sg,\r                                    *$@@L ```T$W~)%g,\r                                      *%@gg,,,,,    5/Sw,     ,\r                                          ```` ` `9g `9g,``*^|'\r                                                    `#g,`)h\r\r   Developed at Jaguar Land Rover OSCT. Portland OR 2016\r"));
 				break;
@@ -280,7 +245,7 @@ void menu_modem (void) {
 	switch (CMD_buffer[3]) {
 	case 'd':
 		PWR_gsm_stop(); //disable
-		usb_tx_string_PV(PSTR("GSM is off\r"));
+		usb_tx_string_PV(PSTR("GSM shutdown\r"));
 		break;
 	case 'e':  //enable modem
 		usb_tx_string_PV(PSTR("GSM Start pending"));
@@ -294,7 +259,7 @@ void menu_modem (void) {
 		menu_modem_status();
 		break;
 	case 'i':
-		usb_tx_string_P(PSTR("V2X uses the SIM5320A 3G GSM modem + GPS receiver by SIMCOM\r"));
+		usb_tx_string_P(PSTR("V2X uses the SIM5320A 3G or SIM7100a 4G GSM modem + GPS receiver by SIMCOM\r"));
 		break;
 	case 'x':
 		strcat_P(CMD_buffer, PSTR("\r\n"));  //put these char at the end of the string
@@ -391,8 +356,7 @@ void menu_power (void) {
 		 * cases.
 		 */
 			usb_tx_string_PV(PSTR("Disabling Host power supply"));
-			PWR_turn_off((1<<ENABLE_5V0B));
-			PWR_is_5_needed();
+			PWR_host_stop();
 			break;
 #if V2X_REV >= REV_20
 /* FIXME: add total shutdown case. suicide all power supplies */
@@ -434,8 +398,7 @@ void menu_power (void) {
 		 * cases.
 		 */
 			usb_tx_string_PV(PSTR("Enabling Host power supply"));
-			PWR_turn_on((1<<ENABLE_5V0B));
-			PWR_push();
+			PWR_host_start();
 			break;
 		default:
 			menu_send_q();
@@ -453,7 +416,7 @@ void menu_power (void) {
 		break;
 	case '?':
 	default:
-		usb_tx_string_P(PSTR("*** Power Menu ***\rEn: Enable power supply (3, 4, 5, H)\rDn: Disable power supply (3, 4, 5, H)\rR: Reset to defaults\rQ: Query status\r"));
+		usb_tx_string_P(PSTR("*** Power Menu ***\rEn: Enable power supply (3, 4, 5, H)\rDn: Disable power supply (3, 4, 5, H, A(ll)\rR: Reset to defaults\rQ: Query status\r"));
 		break;
 	}
 }

From 2794c5bb08112eb4e89b0ca917b19f80cdfeeae4 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 4 Apr 2017 09:54:10 -0700
Subject: [PATCH 44/83] Remove extraneous dev support code from init and uart

---
 V2X_Firmware/src/V2X/V2X_init.c | 11 -----------
 V2X_Firmware/src/V2X/V2X_uart.c |  5 -----
 2 files changed, 16 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 8edd05a..7b51e53 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -53,17 +53,10 @@ void pin_init(void)
 		ioport_configure_pin(EXT1_PIN_SEQ_RXD				, IOPORT_DIR_INPUT						);
 		ioport_configure_pin(EXT1_PIN_SEQ_TXD				, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);
 
-#if 1
 //high here turns leds off because of inverse logic in rev 2.0
 		ioport_configure_pin(LED_0_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);
 		ioport_configure_pin(LED_1_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);
 		ioport_configure_pin(LED_2_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);
-#endif
-#if 0
-		ioport_configure_pin(LED_0_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);
-		ioport_configure_pin(LED_1_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);
-		ioport_configure_pin(LED_2_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);
-#endif
 
 		ioport_configure_pin(BUTTON_0_PIN					, IOPORT_DIR_INPUT   					);
 		ioport_configure_pin(BUTTON_1_PIN					, IOPORT_DIR_INPUT  | IOPORT_PULL_UP	);  //NON_REM[1] USB hub Boot Strapping option
@@ -83,11 +76,7 @@ void pin_init(void)
 	#endif
 #if V2X_REV >= REV_20
 	/* 3v3 pin init, low by default... */
-	#if 1
 	ioport_configure_pin(PWR_3V3_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);
-	#else
-	ioport_configure_pin(PWR_3V3_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);
-	#endif
 #endif
 
 }
diff --git a/V2X_Firmware/src/V2X/V2X_uart.c b/V2X_Firmware/src/V2X/V2X_uart.c
index d9712aa..e01b33d 100644
--- a/V2X_Firmware/src/V2X/V2X_uart.c
+++ b/V2X_Firmware/src/V2X/V2X_uart.c
@@ -117,11 +117,6 @@ void uart_rx_notify(uint8_t port) //message received over USB
 	}else if (port == USB_CMD) {
 		while (udi_cdc_multi_is_rx_ready(port)) {  //is there data
  			data = udi_cdc_multi_getc(port);	//get 1 char of data
-#if 0
-			// DELETEME: // DEBUG: printing data as it comes
-			usb_cdc_send_byte(port, data);
-			usb_tx_string_P(PSTR("\r"));
-#endif
 // 			if (data == '?'						//allow '?'
 // 			||  data == '-'						//minus sign
 // 			||  data == '+'						//plus

From fc1b50532b474abeca2316f366b2a74776dc3935 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 4 Apr 2017 10:06:49 -0700
Subject: [PATCH 45/83] Reenable button service

Button service was disabled during startup troubleshooting.
This reenables the button detection. Seems to work.
---
 V2X_Firmware/src/main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/V2X_Firmware/src/main.c b/V2X_Firmware/src/main.c
index eebc5fd..9e4c612 100644
--- a/V2X_Firmware/src/main.c
+++ b/V2X_Firmware/src/main.c
@@ -36,10 +36,8 @@ int main ()
 		#if V2X_REV <= REV_12
 			charge_pump_toggle();		//charge pump pin needs toggled to create boost voltage for LEDs
 		#endif
-		//FIXME: bug here of some kind, sleep/or wd might be resetting proc
 		reset_processor();			//look for pending resets
-		// FIXME: BUG HERE  not allowing progress past button check
-		//button_service();			//SCAN and report the button
+		button_service();			//SCAN and report the button
 		#if V2X_REV <= REV_12
 			charge_pump_toggle();		//charge pump pin needs toggled to create boost voltage for LEDs
 		#endif

From 1d0bc51944816ca9c0a35ed904de8f5b106393a2 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 4 Apr 2017 10:19:58 -0700
Subject: [PATCH 46/83] Remove FIXME comments

---
 V2X_Firmware/src/V2X/V2X_menu.c  | 13 -------------
 V2X_Firmware/src/V2X/V2X_power.c | 10 ----------
 2 files changed, 23 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_menu.c b/V2X_Firmware/src/V2X/V2X_menu.c
index 68cfd56..b42c912 100644
--- a/V2X_Firmware/src/V2X/V2X_menu.c
+++ b/V2X_Firmware/src/V2X/V2X_menu.c
@@ -333,10 +333,6 @@ void menu_power (void) {
 			break;
 #endif
 		case '4':  //4v
-		/* FIXME: ensure 3 comes on before turning off 4
-		 * add a func call for pwr_turn_off_4 that does the requisite checking
-		 * rather than setting bits directly here
-		 */
 			usb_tx_string_PV(PSTR("Disabling 4V supply"));
 #if V2X_REV <= REV_12
 			PWR_turn_off((1<<ENABLE_4V1)|(1<<ENABLE_SIM_RESET));
@@ -351,15 +347,10 @@ void menu_power (void) {
 			PWR_push();
 			break;
 		case 'h':  //host
-		/* FIXME: Menu should not be calling power state bit manipulation directly
-		 * Manipulation of the host should be abstracted for both enable and disable
-		 * cases.
-		 */
 			usb_tx_string_PV(PSTR("Disabling Host power supply"));
 			PWR_host_stop();
 			break;
 #if V2X_REV >= REV_20
-/* FIXME: add total shutdown case. suicide all power supplies */
 		case 'a': // disable all. shutdown.
 			PWR_shutdown();
 			break;
@@ -393,10 +384,6 @@ void menu_power (void) {
 			PWR_push();
 			break;
 		case 'h':  //host
-		/* FIXME: Menu should not be calling power state bit manipulation directly
-		 * Manipulation of the host should be abstracted for both enable and disable
-		 * cases.
-		 */
 			usb_tx_string_PV(PSTR("Enabling Host power supply"));
 			PWR_host_start();
 			break;
diff --git a/V2X_Firmware/src/V2X/V2X_power.c b/V2X_Firmware/src/V2X/V2X_power.c
index ff28859..33caf44 100644
--- a/V2X_Firmware/src/V2X/V2X_power.c
+++ b/V2X_Firmware/src/V2X/V2X_power.c
@@ -144,10 +144,6 @@ void PWR_4_stop(void) {
 	PWR_3_start();
 }
 
-/* FIXME: Kill case. Kill all power without holding 3v. This is the suicide case for
- * manual restart
- */
-
 void PWR_shutdown(void) {
 	/* TODO
 	 * this really will kill all power, because we mean to.
@@ -201,9 +197,6 @@ void PWR_can_start (void) {
 };
 
 void PWR_gsm_stop(void) {
-	/* FIXME: Instead of calling power settings directly, call for power enabled
-	 * required, something along the lines of the power_is_4_needed
-	 */
 #if V2X_REV <= REV_12
 	//PWR_turn_off((1<<ENABLE_SIM_RESET)|(1<<ENABLE_4V1));
 	// FIXME: testing performance of just disabling power pin on old board...
@@ -230,9 +223,6 @@ void PWR_gsm_stop(void) {
 }
 
 void PWR_gsm_start(void) {
-	/* FIXME: Instead of calling power settings directly, call for power enabled
-	 * required, something along the lines of the power_is_4_needed
-	 */
 #if V2X_REV <= REV_12
 	//FIXME: Trying one extra measure to get the sim to respond using only the power pin...
 	PWR_turn_off(1<<ENABLE_SIM_RESET);

From db1ea0c8fa02f105f67b6b3417283eed2519a967 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 4 Apr 2017 10:22:50 -0700
Subject: [PATCH 47/83] Remove TODOs from power

---
 V2X_Firmware/src/V2X/V2X_power.c | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_power.c b/V2X_Firmware/src/V2X/V2X_power.c
index 33caf44..c4cf1db 100644
--- a/V2X_Firmware/src/V2X/V2X_power.c
+++ b/V2X_Firmware/src/V2X/V2X_power.c
@@ -93,9 +93,6 @@ void PWR_hub_stop(void){
  * 4v.
  */
 void PWR_3_start(void) {
-	/* TODO:
-	 * Set 3v3 pin high
-	 */
 	gpio_set_pin_high(PWR_3V3_PIN);
 }
 
@@ -106,9 +103,6 @@ void PWR_3_start(void) {
  */
 
 void PWR_3_stop(void) {
-	/* TODO:
-	 * Set 3v3 pin low
-	 */
 	gpio_set_pin_low(PWR_3V3_PIN);
 }
 
@@ -121,33 +115,18 @@ void PWR_3_is_needed(void) {
 }
 
 void PWR_4_start(void) {
-	/* TODO:
-	 * drop 3v pin
-	 * Enable 4v
-	 * push new config
-	 * wait for power to stabilize
-	 */
 	PWR_3_stop();
 	PWR_turn_on(1<<ENABLE_4V1);
 	PWR_push();
 }
 
 void PWR_4_stop(void) {
-	/* TODO:
-	 * (wait 3us?)
-	 * disable 4v
-	 * push new config
-	 * Enable 3v pin, to keep atmel alive
-	 */
 	PWR_turn_off((1<<ENABLE_SIM_RESET)|(1<<ENABLE_4V1));
 	PWR_push();
 	PWR_3_start();
 }
 
 void PWR_shutdown(void) {
-	/* TODO
-	 * this really will kill all power, because we mean to.
-	 */
 	PWR_turn_off((1<<ENABLE_4V1)|        \
 				 (1<<ENABLE_5V0)|        \
 				 (1<<ENABLE_5V0B)|       \

From 89ecf20c47b8e46be051aebfe1e05dfd8439f895 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 11 Apr 2017 08:29:35 -0700
Subject: [PATCH 48/83] temp commit: 3v explicit power manipulation for testing

---
 V2X_Firmware/src/V2X/V2X_init.c |  2 +-
 V2X_Firmware/src/V2X/V2X_menu.c | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 7b51e53..6c2941d 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -76,7 +76,7 @@ void pin_init(void)
 	#endif
 #if V2X_REV >= REV_20
 	/* 3v3 pin init, low by default... */
-	ioport_configure_pin(PWR_3V3_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_LOW	);
+	ioport_configure_pin(PWR_3V3_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);
 #endif
 
 }
diff --git a/V2X_Firmware/src/V2X/V2X_menu.c b/V2X_Firmware/src/V2X/V2X_menu.c
index b42c912..b587202 100644
--- a/V2X_Firmware/src/V2X/V2X_menu.c
+++ b/V2X_Firmware/src/V2X/V2X_menu.c
@@ -332,6 +332,14 @@ void menu_power (void) {
 			PWR_push();
 			break;
 #endif
+		/* DEBUG: DELETEME: Explicit test of 3v switching for use ONLY DURING TESTING
+		 * while the power ouptut is properly disabled
+		 */
+		case '3':
+			usb_tx_string_PV(PSTR("Disabling 3v pin"));
+			PWR_3_stop();
+			break;
+			
 		case '4':  //4v
 			usb_tx_string_PV(PSTR("Disabling 4V supply"));
 #if V2X_REV <= REV_12
@@ -369,6 +377,14 @@ void menu_power (void) {
 			PWR_push();
 			break;
 #endif
+		/* DEBUG: DELETEME: Explicit test of 3v switching for use ONLY DURING TESTING
+		 * while the power ouptut is properly disabled
+		 */
+		case '3':
+			usb_tx_string_PV(PSTR("Enabling 3v pin"));
+			PWR_3_start();
+			break;
+			
 		case '4':  //4v
 			usb_tx_string_PV(PSTR("Enabling 4V supply"));
 #if V2X_REV <= REV_12
@@ -591,6 +607,10 @@ void menu_power_status(void) {
 			{menu_send_1();}
 	else	{menu_send_0();}
 #endif
+	usb_tx_string_P(PSTR("3V3="));
+	if (ioport_get_pin_level(PWR_3V3_PIN)==true)
+			{menu_send_1();} 
+	else	{menu_send_0();}
 	usb_tx_string_P(PSTR("4V1="));
 	if (PWR_query((1<<ENABLE_4V1)))
 			{menu_send_1();}

From e8c299a206388b25489545b39bbeb002497f46ce Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Thu, 20 Apr 2017 09:43:39 -0700
Subject: [PATCH 49/83] GSM power stop improvement

With the proper Rev2.0 board and power supplies, we were able to verify that holding the power pin succeeds in turning off the SIMCOM GSM chip. Because the production units will use the 5320a model, the issues potentially observed with the 7100a are not withstanding. If the 7100a is ever used, this function will need to be retested.
---
 V2X_Firmware/src/V2X/V2X_power.c | 43 ++------------------------------
 1 file changed, 2 insertions(+), 41 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_power.c b/V2X_Firmware/src/V2X/V2X_power.c
index c4cf1db..5faa04d 100644
--- a/V2X_Firmware/src/V2X/V2X_power.c
+++ b/V2X_Firmware/src/V2X/V2X_power.c
@@ -160,10 +160,6 @@ void PWR_is_5_needed (void) { //turn off 5v0 if host and can are off
 	PWR_push();
 }
 
-/* FIXME: Add similar logical checks for 4v1 vs 3v3 power controls
- * power_is_4_needed, power_is_3_needed
- */
-
 void PWR_can_stop (void) {
 	PWR_turn_off((1<<ENABLE_CAN_RESET));
 	PWR_is_5_needed();
@@ -177,26 +173,11 @@ void PWR_can_start (void) {
 
 void PWR_gsm_stop(void) {
 #if V2X_REV <= REV_12
-	//PWR_turn_off((1<<ENABLE_SIM_RESET)|(1<<ENABLE_4V1));
-	// FIXME: testing performance of just disabling power pin on old board...
-	// somehow this pin is not actually shutting down the simcom. manual says
-	// power off should take place many seconds after holding it down...
-	// NOTE: testing that the old wasn't just shutting down due to lack of power...
-	// PWR_turn_off(1<<ENABLE_4V1);
 	GSM_command_power_off();
 	PWR_turn_on(1<<ENABLE_SIM_PWR_ON);
 #elif V2X_REV >= REV_20
-	//FIXME: Documentation indicates that the RESET pin is perhaps not ideal for
-	// normal use
-	//PWR_turn_off(1<<ENABLE_SIM_RESET);
-	//PWR_turn_off(1<<ENABLE_SIM_PWR_ON);
-	// FIXME: Trying to send a power off command to simcom instead
-	GSM_command_power_off();
-	// FIXME: might need a delay, or some way to check if the has shut off, and if
-	// not, then hold power low or resort to reset
-	// Also, please verify that this works on the Rev2.0 prototype properly:
-	// Should be the same board logic as the Rev1.2 case, but test each:
-	//PWR_turn_on(1<<ENABLE_SIM_PWR_ON);
+	// GSM_command_power_off();
+	PWR_turn_on(1<<ENABLE_SIM_PWR_ON);
 #endif
 	PWR_push();
 }
@@ -209,14 +190,6 @@ void PWR_gsm_start(void) {
 	delay_ms(500);
 	PWR_turn_on((1<<ENABLE_SIM_RESET)|(1<<ENABLE_4V1));  //release the reset
 	PWR_push();
-
-	//NOTE: If the power pin is our means of manipulating the power state of the sim...
-	// then we will want to add one extra check to see the state we last set
-	// because the activation sequence requires an initial high-drop-high, the
-	// pin might have to be verified as being high first...
-	// NOTE: We really should make accommodations for the fact that the logic is
-	// reversed on this particular setting
-	// 	if (PWR_query(1<<ENABLE_SIM_PWR_ON))
 	if (sim_power_status())
 	{
 		PWR_turn_off((1<<ENABLE_SIM_PWR_ON));
@@ -227,16 +200,6 @@ void PWR_gsm_start(void) {
 	PWR_turn_on(1<<ENABLE_SIM_RESET);
 	PWR_4_start();
 #endif
-	// FIXME: add greater delay to accommodate the 7100a?
-	// delay_ms(100);							//let power come up
-	//
-
-	//NOTE: If the power pin is our means of manipulating the power state of the sim...
-	// then we will want to add one extra check to see the state we last set
-	// because the activation sequence requires an initial high-drop-high, the
-	// pin might have to be verified as being high first...
-	// NOTE: We really should make accommodations for the fact that the logic is
-	// reversed on this particular setting
  	if (PWR_query(1<<ENABLE_SIM_PWR_ON))
 	{
 		PWR_turn_off((1<<ENABLE_SIM_PWR_ON));
@@ -246,8 +209,6 @@ void PWR_gsm_start(void) {
 
 	PWR_turn_on((1<<ENABLE_SIM_PWR_ON));
 	PWR_push();
-	//adjusting power wait due to manual for simchip
-	//delay_ms(150);							//let chip detect
 	delay_ms(250);
 	PWR_turn_off((1<<ENABLE_SIM_PWR_ON));
 	PWR_push();					//clear the start bit

From 7c486c0a6c8cb19a652ce64c0825207d0d942957 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Thu, 20 Apr 2017 11:30:44 -0700
Subject: [PATCH 50/83] Use SIMCOM5320a for board

---
 V2X_Firmware/src/V2X/V2X_board.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index c16288c..3e8f7f0 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -41,8 +41,8 @@ extern "C" {
  */
 #define SIMCOM_SIM5320A		(0)
 #define SIMCOM_SIM7100A		(1)
-#define SIMCOM 				SIMCOM_SIM7100A
-//#define SIMCOM 				SIMCOM_SIM5320A
+//#define SIMCOM 				SIMCOM_SIM7100A
+#define SIMCOM 				SIMCOM_SIM5320A
 
 /** \name 3v3 power pin definition
  * Activate to maintain power to CPU

From 3cc4ac521a9a9ad12867a756c14fad9e5b66747d Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Thu, 20 Apr 2017 11:31:22 -0700
Subject: [PATCH 51/83] LEDS reflect GSM chip states when Atmel is in operation

---
 V2X_Firmware/src/V2X/V2X_usb.c | 12 ++++++------
 V2X_Firmware/src/main.c        |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_usb.c b/V2X_Firmware/src/V2X/V2X_usb.c
index c92f345..a4b6949 100644
--- a/V2X_Firmware/src/V2X/V2X_usb.c
+++ b/V2X_Firmware/src/V2X/V2X_usb.c
@@ -41,30 +41,30 @@ void usb_cdc_set_dtr(uint8_t port, bool b_enable)
 	if (b_enable) {
 		// Host terminal has open COM
 		if (port == USB_CAN) {
-			led_0_on();	
+			//led_0_on();	
 			CAN_uart_stop();	// close direct path
 			uart_open(port);	// Open USB passthrough communication
 		}else if (port == USB_CMD) {
-			led_1_on();
+			//led_1_on();
 			menu_send_n_st();
 			//start Hayes CMD interface 
 		}else if (port == USB_ACL) {
-			led_2_on();
+			//led_2_on();
 			//enable ACL
 			//ACL_sample_on();
 		}
 	} else {
 		// Host terminal has close COM
 		if (port == USB_CAN) { //change can from pass through to direct mode
-			led_0_off();
+			//led_0_off();
 			uart_close(port);	// close USB passthrough communication
 			CAN_uart_start();	// open direct path
 			
 		}else if (port == USB_CMD) {
-			led_1_off();
+			//led_1_off();
 			//start Hayes interface
 		}else if (port == USB_ACL) {
-			led_2_off();
+			//led_2_off();
 			//disable ACL
 			//ACL_sample_off();
 		}
diff --git a/V2X_Firmware/src/main.c b/V2X_Firmware/src/main.c
index 9e4c612..8e47914 100644
--- a/V2X_Firmware/src/main.c
+++ b/V2X_Firmware/src/main.c
@@ -52,5 +52,6 @@ int main ()
 		#if V2X_REV <= REV_12
 			charge_pump_toggle();		//charge pump pin needs toggled to create boost voltage for LEDs
 		#endif
+		led_update();
 	}
 }

From 38b14dbe096c42143d3b9cab0d0a35dd569fb8a0 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Wed, 3 May 2017 11:33:33 -0700
Subject: [PATCH 52/83] Fix software restart functionality

Proper software reset.

Driver was not properly doing a software reset. Now it correctly uses the write protected interface call to set the reset enable bit in reset control register.
---
 V2X_Firmware/src/V2X/V2X_init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 6c2941d..7c48ef7 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -125,8 +125,8 @@ void reset_processor(void) {
 		if (reset_flags & (1<<RESET_SYSTEM)) {
 			usb_tx_string_P(PSTR("V2X restarting\rPlease close this window\r>"));
 			delay_s(3);
-			CCP = 0xd8; //enable write protected registers
-			RST_CTRL = true; //force SW reset
+			// use write protected inteface to software reset
+			ccp_write_io((uint8_t *)&RST.CTRL, RST_SWRST_bm);
 		}
 #if V2X_REV <= REV_12
 		if (reset_flags & (1<<RESET_USB)) {

From cafba3c58d12267d6cf8dcc70b6180ac8fd692d0 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 5 May 2017 15:34:36 -0700
Subject: [PATCH 53/83] Add button interrupt driven power state functionality

Add an interrupt routine for the hardware button on the board.
Routine should deal with the implications that the button also starts the 4v supply, and takes further action after verifying that it is the button that was pressed.
Unfortunately, at this time of writing, a possible hardware bug exists that is preventing consistent operation at the lower power mode (3v only); but this commit contains only changes related to button functionality, and should work independently of the issue with that actual power state.
---
 V2X_Firmware/src/V2X/V2X_board.h   |  1 +
 V2X_Firmware/src/V2X/V2X_button.c  | 73 ++++++++++++++++++++++++++----
 V2X_Firmware/src/V2X/V2X_button.h  | 20 ++++++--
 V2X_Firmware/src/V2X/V2X_control.c |  5 ++
 V2X_Firmware/src/V2X/V2X_control.h |  3 +-
 V2X_Firmware/src/V2X/V2X_init.c    | 11 ++++-
 V2X_Firmware/src/V2X/V2X_power.c   |  5 ++
 V2X_Firmware/src/V2X/V2X_power.h   |  6 +++
 V2X_Firmware/src/main.c            | 55 ++++++++++++++++++++++
 9 files changed, 164 insertions(+), 15 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index 3e8f7f0..b654e49 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -137,6 +137,7 @@ extern "C" {
 #define SW0_PIN                   IOPORT_CREATE_PIN(PORTA,0)
 #define SW0_ACTIVE                true
 #define SW0_INACTIVE              !SW0_ACTIVE
+#define SW0_INT_VECT_0			  PORTA_INT0_vect
 /** @} */
 
 /**
diff --git a/V2X_Firmware/src/V2X/V2X_button.c b/V2X_Firmware/src/V2X/V2X_button.c
index 956918a..25228fb 100644
--- a/V2X_Firmware/src/V2X/V2X_button.c
+++ b/V2X_Firmware/src/V2X/V2X_button.c
@@ -3,13 +3,14 @@
  *
  * Created: 2/12/2016 12:46:27 PM
  *  Author: jbanks2
- */ 
+ */
 
 #include "V2X.h"
 
 uint32_t pressed_at;
 Bool button_pressed;
-int delta;
+Bool button_check_flag = false;
+int button_delta;
 
 void button_init(void) {
 	int x = 0;
@@ -21,28 +22,84 @@ void button_init(void) {
 		}
 		delay_ms(1);
 	}
-	button_pressed = false;  
+	button_pressed = false;
 }
 
 void button_service(void) {
 	if (button_pressed != button_read()) { //has the button state changes since last time?
 		switch (button_pressed) {
 		case true: //button was released (previously pressed), figure out ho long
-			delta = time_get() - pressed_at; //calc press duration
+			button_delta = time_get() - pressed_at; //calc press duration
 			menu_send_BTN();
 			usb_tx_string_P(PSTR("RELEASE:"));		// report to CMD interface
-			menu_print_int(delta);		
+			menu_print_int(button_delta);
 			menu_send_n_st();
 			button_pressed = false;		//note the button was released
+			button_check_flag = true;	//flag button for checking
 			break;
 		case false:  //button was pressed, capture press time
+			// reset delta
+			button_delta = 0;
 			pressed_at = time_get(); //store press time
 			button_pressed = true;  //hold button state
 			menu_send_BTN();
 			usb_tx_string_P(PSTR("PRESS")); //report press event to CMD
 			menu_send_n_st();
 			break;
-		}		
-		
+		}
+
 	}
-}
\ No newline at end of file
+}
+
+Bool check_button(void) {
+	return button_check_flag;
+}
+
+Bool button_reset_check(void) {
+	button_check_flag = false;
+}
+
+int button_get_delta(void) {
+	return button_delta;
+}
+
+
+void button_reset_delta(void)
+{
+	button_delta = 0;
+}
+
+void handle_button_check(int sec) {
+	if (sec >= 5)
+	{
+		// do hard power off
+		usb_tx_string_P(PSTR("Power Off"));
+		PWR_host_stop();
+		PWR_can_stop();
+		PWR_gsm_stop();
+		ACL_set_sample_off();
+		PWR_shutdown();
+	} else if (sec >= 3)
+	{
+		usb_tx_string_P(PSTR("Power 3v Only"));
+		// do 3v only
+		PWR_host_stop();
+		PWR_5_stop();
+		ACL_set_sample_off();
+		PWR_4_stop();
+		// maybe we'd like to force the leds to update here, just in case...
+		led_1_off();
+		led_2_off();
+	} else if (sec > 1)
+	{
+		// full power mode
+		PWR_4_start();
+		usb_tx_string_P(PSTR("Power Full"));
+		udd_attach();
+		ACL_set_sample_on();
+		GSM_modem_init();
+		CAN_elm_init();
+		PWR_host_start();
+	}
+	button_reset_delta();
+}
diff --git a/V2X_Firmware/src/V2X/V2X_button.h b/V2X_Firmware/src/V2X/V2X_button.h
index ec7c8f5..a6b9840 100644
--- a/V2X_Firmware/src/V2X/V2X_button.h
+++ b/V2X_Firmware/src/V2X/V2X_button.h
@@ -3,31 +3,43 @@
  *
  * Created: 2/12/2016 12:46:38 PM
  *  Author: jbanks2
- */ 
+ */
 
 
 #ifndef V2X_BUTTON_H_
 #define V2X_BUTTON_H_
 
+int button_delta;
+Bool button_check_flag;
+
 /**
  * @def button_init
- * @brief waits to start the board until the button is released 
+ * @brief waits to start the board until the button is released
  * @brief sets "pressed" to false as init
  **/
 void button_init(void);
 
 /**
  * @def button_read
- * @brief detection of Button state 
+ * @brief detection of Button state
  * returns "true" if button depressed
  **/
 inline static bool button_read(void) {return ioport_get_pin_level(SW0_PIN);}
 
 /**
  * @def button_service
- * @brief check Button state process changes reportr state to CMD interface
+ * @brief check Button state process changes reporter state to CMD interface
  * returns "true" if button depressed
  **/
 void button_service(void);
 
+Bool check_button(void);
+
+Bool button_reset_check(void);
+
+int button_get_delta(void);
+
+void button_reset_delta(void);
+
+void handle_button_check(int sec);
 #endif /* V2X_BUTTON_H_ */
\ No newline at end of file
diff --git a/V2X_Firmware/src/V2X/V2X_control.c b/V2X_Firmware/src/V2X/V2X_control.c
index 0bb75db..bcbc92b 100644
--- a/V2X_Firmware/src/V2X/V2X_control.c
+++ b/V2X_Firmware/src/V2X/V2X_control.c
@@ -165,6 +165,11 @@ void job_coordinator (void) {
 	if (job_check_timeout(SYS_CAN_CTL)) {
 		CAN_stop_snoop();
 	}
+	if (job_check_timeout(SYS_PWR))
+	{
+		handle_button_check(button_get_delta());
+		job_clear_timeout(SYS_PWR);
+	}
 	//more jobs to add
 	//compare GPS coordinates to trigger alarm/host
 	//compare ACL data to trigger alarm/host
diff --git a/V2X_Firmware/src/V2X/V2X_control.h b/V2X_Firmware/src/V2X/V2X_control.h
index 358f0f0..a1818d8 100644
--- a/V2X_Firmware/src/V2X/V2X_control.h
+++ b/V2X_Firmware/src/V2X/V2X_control.h
@@ -55,7 +55,8 @@ enum system_switch {
 	SYS_CAN = 0,	//used for direct control of CAN
 	SYS_GSM,		//used for direct control of GSM
 	SYS_CAN_CTL,	//used for CTL passthrough of CAN
-	SYS_CTL			//stand alone sequence jobs, wake host, etc.
+	SYS_CTL,			//stand alone sequence jobs, wake host, etc.
+	SYS_PWR
 };
 
 /**
diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 7c48ef7..38a1ae7 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -58,7 +58,7 @@ void pin_init(void)
 		ioport_configure_pin(LED_1_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);
 		ioport_configure_pin(LED_2_PIN						, IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH	);
 
-		ioport_configure_pin(BUTTON_0_PIN					, IOPORT_DIR_INPUT   					);
+		ioport_configure_pin(BUTTON_0_PIN					, IOPORT_DIR_INPUT  | IOPORT_SENSE_FALLING);
 		ioport_configure_pin(BUTTON_1_PIN					, IOPORT_DIR_INPUT  | IOPORT_PULL_UP	);  //NON_REM[1] USB hub Boot Strapping option
 
 	#if V2X_REV <= REV_12
@@ -81,6 +81,12 @@ void pin_init(void)
 
 }
 
+void enable_v2x_interrupts(void) {
+	// PORTA.PIN0CTRL = (PORT_ISC_RISING_gc); // set port to sense rising edge
+	PORTA.INT0MASK = (0x01);			   // select PA0 for INT source
+	PORTA.INTCTRL |= PORT_INT0LVL_MED_gc;  // enable interrupt 0 at medium
+}
+
 /* This function is meant to contain board-specific initialization code
  * for, e.g., the I/O pins. The initialization can rely on application-
  * specific board configuration, found in conf_board.h.
@@ -88,13 +94,14 @@ void pin_init(void)
 void v2x_board_init(void)
 {
 	irq_initialize_vectors();
-	pmic_init();
 	sysclk_init();							//configure clock sources for core and USB
 	sleepmgr_init();						// Initialize the sleep manager
 	ioport_init();							//Initializes the IOPORT service
 	pin_init();								//whole chip pin init, modes and initial conditions
 	spi_start();							//start SPI driver
 	PWR_init();								//sets SR to default states - holds power up
+	enable_v2x_interrupts();
+	pmic_init();
 	cpu_irq_enable();
 	eeprom_init();							//verifies eeprom safe for use
 	menu_init();							//loads menu settings
diff --git a/V2X_Firmware/src/V2X/V2X_power.c b/V2X_Firmware/src/V2X/V2X_power.c
index 5faa04d..116bae4 100644
--- a/V2X_Firmware/src/V2X/V2X_power.c
+++ b/V2X_Firmware/src/V2X/V2X_power.c
@@ -151,6 +151,11 @@ void PWR_host_stop(void){
 	PWR_is_5_needed();
 }
 
+void PWR_5_stop (void) {
+	PWR_turn_off((1<<ENABLE_5V0)|(1<<ENABLE_5V0B)|(1<<ENABLE_CAN_RESET));
+	PWR_push();
+}
+
 void PWR_is_5_needed (void) { //turn off 5v0 if host and can are off
 	if (power_control_state & ((1<<ENABLE_CAN_RESET)|(1<<ENABLE_5V0B))) {
 		PWR_turn_on((1<<ENABLE_5V0));
diff --git a/V2X_Firmware/src/V2X/V2X_power.h b/V2X_Firmware/src/V2X/V2X_power.h
index ccc7f64..12010d3 100644
--- a/V2X_Firmware/src/V2X/V2X_power.h
+++ b/V2X_Firmware/src/V2X/V2X_power.h
@@ -159,6 +159,12 @@ void PWR_shutdown(void);
 
 #endif
 
+/**
+ * @def	PWR_5_stop
+ * @brief stop 5v rail
+ */
+void PWR_5_stop (void);
+
 /**
  * @def PWR_is_5_needed
  * @brief turns off 5v rail if unused
diff --git a/V2X_Firmware/src/main.c b/V2X_Firmware/src/main.c
index 8e47914..0ecc336 100644
--- a/V2X_Firmware/src/main.c
+++ b/V2X_Firmware/src/main.c
@@ -55,3 +55,58 @@ int main ()
 		led_update();
 	}
 }
+
+/* Interrupt service routine for our button, on currently found on PORTA0
+ * Because this pin is shared with other interesting pins, namely 3v, we
+ * have to be careful about what we do with the interrupt.
+ * Before proceeding, we check the state of the button pin, ensuring we are
+ * reacting to button press. If so, we want to disable the 3v as quickly as
+ * possible, so that the 4v and 3v are not fighting.
+ * This routine will sense the state of the button, and will not exit until
+ * release. Upon release, it reports the time held, and schedules a job to
+ * react to the button press in (1) second.
+ * If 3v was enabled when we entered it is enabled again before exit, so the
+ * Atmel will stay alive, but 3v is checked against the 4v enable a final time
+ * to ensure proper power state when leaving this routine.
+ */
+ISR(SW0_INT_VECT_0)
+{
+	if (ioport_get_pin_level(PWR_3V3_PIN) == true)
+	{
+		usb_tx_string_P(PSTR("**3v is UP!**\r"));
+	}
+	// do we need to make sure that it was actually the button that got us here?
+	if (ioport_get_pin_level(SW0_PIN) == SW0_ACTIVE)
+	{
+		// ask if 3v is up when the button was pressed
+
+		bool en_3v = ioport_get_pin_level(PWR_3V3_PIN);
+
+		//disable 3v while button down, so 3 and 4 don't fight
+		PWR_3_stop();
+
+		/* Hold in interrupt while pin tests held
+		 *		service timer and increment time held
+		 * When released, exit the interrupt routine and report time held
+		 *		(call the button push consequence routine)
+		 */
+		while (ioport_get_pin_level(SW0_PIN) == SW0_ACTIVE)
+		{
+			button_service(); //call service and record time
+		}
+
+		button_service(); //call service and final delta
+
+		// handle_button_check(button_get_delta());
+		job_set_timeout(SYS_PWR, 1);
+
+		// if 3v was up when we entered, and 4v is NOT enabled, turn it right back on
+		if (en_3v == true);
+		{
+			PWR_3_start();
+		}
+		// double check if 3 should be enabled before leaving, just in case
+		PWR_3_is_needed();
+	}
+
+}

From 56776f2da2783030aeb98daa6c185e9a5e524031 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Mon, 8 May 2017 11:28:53 -0700
Subject: [PATCH 54/83] Utilize power interface from menu for 5v disable

---
 V2X_Firmware/src/V2X/V2X_menu.c  | 3 ++-
 V2X_Firmware/src/V2X/V2X_power.h | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/V2X_Firmware/src/V2X/V2X_menu.c b/V2X_Firmware/src/V2X/V2X_menu.c
index b587202..0e31e15 100644
--- a/V2X_Firmware/src/V2X/V2X_menu.c
+++ b/V2X_Firmware/src/V2X/V2X_menu.c
@@ -351,7 +351,8 @@ void menu_power (void) {
 			break;
 		case '5':  //5v
 			usb_tx_string_PV(PSTR("Disabling 5V supply"));
-			PWR_turn_off((1<<ENABLE_5V0)|(1<<ENABLE_5V0B)|(1<<ENABLE_CAN_RESET));
+			// PWR_turn_off((1<<ENABLE_5V0)|(1<<ENABLE_5V0B)|(1<<ENABLE_CAN_RESET));
+			PWR_5_stop();
 			PWR_push();
 			break;
 		case 'h':  //host
diff --git a/V2X_Firmware/src/V2X/V2X_power.h b/V2X_Firmware/src/V2X/V2X_power.h
index 12010d3..57ea114 100644
--- a/V2X_Firmware/src/V2X/V2X_power.h
+++ b/V2X_Firmware/src/V2X/V2X_power.h
@@ -183,6 +183,12 @@ void PWR_host_start(void);
  */
 void PWR_host_stop(void);
 
+/**
+ * @def PWR_5_stop
+ * @brief disables the 5v completely
+*/
+void PWR_5_stop(void);
+
 /**
  * @def PWR_can_stop
  * @brief disables the ELM with hardware reset pin turns off 5v rail if unused

From f80357df6fbfe85ab81d1fd3159bc8f71d435a7f Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Mon, 8 May 2017 12:43:45 -0700
Subject: [PATCH 55/83] Button adjustment and notes on 3v

Adjust timing sensitivity of button to allow quicker press for bringing up full power mode.
Notes added for why our 3v checker only disables 3v.
There's good reason for this, testing has shown that there's a bit of a bug, and that we should be manipulating 3v exactly where we mean to, as it is timing critical.
---
 V2X_Firmware/src/V2X/V2X_button.c | 2 +-
 V2X_Firmware/src/V2X/V2X_power.c  | 7 ++++++-
 V2X_Firmware/src/main.c           | 1 -
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_button.c b/V2X_Firmware/src/V2X/V2X_button.c
index 25228fb..9da260c 100644
--- a/V2X_Firmware/src/V2X/V2X_button.c
+++ b/V2X_Firmware/src/V2X/V2X_button.c
@@ -90,7 +90,7 @@ void handle_button_check(int sec) {
 		// maybe we'd like to force the leds to update here, just in case...
 		led_1_off();
 		led_2_off();
-	} else if (sec > 1)
+	} else if (sec >= 1)
 	{
 		// full power mode
 		PWR_4_start();
diff --git a/V2X_Firmware/src/V2X/V2X_power.c b/V2X_Firmware/src/V2X/V2X_power.c
index 116bae4..a367c93 100644
--- a/V2X_Firmware/src/V2X/V2X_power.c
+++ b/V2X_Firmware/src/V2X/V2X_power.c
@@ -107,7 +107,12 @@ void PWR_3_stop(void) {
 }
 
 void PWR_3_is_needed(void) {
-	/* Check to see if 3v should be switched off due to 4v being enabled */
+	/* Check to see if 3v should be switched off due to 4v being enabled
+	 * One might expect that we'd provide for turning 3v on here as well.
+	 * Testing has shown however, that manipulation of the 3v is timing critical,
+	 * and should take place exactly when we mean it to. This is intended only
+	 * as a safety check to ensure the 4v and 3v don't fight.
+	 * */
 	if (power_control_state & (1<<ENABLE_4V1))
 	{
 		PWR_3_stop();
diff --git a/V2X_Firmware/src/main.c b/V2X_Firmware/src/main.c
index 0ecc336..4c012da 100644
--- a/V2X_Firmware/src/main.c
+++ b/V2X_Firmware/src/main.c
@@ -37,7 +37,6 @@ int main ()
 			charge_pump_toggle();		//charge pump pin needs toggled to create boost voltage for LEDs
 		#endif
 		reset_processor();			//look for pending resets
-		button_service();			//SCAN and report the button
 		#if V2X_REV <= REV_12
 			charge_pump_toggle();		//charge pump pin needs toggled to create boost voltage for LEDs
 		#endif

From 509e04145e797fef1abe32fcaec574d3d23d53c5 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 12 May 2017 14:02:35 -0700
Subject: [PATCH 56/83] Minor preprocessor changes for v2.0 compatability

Wraps changes specific to v2.0 that should have been wrapped earlier.
---
 V2X_Firmware/src/V2X/V2X_button.c  |  2 ++
 V2X_Firmware/src/V2X/V2X_control.c |  2 ++
 V2X_Firmware/src/V2X/V2X_menu.c    | 14 ++++++++++----
 V2X_Firmware/src/main.c            |  3 ++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_button.c b/V2X_Firmware/src/V2X/V2X_button.c
index 9da260c..e39adfc 100644
--- a/V2X_Firmware/src/V2X/V2X_button.c
+++ b/V2X_Firmware/src/V2X/V2X_button.c
@@ -69,6 +69,7 @@ void button_reset_delta(void)
 	button_delta = 0;
 }
 
+#if V2X_REV >= REV_20
 void handle_button_check(int sec) {
 	if (sec >= 5)
 	{
@@ -103,3 +104,4 @@ void handle_button_check(int sec) {
 	}
 	button_reset_delta();
 }
+#endif
diff --git a/V2X_Firmware/src/V2X/V2X_control.c b/V2X_Firmware/src/V2X/V2X_control.c
index bcbc92b..bc853d8 100644
--- a/V2X_Firmware/src/V2X/V2X_control.c
+++ b/V2X_Firmware/src/V2X/V2X_control.c
@@ -165,11 +165,13 @@ void job_coordinator (void) {
 	if (job_check_timeout(SYS_CAN_CTL)) {
 		CAN_stop_snoop();
 	}
+#if V2X_REV >= REV_20
 	if (job_check_timeout(SYS_PWR))
 	{
 		handle_button_check(button_get_delta());
 		job_clear_timeout(SYS_PWR);
 	}
+#endif
 	//more jobs to add
 	//compare GPS coordinates to trigger alarm/host
 	//compare ACL data to trigger alarm/host
diff --git a/V2X_Firmware/src/V2X/V2X_menu.c b/V2X_Firmware/src/V2X/V2X_menu.c
index 0e31e15..8f0a47c 100644
--- a/V2X_Firmware/src/V2X/V2X_menu.c
+++ b/V2X_Firmware/src/V2X/V2X_menu.c
@@ -41,7 +41,7 @@ void menu_main(void) {
 				usb_tx_string_P(PSTR("Vehicle to Everything (V2X) RVI Node 2016\rOpen source hardware and software\rHW Rev1.2 \rSW Rev0.1\r"));
 				break;
 #elif V2X_REV >= REV_20
-				usb_tx_string_P(PSTR("Vehicle to Everything (V2X) RVI Node 2016\rOpen source hardware and software\rHW Rev1.2 \rSW Rev0.1\r"));
+				usb_tx_string_P(PSTR("Vehicle to Everything (V2X) RVI Node 2016\rOpen source hardware and software\rHW Rev2.0 \rSW Rev0.2\r"));
 				break;
 #endif
 			case 'j': //Jaguar
@@ -332,6 +332,7 @@ void menu_power (void) {
 			PWR_push();
 			break;
 #endif
+#if V2X_REV >= REV_20
 		/* DEBUG: DELETEME: Explicit test of 3v switching for use ONLY DURING TESTING
 		 * while the power ouptut is properly disabled
 		 */
@@ -339,7 +340,8 @@ void menu_power (void) {
 			usb_tx_string_PV(PSTR("Disabling 3v pin"));
 			PWR_3_stop();
 			break;
-			
+#endif
+
 		case '4':  //4v
 			usb_tx_string_PV(PSTR("Disabling 4V supply"));
 #if V2X_REV <= REV_12
@@ -378,6 +380,7 @@ void menu_power (void) {
 			PWR_push();
 			break;
 #endif
+#if V2X_REV >= REV_20
 		/* DEBUG: DELETEME: Explicit test of 3v switching for use ONLY DURING TESTING
 		 * while the power ouptut is properly disabled
 		 */
@@ -385,7 +388,8 @@ void menu_power (void) {
 			usb_tx_string_PV(PSTR("Enabling 3v pin"));
 			PWR_3_start();
 			break;
-			
+#endif
+
 		case '4':  //4v
 			usb_tx_string_PV(PSTR("Enabling 4V supply"));
 #if V2X_REV <= REV_12
@@ -608,10 +612,12 @@ void menu_power_status(void) {
 			{menu_send_1();}
 	else	{menu_send_0();}
 #endif
+#if V2X_REV >= REV_20
 	usb_tx_string_P(PSTR("3V3="));
 	if (ioport_get_pin_level(PWR_3V3_PIN)==true)
-			{menu_send_1();} 
+			{menu_send_1();}
 	else	{menu_send_0();}
+#endif
 	usb_tx_string_P(PSTR("4V1="));
 	if (PWR_query((1<<ENABLE_4V1)))
 			{menu_send_1();}
diff --git a/V2X_Firmware/src/main.c b/V2X_Firmware/src/main.c
index 4c012da..d8b9465 100644
--- a/V2X_Firmware/src/main.c
+++ b/V2X_Firmware/src/main.c
@@ -54,7 +54,7 @@ int main ()
 		led_update();
 	}
 }
-
+#if V2X_REV >= REV_20
 /* Interrupt service routine for our button, on currently found on PORTA0
  * Because this pin is shared with other interesting pins, namely 3v, we
  * have to be careful about what we do with the interrupt.
@@ -109,3 +109,4 @@ ISR(SW0_INT_VECT_0)
 	}
 
 }
+#endif

From 3e8c56877c41ea8008a5b5493cf2cd1c57b1670f Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Thu, 18 May 2017 14:09:34 -0700
Subject: [PATCH 57/83] New lines (\n) at end of all menu responses

For better readability and compatability the v2x menu should place new lines at the end of strings
---
 V2X_Firmware/src/V2X/V2X_menu.c | 77 +++++++++++++++++----------------
 1 file changed, 39 insertions(+), 38 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_menu.c b/V2X_Firmware/src/V2X/V2X_menu.c
index 8f0a47c..791718f 100644
--- a/V2X_Firmware/src/V2X/V2X_menu.c
+++ b/V2X_Firmware/src/V2X/V2X_menu.c
@@ -38,14 +38,14 @@ void menu_main(void) {
 		switch(CMD_buffer[2]) {
 			case 'i': //information
 #if V2X_REV <= REV_12
-				usb_tx_string_P(PSTR("Vehicle to Everything (V2X) RVI Node 2016\rOpen source hardware and software\rHW Rev1.2 \rSW Rev0.1\r"));
+				usb_tx_string_P(PSTR("Vehicle to Everything (V2X) RVI Node 2016\r\nOpen source hardware and software\r\nHW Rev1.2 \r\nSW Rev0.1\r\n"));
 				break;
 #elif V2X_REV >= REV_20
-				usb_tx_string_P(PSTR("Vehicle to Everything (V2X) RVI Node 2016\rOpen source hardware and software\rHW Rev2.0 \rSW Rev0.2\r"));
+				usb_tx_string_P(PSTR("Vehicle to Everything (V2X) RVI Node 2016\r\nOpen source hardware and software\r\nHW Rev2.0 \r\nSW Rev0.2\r\n"));
 				break;
 #endif
 			case 'j': //Jaguar
-				usb_tx_string_P(PSTR("\r\r   ,ggp@@@@mgg,,\r,$Q$(`S@@$;g$$$$$@$@@gg,\r;gP'$@gg)$$@@$@@@$(L$$||$$@g,\r  `g$P`  ``*%@@@P`)Eg|||lLLL||$Bgg,\r    `       ,gg$$@gg,`$..``$Z$$$$$EB$$@g,\r         @P`pgg$$$||`)gggg;,,     |$$$|$$$@g,\r         9w&    '*^^` ``*P#9BB00000$$$@|`$$$g|Sg,\r                                    *$@@L ```T$W~)%g,\r                                      *%@gg,,,,,    5/Sw,     ,\r                                          ```` ` `9g `9g,``*^|'\r                                                    `#g,`)h\r\r   Developed at Jaguar Land Rover OSCT. Portland OR 2016\r"));
+				usb_tx_string_P(PSTR("\r\n\r\n   ,ggp@@@@mgg,,\r\n,$Q$(`S@@$;g$$$$$@$@@gg,\r\n;gP'$@gg)$$@@$@@@$(L$$||$$@g,\r\n  `g$P`  ``*%@@@P`)Eg|||lLLL||$Bgg,\r\n    `       ,gg$$@gg,`$..``$Z$$$$$EB$$@g,\r\n         @P`pgg$$$||`)gggg;,,     |$$$|$$$@g,\r\n         9w&    '*^^` ``*P#9BB00000$$$@|`$$$g|Sg,\r\n                                    *$@@L ```T$W~)%g,\r\n                                      *%@gg,,,,,    5/Sw,     ,\r\n                                          ```` ` `9g `9g,``*^|'\r\n                                                    `#g,`)h\r\n\r\n   Developed at Jaguar Land Rover OSCT. Portland OR 2016\r\n"));
 				break;
 			case 'q':
 				menu_status();
@@ -71,15 +71,15 @@ void menu_main(void) {
 			case 'v': //toggle verbose setting
 				verbose = !verbose;
 				nvm_eeprom_write_byte(EE_verbose,verbose);
-				usb_tx_string_PV(PSTR("Verbose is ON"));
+				usb_tx_string_PV(PSTR("Verbose is ON\r\n"));
 				break;
 			case '?':  //timer functions
 			default:
-				usb_tx_string_P(PSTR("*** Main Menu ***\rI: Device information\rA: Accelerometer menu(ACL)\rC: ELM327 menu(CAN)\rM: SIM Modem menu(GSM)\rP: Power menu\rT: Timer menu\rQ: Query system status\rV: Toggle verbose messages\rR: Reboot\r"));
+				usb_tx_string_P(PSTR("*** Main Menu ***\r\nI: Device information\r\nA: Accelerometer menu(ACL)\r\nC: ELM327 menu(CAN)\r\nM: SIM Modem menu(GSM)\r\nP: Power menu\r\nT: Timer menu\r\nQ: Query system status\r\nV: Toggle verbose messages\r\nR: Reboot\r\n"));
 				break;
 			}
 	}else{
-			usb_tx_string_PV(PSTR("All commands start VX\r"));
+			usb_tx_string_PV(PSTR("All commands start VX\r\n"));
 	}
 	clear_buffer(CMD_buffer);	//clear the buffer for next command
 	menu_send_n_st();
@@ -97,7 +97,7 @@ void menu_accel (void) {
 		usb_tx_string_PV(PSTR("Accelerometer started"));
 		break;
 	case 'i':
-		usb_tx_string_P(PSTR("V2X uses the ADXL345 accelerometer from Analog Devices\r"));
+		usb_tx_string_P(PSTR("V2X uses the ADXL345 accelerometer from Analog Devices\r\n"));
 		break;
 	case 'q':
 		menu_accel_status();
@@ -219,23 +219,23 @@ void menu_accel (void) {
 			for (int i = 0; i < strlen(CMD_buffer); i++)
 				{usb_cdc_send_byte(USB_CMD, CMD_buffer[i]);}
 		} else {
-			usb_tx_string_P(PSTR("ERROR: Not currently sampling, use VXAE\r"));}
+			usb_tx_string_P(PSTR("ERROR: Not currently sampling, use VXAE\r\n"));}
 
 		break;
 	case 'f':
 		if (CMD_buffer[4] == '0') {
 			ACL_set_full_resolution(0);
-			usb_tx_string_PV(PSTR("10bit resolution, scale changes with 'G' range\r"));
+			usb_tx_string_PV(PSTR("10bit resolution, scale changes with 'G' range\r\n"));
 		}
 		else if (CMD_buffer[4] == '1') {
 			ACL_set_full_resolution(1);
-			usb_tx_string_PV(PSTR("Full resolution, 4mg/bit\r"));
+			usb_tx_string_PV(PSTR("Full resolution, 4mg/bit\r\n"));
 		}
 		else {menu_send_q();}
 		break;
 	case '?':
 	default:
-		usb_tx_string_P(PSTR("*** Accelerometer Menu ***\rE: Enable\rD: Disable\rR: Restart\rI: Subsystem Information\rQ: Query status\rG: Get last Sample\rSn: Set sample rate in HZ (1, 3, 6, 12, 25, 50, 100, 200, 400, 800)\rWn: Set \"G\" Range (2, 4, 8, 16)\rFn: Full range (1: full 0: 10bit)\rXn: Set X offset (+/-127)\rYn: Set Y offset\rZn: Set Z offset\r"));
+		usb_tx_string_P(PSTR("*** Accelerometer Menu ***\r\nE: Enable\r\nD: Disable\r\nR: Restart\r\nI: Subsystem Information\r\nQ: Query status\r\nG: Get last Sample\r\nSn: Set sample rate in HZ (1, 3, 6, 12, 25, 50, 100, 200, 400, 800)\r\nWn: Set \"G\" Range (2, 4, 8, 16)\r\nFn: Full range (1: full 0: 10bit)\r\nXn: Set X offset (+/-127)\r\nYn: Set Y offset\r\nZn: Set Z offset\r\n"));
 		break;
 	}
 }
@@ -245,30 +245,31 @@ void menu_modem (void) {
 	switch (CMD_buffer[3]) {
 	case 'd':
 		PWR_gsm_stop(); //disable
-		usb_tx_string_PV(PSTR("GSM shutdown\r"));
+		usb_tx_string_PV(PSTR("GSM shutdown\r\n"));
 		break;
 	case 'e':  //enable modem
-		usb_tx_string_PV(PSTR("GSM Start pending"));
+		usb_tx_string_PV(PSTR("GSM Start pending\r\n"));
 		GSM_modem_init();
 		break;
 	case 'r':  //reset
 		reset_trigger_GSM();
-		usb_tx_string_PV(PSTR("GSM RESET"));
+		usb_tx_string_PV(PSTR("GSM RESET\r\n"));
 		break;
 	case 'q':
 		menu_modem_status();
 		break;
 	case 'i':
-		usb_tx_string_P(PSTR("V2X uses the SIM5320A 3G or SIM7100a 4G GSM modem + GPS receiver by SIMCOM\r"));
+		usb_tx_string_P(PSTR("V2X uses the SIM5320A 3G or SIM7100a 4G GSM modem + GPS receiver by SIMCOM\r\n"));
 		break;
 	case 'x':
-		strcat_P(CMD_buffer, PSTR("\r\n"));  //put these char at the end of the string
+	// FIXME: please verify that the newline is actually warranted here
+		strcat_P(CMD_buffer, PSTR("\r"));  //put these char at the end of the string
 		GSM_add_string_to_buffer(BUFFER_OUT, &CMD_buffer[4]); //send it on to the modem
 		GSM_mark_for_processing(BUFFER_OUT); //initiate send
  		break;
 	case '?':
 	default:
-		usb_tx_string_P(PSTR("*** Modem Menu ***\rE: Enable\rD: Disable\rR: RESET. Emergency use.\rI: Subsystem Information\rQ: Query status\rX: AT Command Pass through\r"));
+		usb_tx_string_P(PSTR("*** Modem Menu ***\r\nE: Enable\r\nD: Disable\r\nR: RESET. Emergency use.\r\nI: Subsystem Information\r\nQ: Query status\r\nX: AT Command Pass through\r\n"));
 		break;
 	}
 }
@@ -278,33 +279,33 @@ void menu_can (void) {
 	char buffer[EE_CAN_ARRAY_SIZE+1];
 	switch (CMD_buffer[3]) {
 	case 'd':  //disable;
-		usb_tx_string_PV(PSTR("CAN is off\r"));
+		usb_tx_string_PV(PSTR("CAN is off\r\n"));
 		PWR_can_stop();
 		PWR_is_5_needed();
 		break;
 	case 'e':  //enable
-		usb_tx_string_PV(PSTR("CAN Starting\r"));
+		usb_tx_string_PV(PSTR("CAN Starting\r\n"));
 		CAN_elm_init();
 		break;
 	case 'r':  //reset
-		usb_tx_string_PV(PSTR("CAN restarting\r"));
+		usb_tx_string_PV(PSTR("CAN restarting\r\n"));
 		reset_trigger_CAN();
 		break;
 	case 'q': //query
 		menu_can_status();
 		break;
 	case 'i': //info
-		usb_tx_string_P(PSTR("V2X uses the STN1110 CANbus interface from Scantool\rThe STN1110 is compliant with the ELM327 V1.3\r"));
+		usb_tx_string_P(PSTR("V2X uses the STN1110 CANbus interface from Scantool\r\nThe STN1110 is compliant with the ELM327 V1.3\r\n"));
 		break;
 	case 'x': //pass command
-		strcat_P(CMD_buffer, PSTR("\r"));
+		strcat_P(CMD_buffer, PSTR("\r\n"));
 
 		CAN_add_string_to_buffer(BUFFER_OUT, CMD_buffer+4);
 		CAN_mark_for_processing(BUFFER_OUT);
 		CAN_start_snoop();
 		break;
 	case 's':  //save string to eeprom
-		//strcat_P(CMD_buffer, PSTR("\r"));
+		//strcat_P(CMD_buffer, PSTR("\r\n"));
 		eeprom_store_CAN_string(CMD_buffer+4);
 		break;
 	case 'w': //what is stored in EE?
@@ -316,7 +317,7 @@ void menu_can (void) {
 		break;
 	case '?':
 	default:
-		usb_tx_string_P(PSTR("*** CANbus Menu ***\rE: Enable\rD: Disable\rR: Restart\rS: Store config string to EE\rA: Execute config string in EE\rW: Display config string in EE\rI: Subsystem Information\rQ: Query status\r"));
+		usb_tx_string_P(PSTR("*** CANbus Menu ***\r\nE: Enable\r\nD: Disable\r\nR: Restart\r\nS: Store config string to EE\r\nA: Execute config string in EE\r\nW: Display config string in EE\r\nI: Subsystem Information\r\nQ: Query status\r\n"));
 		break;
 	}
 }
@@ -424,7 +425,7 @@ void menu_power (void) {
 		break;
 	case '?':
 	default:
-		usb_tx_string_P(PSTR("*** Power Menu ***\rEn: Enable power supply (3, 4, 5, H)\rDn: Disable power supply (3, 4, 5, H, A(ll)\rR: Reset to defaults\rQ: Query status\r"));
+		usb_tx_string_P(PSTR("*** Power Menu ***\r\nEn: Enable power supply (3, 4, 5, H)\r\nDn: Disable power supply (3, 4, 5, H, A(ll)\r\nR: Reset to defaults\r\nQ: Query status\r\n"));
 		break;
 	}
 }
@@ -434,12 +435,12 @@ void menu_timer(void) {
 	switch (CMD_buffer[3]) {
 	case 's':  //set V2X time
 		time_set(menu_sample_number(CMD_buffer+4));
-		usb_tx_string_PV(PSTR("Time has been set\r"));
+		usb_tx_string_PV(PSTR("Time has been set\r\n"));
 		break;
 	case 'g':  //get V2X time
 		usb_tx_string_P(PSTR("UET: "));
 		menu_print_int(time_get());
-		usb_tx_string_P(PSTR("\rTime: "));
+		usb_tx_string_P(PSTR("\r\nTime: "));
 		time_print_human_readable();
 		menu_send_n();
 		break;
@@ -467,41 +468,41 @@ void menu_timer(void) {
 		}
 		break;
 	case 'i':  //timer system information
-		usb_tx_string_P(PSTR("The timer module uses Unix Epoch timestamps (UET) \rH24: clock has been set/sync within 24hrs\rALM: alarm is set for the future\r"));
+		usb_tx_string_P(PSTR("The timer module uses Unix Epoch timestamps (UET) \r\nH24: clock has been set/sync within 24hrs\r\nALM: alarm is set for the future\r\n"));
 		break;
 	case 'q':  //timer inquery
 		menu_timer_status();
 		break;
 	case 'u':
-		//usb_tx_string_P(PSTR("GPS update\r"));
+		//usb_tx_string_P(PSTR("GPS update\r\n"));
 		GSM_time_job();
 		break;
 	case '?':  //Menu options
 	default:
-		usb_tx_string_P(PSTR("*** Timer Menu ***\rSn: Set V2X time (UET)\rDn: Daylight Savings Time\rG: Get V2X time\rAn: Set absolute alarm (UET) \rRn: Set relative alarm (Seconds)\rI: timer information\rQ: Timer inquery\rU: Update using gps\rZn: Set timezone\r"));
+		usb_tx_string_P(PSTR("*** Timer Menu ***\r\nSn: Set V2X time (UET)\r\nDn: Daylight Savings Time\r\nG: Get V2X time\r\nAn: Set absolute alarm (UET) \r\nRn: Set relative alarm (Seconds)\r\nI: timer information\r\nQ: Timer inquery\r\nU: Update using gps\r\nZn: Set timezone\r\n"));
 		break;
 	}
 }
 
-void menu_send_ok(void) {usb_tx_string_P(PSTR("OK\r"));
+void menu_send_ok(void) {usb_tx_string_P(PSTR("OK\r\n"));
 }
 
-void menu_send_q(void) {usb_tx_string_P(PSTR("?\r"));
+void menu_send_q(void) {usb_tx_string_P(PSTR("?\r\n"));
 }
 
-void menu_send_1(void) {usb_tx_string_P(PSTR("1\r"));
+void menu_send_1(void) {usb_tx_string_P(PSTR("1\r\n"));
 }
 
-void menu_send_0(void) {usb_tx_string_P(PSTR("0\r"));
+void menu_send_0(void) {usb_tx_string_P(PSTR("0\r\n"));
 }
 
-void menu_send_n(void) {usb_tx_string_P(PSTR("\r"));
+void menu_send_n(void) {usb_tx_string_P(PSTR("\r\n"));
 }
 
-void menu_send_n_st(void) {usb_tx_string_P(PSTR("\r>"));
+void menu_send_n_st(void) {usb_tx_string_P(PSTR("\r\n>"));
 }
 
-void menu_send_out_of_range(void) {usb_tx_string_P(PSTR("ERROR: out of range\r"));
+void menu_send_out_of_range(void) {usb_tx_string_P(PSTR("ERROR: out of range\r\n"));
 }
 
 void menu_send_GSM(void) {usb_tx_string_P(PSTR("GSM>:"));
@@ -547,7 +548,7 @@ void usb_tx_string_PV(const char *data) {
 }
 
 void menu_lockup (void) {
-	char msg[] = "AVR>>RESET:\r";
+	char msg[] = "AVR>>RESET:\r\n";
 	usb_cdc_send_string(USB_CMD, msg);
 	usb_cdc_send_string(USB_ACL, msg);
 	usb_cdc_send_string(USB_CAN, msg);

From 85382b791e11f64dc5de51123cf4be412168aa38 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 19 May 2017 14:28:25 -0700
Subject: [PATCH 58/83] command uart handles characters selectively

The control port should be very choosy about the characters it accepts. This has been expanded to include the newline character initiatin the menu.
And old section has been revived to clear the port in the event we get something unexpected, moving on to the next.
---
 V2X_Firmware/src/V2X/V2X_uart.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/V2X_Firmware/src/V2X/V2X_uart.c b/V2X_Firmware/src/V2X/V2X_uart.c
index e01b33d..9783c5c 100644
--- a/V2X_Firmware/src/V2X/V2X_uart.c
+++ b/V2X_Firmware/src/V2X/V2X_uart.c
@@ -127,7 +127,8 @@ void uart_rx_notify(uint8_t port) //message received over USB
 // 			|| (data >= '0' && data <= '9') 	//numbers
 // 			|| (data >= 'A' && data <= 'Z') 	//capitals
 // 			|| (data >= 'a' && data <= 'z')) {	//lower case
-	 		if (data >= 0x20 && data <= 0x7F || data == '\r' || data == 8) {
+//
+	 		if (data >= 0x20 && data <= 0x7F || data == '\r' || data == '\n' || data == 8) {
 				if (!udi_cdc_multi_is_tx_ready(port)) {		//is TX ready
  					udi_cdc_multi_signal_overrun(port);		//no
  				} else {udi_cdc_multi_putc(port, data);}	//push char to loop back
@@ -137,11 +138,11 @@ void uart_rx_notify(uint8_t port) //message received over USB
 				} else { //was a standard character that should be stored in the buffer
 					menu_add_to_command(data);
 				}
-// 			} else { //there was a special character
-// 				//run through the buffer until it is empty
-// 				while (udi_cdc_multi_is_rx_ready(port)) {
-// 					data = udi_cdc_multi_getc(port);
-// 				}
+ 			} else { //there was a special character
+ 				//run through the buffer until it is empty
+ 				while (udi_cdc_multi_is_rx_ready(port)) {
+ 					data = udi_cdc_multi_getc(port);
+ 				}
 			}
 		}
 	}else if (port == USB_ACL) { //loop back

From 2d17046b966966dd4d033341c182e397837a0d45 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 19 May 2017 14:30:27 -0700
Subject: [PATCH 59/83] Adds usb reattachment

Cases in linux suggest we should support the ability to reattach the usb. Currently this is done by providing 'u' to the ACL back channel.
---
 V2X_Firmware/src/V2X/V2X_init.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 38a1ae7..8dbf633 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -146,6 +146,17 @@ void reset_processor(void) {
 			reset_flags &= ~(1<<RESET_USB);
 		}
 #endif
+		//DEBUG: FIXME:
+		// Trying to implement some kind of USB reset that won't bring down the house but might keep
+		// control port happy on Linux...
+		if (reset_flags & (1<<RESET_USB))
+		{
+			usb_tx_string_P(PSTR("::Reset USB Called::\r\n"));
+			udd_detach();
+			delay_s(1);
+			udd_attach();
+			reset_flags &= ~(1<<RESET_USB);
+		}
 		if (reset_flags & (1<<RESET_CAN)) {
 			menu_send_CTL();
 			usb_tx_string_P(PSTR("CAN restarting\r>"));

From d8d008f2f33a341d90c2aa1a345038bd0e3c7aae Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 19 May 2017 14:32:25 -0700
Subject: [PATCH 60/83] Add command to enable GPS auto-start

Our common use cases suggest that we will desire the SIMCOM to enable GPS functionality without explicit request.
---
 V2X_Firmware/src/V2X/V2X_gsm.c | 15 +++++++++++++++
 V2X_Firmware/src/V2X/V2X_gsm.h |  7 +++++++
 2 files changed, 22 insertions(+)

diff --git a/V2X_Firmware/src/V2X/V2X_gsm.c b/V2X_Firmware/src/V2X/V2X_gsm.c
index 89f9f59..6fd946f 100644
--- a/V2X_Firmware/src/V2X/V2X_gsm.c
+++ b/V2X_Firmware/src/V2X/V2X_gsm.c
@@ -414,4 +414,19 @@ char * GSM_get_imei (void) {
 void GSM_command_power_off(void) {
 	CTL_add_string_to_buffer_P(&GSM, BUFFER_OUT, PSTR("AT+CPOF\r")); //compose message
 	CTL_mark_for_processing(&GSM, BUFFER_OUT);
+}
+
+void GSM_command_enable_gps_auto(int enable) {
+	switch(enable) {
+		case 0:
+		CTL_add_string_to_buffer_P(&GSM, BUFFER_OUT, PSTR("AT+CGPSAUTO=0\r")); //compose message
+		break;
+		
+		case 1:
+		CTL_add_string_to_buffer_P(&GSM, BUFFER_OUT, PSTR("AT+CGPSAUTO=1\r")); //compose message
+		break;
+		
+		default:
+		break;
+	}
 }
\ No newline at end of file
diff --git a/V2X_Firmware/src/V2X/V2X_gsm.h b/V2X_Firmware/src/V2X/V2X_gsm.h
index af4dc7a..e964e41 100644
--- a/V2X_Firmware/src/V2X/V2X_gsm.h
+++ b/V2X_Firmware/src/V2X/V2X_gsm.h
@@ -153,6 +153,13 @@ void GSM_time_job (void);
  */
 void GSM_time_sync  (char * responce_buffer);
 
+/**
+ * @def GSM_command_enable_gps_auto
+ * @brief send command to enable gps auto start in SIMCOM
+ * @param enable integer 0/1 to disable/enable respectively
+ */
+void GSM_command_enable_gps_auto(int enable);
+
 /**
  * @def GSM_parse_gps_info
  * @brief takes GPS string parses into usable sections

From 08615c033b1e92d396d9e315e4d9c9ad7c285bd8 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 19 May 2017 15:37:24 -0700
Subject: [PATCH 61/83] Send command to start gps automatically

Our field use cases indicate that we will want to have the gps start automatically without explicit instruction. The sending of the command can be configured at compile time.
---
 V2X_Firmware/src/V2X/V2X_board.h | 4 ++++
 V2X_Firmware/src/V2X/V2X_init.c  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/V2X_Firmware/src/V2X/V2X_board.h b/V2X_Firmware/src/V2X/V2X_board.h
index b654e49..9b7a78a 100644
--- a/V2X_Firmware/src/V2X/V2X_board.h
+++ b/V2X_Firmware/src/V2X/V2X_board.h
@@ -44,6 +44,10 @@ extern "C" {
 //#define SIMCOM 				SIMCOM_SIM7100A
 #define SIMCOM 				SIMCOM_SIM5320A
 
+/* Configure SIMCOM to start the GPS automatically, without explicit instruction
+ */
+#define GPS_AUTO
+
 /** \name 3v3 power pin definition
  * Activate to maintain power to CPU
  */
diff --git a/V2X_Firmware/src/V2X/V2X_init.c b/V2X_Firmware/src/V2X/V2X_init.c
index 8dbf633..f297145 100644
--- a/V2X_Firmware/src/V2X/V2X_init.c
+++ b/V2X_Firmware/src/V2X/V2X_init.c
@@ -125,6 +125,10 @@ void v2x_board_init(void)
 	CAN_elm_init();
 	ACL_set_sample_on();
 	PWR_host_start();
+#ifdef GPS_AUTO
+	//send gps auto start command
+	GSM_command_enable_gps_auto(1);
+#endif
 }
 
 void reset_processor(void) {

From 379ba727a917dfede71fdd895fe323cfabb914cf Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Mon, 22 May 2017 10:32:31 -0700
Subject: [PATCH 62/83] Start field support manual

Begin proposed table of contents for v2x field support manual
---
 field-support-manual.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 field-support-manual.md

diff --git a/field-support-manual.md b/field-support-manual.md
new file mode 100644
index 0000000..eb34ae5
--- /dev/null
+++ b/field-support-manual.md
@@ -0,0 +1,28 @@
+# V2X Field support documentation
+
+This documentation is intended to cover common V2X board use cases in the field.
+
+Please note that the documentation will include some information specific to the
+GENIVI Smart-Cities project.
+
+## Contents
+* Requirements for nominal operation
+* Requirements for smart-cities
+* Startup procedure
+    * Cable connection
+    * Power requirements
+        * Battery warning
+    * Nominal light states
+    * Nominal smart cities
+* Shutdown procedure
+    * Button power off
+    * Command options for power off (see also command set)
+* Runtime operation
+    * Vehicle safety notice
+    * Smart-cities interaction
+    * Verification
+    * Toubleshooting
+* V2X Command set
+* Firmware upgrade
+    - Tools
+    - Procedure 
\ No newline at end of file

From 83b7e3b866ca01abad8e875f46de5e4f344ff14f Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Mon, 22 May 2017 10:45:22 -0700
Subject: [PATCH 63/83] More contents

Contents updated based on feedback
---
 field-support-manual.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/field-support-manual.md b/field-support-manual.md
index eb34ae5..84be4fc 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -7,7 +7,14 @@ GENIVI Smart-Cities project.
 
 ## Contents
 * Requirements for nominal operation
+    * Power / OBD
+    * GPS / network antenna
+    * SIM card
 * Requirements for smart-cities
+    * Host computer
+        * Raspberry Pi
+        * GENIVI Yocto image
+        * Smart Cities application
 * Startup procedure
     * Cable connection
     * Power requirements
@@ -16,6 +23,7 @@ GENIVI Smart-Cities project.
     * Nominal smart cities
 * Shutdown procedure
     * Button power off
+        * Button failure or fallback procedure
     * Command options for power off (see also command set)
 * Runtime operation
     * Vehicle safety notice
@@ -24,5 +32,5 @@ GENIVI Smart-Cities project.
     * Toubleshooting
 * V2X Command set
 * Firmware upgrade
-    - Tools
-    - Procedure 
\ No newline at end of file
+    - Tools required
+    - Procedure
\ No newline at end of file

From 90091ed38aad6976f841e7e3474bc6a6a6c99c46 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Mon, 22 May 2017 15:31:47 -0700
Subject: [PATCH 64/83] Add stub sections, begin setup instructions

---
 field-support-manual.md | 101 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 95 insertions(+), 6 deletions(-)

diff --git a/field-support-manual.md b/field-support-manual.md
index 84be4fc..6b426ed 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -6,17 +6,21 @@ Please note that the documentation will include some information specific to the
 GENIVI Smart-Cities project.
 
 ## Contents
-* Requirements for nominal operation
-    * Power / OBD
-    * GPS / network antenna
-    * SIM card
+* V2X board description
+* [Requiremments for Nominal V2X Operation](#requirements-v2x)
+    * [Power / OBD](#requirements-power)
+    * [GPS / network antenna](#requirements-gps)
+    * [SIM card](#requirements-sim)
 * Requirements for smart-cities
     * Host computer
         * Raspberry Pi
         * GENIVI Yocto image
         * Smart Cities application
+* Hardware setup
+    * cable connection
+    * case enclosure and mounting
+    * sim card insertion instructions
 * Startup procedure
-    * Cable connection
     * Power requirements
         * Battery warning
     * Nominal light states
@@ -33,4 +37,89 @@ GENIVI Smart-Cities project.
 * V2X Command set
 * Firmware upgrade
     - Tools required
-    - Procedure
\ No newline at end of file
+    - Procedure
+
+## Requiremments for Nominal V2X Operation <a name="requirements-v2x"></a>
+
+### Power / OBD <a name="requirements-power"></a>
+
+At minimum, the V2X requires a 12v power supply. Power requirements are met by a
+standard OBDII connection.
+
+> Please note: The board will draw power while in operation even if the vehicle
+> engine is not engaged. Low power / suspend mode is not yet supported in
+> firmware. It is recommended to power off the V2X board while vehicle is not in
+> operation.
+
+###  GPS / network antenna <a name="requirements-gps"></a>
+
+GPS and cellular network connections require a combination GPS/GSM antenna.
+
+### SIM card <a name="requirements-sim"></a>
+
+Celllar network connectivity requires a properly provisioned SIM card.
+  
+## Hardware setup
+
+> TODO: links to external hardware required
+
+> Please note: SIM card must be inserted before board is powered on, and it is
+> likely easier to do so before connecting cables.
+
+Need:
+* V2X Board
+* OBDII to serial cable
+* GPS/GSM antenna
+* (2) Micro USB to USB cables
+
+### Cable connection
+
+1. Connect OBDII-serial cable into vehicle OBDII port (under dash) and the V2X
+   serial port.
+2. Connect GPS/GSM antenna cables.
+    * Typical configuration requires attaching "gold" head to port marked "GPS
+      Antenna" on board, and "silver" to port marked "3g Cellula Network
+      Antenna". Incorrectly reversing this connection will inhibit GPS signal,
+      and should be one of the first things to check if no GPS signal is
+      observed.
+3. Connect USB cable from port on board marked (Host PWR) to host computer micro usb power supply port. This will supply power to host computer (Raspberry Pi or other).
+4. Connect micro USB from port on board marked (Host DATA) to free USB port on host computer. This is the line
+   of communication between the board and the host.
+
+### Case enclosure and mounting
+
+### Sim card insertion instructions
+
+Proper SIM card alignment is critical to cellular network operation.
+
+Please insert SIM card so that
+* Gold contacts face TOWARDS the board
+* Chipped edge of card leads into the socket
+
+>TODO: Do we need a diagram for this?
+
+## Startup procedure
+
+### Power requirements
+
+#### Battery warning
+
+### Nominal light states
+
+### Nominal smart cities
+
+## Shutdown procedure
+
+### Button power off
+
+### Button failure or fallback procedure
+### Command options for power off (see also command set)
+## Runtime operation
+### Vehicle safety notice
+### Smart-cities interaction
+### Verification
+### Toubleshooting
+## V2X Command set
+## Firmware upgrade
+### Tools required
+### Procedure
\ No newline at end of file

From c3816f6e720198cb377529ad2eb43218250b8683 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Mon, 22 May 2017 15:54:56 -0700
Subject: [PATCH 65/83] Startup procedure stub

---
 field-support-manual.md | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/field-support-manual.md b/field-support-manual.md
index 6b426ed..30cb1a5 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -17,9 +17,9 @@ GENIVI Smart-Cities project.
         * GENIVI Yocto image
         * Smart Cities application
 * Hardware setup
-    * cable connection
-    * case enclosure and mounting
-    * sim card insertion instructions
+    * Cable connection
+    * Case enclosure and mounting
+    * Sim card insertion instructions
 * Startup procedure
     * Power requirements
         * Battery warning
@@ -82,9 +82,12 @@ Need:
       Antenna". Incorrectly reversing this connection will inhibit GPS signal,
       and should be one of the first things to check if no GPS signal is
       observed.
-3. Connect USB cable from port on board marked (Host PWR) to host computer micro usb power supply port. This will supply power to host computer (Raspberry Pi or other).
-4. Connect micro USB from port on board marked (Host DATA) to free USB port on host computer. This is the line
-   of communication between the board and the host.
+3. Connect USB cable from port on board marked (Host PWR) to host computer micro
+   usb power supply port. This will supply power to host computer (Raspberry Pi
+   or other).
+4. Connect micro USB from port on board marked (Host DATA) to free USB port on
+   host computer. This is the line of communication between the board and the
+   host.
 
 ### Case enclosure and mounting
 
@@ -100,10 +103,18 @@ Please insert SIM card so that
 
 ## Startup procedure
 
+1. Press red button. The driver is configured to bring all components to full
+   power. Please allow some seconds for host computer start and application
+   initialization.
+
 ### Power requirements
 
+V2X requires constant 12v power supply to sustain operation. Very informal testing shows average draw of ~0.15 amps during normal operation, with no host computer connected. When V2X is supplying power to a host such as a Raspberry Pi 3 with attached touch screen, power draw is ~0.6 amps.
+
 #### Battery warning
 
+>As noted above, the V2X firmware does not yet support low power / standby state. If left powered when vehicle is off, the vehicle battery could be drained significantly. Please power off the V2X (and host computer) when disengaging the vehicle.
+
 ### Nominal light states
 
 ### Nominal smart cities

From 2362f0a9f42cfb56221fa468fc507a7f9f6e3212 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 23 May 2017 14:37:45 -0700
Subject: [PATCH 66/83] Add links and stubs for sections

Also add power sections
---
 field-support-manual.md | 181 +++++++++++++++++++++++++++++-----------
 1 file changed, 130 insertions(+), 51 deletions(-)

diff --git a/field-support-manual.md b/field-support-manual.md
index 30cb1a5..8d0eab4 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -11,33 +11,37 @@ GENIVI Smart-Cities project.
     * [Power / OBD](#requirements-power)
     * [GPS / network antenna](#requirements-gps)
     * [SIM card](#requirements-sim)
-* Requirements for smart-cities
-    * Host computer
-        * Raspberry Pi
-        * GENIVI Yocto image
-        * Smart Cities application
-* Hardware setup
-    * Cable connection
-    * Case enclosure and mounting
-    * Sim card insertion instructions
-* Startup procedure
-    * Power requirements
-        * Battery warning
-    * Nominal light states
-    * Nominal smart cities
-* Shutdown procedure
-    * Button power off
-        * Button failure or fallback procedure
-    * Command options for power off (see also command set)
-* Runtime operation
-    * Vehicle safety notice
-    * Smart-cities interaction
-    * Verification
-    * Toubleshooting
-* V2X Command set
-* Firmware upgrade
-    - Tools required
-    - Procedure
+* [Requirements for smart-cities](#requirements-smart-cities)
+    * [Host computer](#requirements-host-computer)
+        * [Raspberry Pi](#requirements-raspberry-pi)
+        * [GENIVI Yocto image](#requirements-yocto)
+        * [Smart Cities application](#requirements-smart-cities-application)
+* [Hardware setup](#hardware-setup)
+    * [Cable connection](#cable-connection)
+    * [Case enclosure and mounting](#case-enclosure-and-mounting)
+    * [Sim card insertion instructions](#sim-card-instructions)
+* [Startup procedure](#startup-procedure)
+    * [Power requirements](#power-requirements)
+        * [Battery warning](#battery-warning)
+    * [Nominal light states](#nominal-light-states)
+    * [Nominal smart cities](#nominal-smart-cities)
+* [Shutdown procedure](#shutdown-procedure)
+    * [Button power off](#button-power-off)
+        * [Button failure or fallback procedure](#button-failure)
+    * [When all else fails](#when-fails)
+    * [Command options for power off (see also command set)](#command-power-off)
+* [Runtime operation](#runtime-operation)
+    * [Vehicle safety notice](#vehicle-safety-notice)
+    * [Smart-cities interaction](#smart-cities-interaction)
+    * [Cellular](#cellular-operations)
+    * [Verification](#verification)
+    * [Toubleshooting](#troubleshooting)
+* [V2X Command set](#v2x-command-set)
+* [Firmware upgrade](#firmware-upgrade)
+    - [Tools required](#firmware-tools-required)
+    - [Procedure](#firmware-procedure)
+
+## V2X Board Description <a name="v2x-board-description"></a>
 
 ## Requiremments for Nominal V2X Operation <a name="requirements-v2x"></a>
 
@@ -58,8 +62,18 @@ GPS and cellular network connections require a combination GPS/GSM antenna.
 ### SIM card <a name="requirements-sim"></a>
 
 Celllar network connectivity requires a properly provisioned SIM card.
+
+## Requirements for smart-cities <a name="requirements-smart-cities"></a>
+
+### Host computer <a name="requirements-host-computer"></a>
+
+#### Raspberry Pi <a name="requirements-raspberry-pi"></a>
+
+#### GENIVI Yocto image <a name="requirements-yocto"></a>
+
+#### Smart Cities application <a name="requirements-smart-cities-application"></a>
   
-## Hardware setup
+## Hardware setup <a name="hardware-setup"></a>
 
 > TODO: links to external hardware required
 
@@ -72,7 +86,7 @@ Need:
 * GPS/GSM antenna
 * (2) Micro USB to USB cables
 
-### Cable connection
+### Cable connection <a name="cable-connection"></a>
 
 1. Connect OBDII-serial cable into vehicle OBDII port (under dash) and the V2X
    serial port.
@@ -89,9 +103,9 @@ Need:
    host computer. This is the line of communication between the board and the
    host.
 
-### Case enclosure and mounting
+### Case enclosure and mounting <a name="case-enclosure-and-mounting"></a>
 
-### Sim card insertion instructions
+### Sim card insertion instructions <a name="sim-card-instructions"></a>
 
 Proper SIM card alignment is critical to cellular network operation.
 
@@ -101,36 +115,101 @@ Please insert SIM card so that
 
 >TODO: Do we need a diagram for this?
 
-## Startup procedure
+## Startup procedure <a name="startup-procedure"></a>
 
 1. Press red button. The driver is configured to bring all components to full
    power. Please allow some seconds for host computer start and application
    initialization.
 
-### Power requirements
+### Power requirements <a name="power-requirements"></a>
+
+V2X requires constant 12v power supply to sustain operation. Very informal
+testing shows average draw of ~0.15 amps during normal operation, with no host
+computer connected. When V2X is supplying power to a host such as a Raspberry Pi
+3 with attached touch screen, power draw is ~0.6 amps.
+
+#### Battery warning <a name="battery-warning"></a>
+
+>As noted above, the V2X firmware does not yet support low power / standby
+state. If left powered when vehicle is off, the vehicle battery could be drained
+significantly. Please power off the V2X (and host computer) when disengaging the
+vehicle.
+
+### Nominal light states <a name="nominal-light-states"></a>
+
+Currently, the firmware is drives the three on board LEDs respective to GSM
+modem status.
+
+Red: SIM card insertion status.
+
+Blue: GSM power status.
+
+Green: GSM network state.
+* Steady: no network operator registered.
+* 800ms blink: operator selected, no network connection dialed.
+* 200ms blink: network connction dialed.
+
+> Please note: A bug currently exists in the driver that can produce a state
+where the LEDs are not updated with the correct frequency. The distro built for
+Smart Cities contains a work around service for this issue.
+
+### Nominal smart cities <a name="nominal-smart-cities"></a>
+
+The Smart Cities application should initialize automatically after host system
+start.
+
+## Shutdown procedure <a name="shutdown-procedure"></a>
+
+Shutdown is currently handled by cutting power to systems; there are multiple
+methods available.
+
+### Button power off <a name="button-power-off"></a>
+
+The button on the V2X board can be used to control the power states.
+
+Hold button for longer than N seconds and release.
+* \> 1 second: Turn on all board components (including Host)
+* \> 3 seconds: Turn off all board components (including Host), only Atmel CPU
+  will retain power
+* \> 5 seconds: Turn off V2X board
+
+### Button failure or fallback procedure <a name="button-failure"></a>
+
+V2X board supports a command set over a USB-serial port.
+
+>TODO: Later section with details on using command set for power management and
+troubleshooting.
+
+### When all else fails <a name="when-fails"></a>
+
+Disconnecting the board from the OBD port will cut power. Allow a few seconds,
+then reconnect. Use the button repower the system.
+
+### Command options for power off (see also command set) <a name="command-power-off"></a>
+
+>TODO: Describe contacting the V2X control port, and commands that can be used
+for power state manipulation.
+
+## Runtime operation <a name="runtime-operation"></a>
+### Vehicle safety notice <a name="vehicle-safety-notice"></a>
+### Smart-cities interaction <a name="smart-cities-interaction"></a>
+### Verification <a name="verification"></a>
+### Toubleshooting <a name="troubleshooting"></a>
+## V2X Command set <a name="v2x-command-set"></a>
 
-V2X requires constant 12v power supply to sustain operation. Very informal testing shows average draw of ~0.15 amps during normal operation, with no host computer connected. When V2X is supplying power to a host such as a Raspberry Pi 3 with attached touch screen, power draw is ~0.6 amps.
+>TODO: Include V2X command set
 
-#### Battery warning
+## Firmware upgrade <a name="firmware-upgrade"></a>
 
->As noted above, the V2X firmware does not yet support low power / standby state. If left powered when vehicle is off, the vehicle battery could be drained significantly. Please power off the V2X (and host computer) when disengaging the vehicle.
+The V2X firmware is in ongoing development. Unfortunately there is no easy way
+to upgrade the firmware; instead development tools are required.
 
-### Nominal light states
+### Tools required <a name="firmware-tools-required"></a>
 
-### Nominal smart cities
+>TODO: AVR Dragon or compatible debugging board
 
-## Shutdown procedure
+### Procedure <a name="firmware-procedure"></a>
 
-### Button power off
+>TODO: Atmel Studio programming route
 
-### Button failure or fallback procedure
-### Command options for power off (see also command set)
-## Runtime operation
-### Vehicle safety notice
-### Smart-cities interaction
-### Verification
-### Toubleshooting
-## V2X Command set
-## Firmware upgrade
-### Tools required
-### Procedure
\ No newline at end of file
+>TODO: AVR Dude programming route

From 06ce82f654af03be36e52d75c1808976b9117ac1 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Wed, 24 May 2017 15:44:42 -0700
Subject: [PATCH 67/83] EOD commit

Adds some port information, formatting fixes.
---
 field-support-manual.md | 121 ++++++++++++++++++++++++++++++++--------
 1 file changed, 98 insertions(+), 23 deletions(-)

diff --git a/field-support-manual.md b/field-support-manual.md
index 8d0eab4..9fa3f09 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -1,12 +1,22 @@
-# V2X Field support documentation
+# V2X Field Support Documentation
 
 This documentation is intended to cover common V2X board use cases in the field.
 
 Please note that the documentation will include some information specific to the
 GENIVI Smart-Cities project.
 
+> ## Vehicle Safety Warning
+> * Do not attempt maintenance, operation, troubleshooting, or anything in this
+>   manual while the vehicle is in motion or operation.
+> * Use of the V2X board and any related hardware or software is entirely at
+>   your own risk. The authors and maintainers assume no responsibility or
+>   liability whatsoever for any injury or damage to property anywhere, ever.
+> * As a powered device, the V2X could drain a vehicle battery. Turn off the
+>   device when turning off the vehicle. Disconnect the device when leaving the
+>   vehicle unattaned.
+
 ## Contents
-* V2X board description
+* [V2X board description](#v2x-board-description)
 * [Requiremments for Nominal V2X Operation](#requirements-v2x)
     * [Power / OBD](#requirements-power)
     * [GPS / network antenna](#requirements-gps)
@@ -43,12 +53,24 @@ GENIVI Smart-Cities project.
 
 ## V2X Board Description <a name="v2x-board-description"></a>
 
+The Vehicle-to-Everything (V2X) board is a telemetry aggregation and delivery
+device. It provides access to:
+* Accelerometer
+* CAN/OBD interface via STN110/ELM327
+* GPS (requires antenna)
+* GSM network connectivity, via SIMCOM chipset (requires 3g antenna, 3g SIM
+  card)
+* Power over USB for host computer
+
+Configuration and operation can be handled manually, but the device is intended
+to be complemented by a host computer for automated operation.
+
 ## Requiremments for Nominal V2X Operation <a name="requirements-v2x"></a>
 
 ### Power / OBD <a name="requirements-power"></a>
 
 At minimum, the V2X requires a 12v power supply. Power requirements are met by a
-standard OBDII connection.
+standard OBDII-to-serial connection.
 
 > Please note: The board will draw power while in operation even if the vehicle
 > engine is not engaged. Low power / suspend mode is not yet supported in
@@ -57,7 +79,7 @@ standard OBDII connection.
 
 ###  GPS / network antenna <a name="requirements-gps"></a>
 
-GPS and cellular network connections require a combination GPS/GSM antenna.
+GPS and cellular network connections require a combination GPS/GSM 3g antenna.
 
 ### SIM card <a name="requirements-sim"></a>
 
@@ -77,7 +99,7 @@ Celllar network connectivity requires a properly provisioned SIM card.
 
 > TODO: links to external hardware required
 
-> Please note: SIM card must be inserted before board is powered on, and it is
+> Please note: SIM card should be inserted before board is powered on, and it is
 > likely easier to do so before connecting cables.
 
 Need:
@@ -91,11 +113,13 @@ Need:
 1. Connect OBDII-serial cable into vehicle OBDII port (under dash) and the V2X
    serial port.
 2. Connect GPS/GSM antenna cables.
-    * Typical configuration requires attaching "gold" head to port marked "GPS
-      Antenna" on board, and "silver" to port marked "3g Cellula Network
-      Antenna". Incorrectly reversing this connection will inhibit GPS signal,
-      and should be one of the first things to check if no GPS signal is
-      observed.
+    > Typical configuration requires attaching
+    >* "gold" head to port marked "**GPS Antenna**"
+    >* "silver" head to port marked "**3g Cellula Network Antenna**"
+
+    > Incorrectly reversing this connection will inhibit GPS signal, and should
+      be one of the first things to check if no GPS signal is observed.
+
 3. Connect USB cable from port on board marked (Host PWR) to host computer micro
    usb power supply port. This will supply power to host computer (Raspberry Pi
    or other).
@@ -112,6 +136,10 @@ Proper SIM card alignment is critical to cellular network operation.
 Please insert SIM card so that
 * Gold contacts face TOWARDS the board
 * Chipped edge of card leads into the socket
+* Fully inserted card will engage the spring lock
+
+To remove the card, push in until the spring lock releases, and the card will be
+ejected partially from the slot.
 
 >TODO: Do we need a diagram for this?
 
@@ -121,6 +149,9 @@ Please insert SIM card so that
    power. Please allow some seconds for host computer start and application
    initialization.
 
+When the host comes on line and connects to the V2X, the lights (red, blue,
+green) on board should be visible.
+
 ### Power requirements <a name="power-requirements"></a>
 
 V2X requires constant 12v power supply to sustain operation. Very informal
@@ -128,30 +159,40 @@ testing shows average draw of ~0.15 amps during normal operation, with no host
 computer connected. When V2X is supplying power to a host such as a Raspberry Pi
 3 with attached touch screen, power draw is ~0.6 amps.
 
-#### Battery warning <a name="battery-warning"></a>
-
+> #### Battery warning <a name="battery-warning"></a>
 >As noted above, the V2X firmware does not yet support low power / standby
 state. If left powered when vehicle is off, the vehicle battery could be drained
 significantly. Please power off the V2X (and host computer) when disengaging the
 vehicle.
 
-### Nominal light states <a name="nominal-light-states"></a>
+## Nominal light states <a name="nominal-light-states"></a>
 
-Currently, the firmware is drives the three on board LEDs respective to GSM
-modem status.
+Currently, the firmware drives the three on board LEDs respective to GSM modem
+status.
 
-Red: SIM card insertion status.
+* Red: SIM card insertion status.
+    - Active: SIM card is inserted (properly)
+    - Inactive: SIM card missing or instered improperly
 
-Blue: GSM power status.
+* Blue: GSM power status.
+    - Active: SIMCOM chipset is powered
 
 Green: GSM network state.
 * Steady: no network operator registered.
 * 800ms blink: operator selected, no network connection dialed.
 * 200ms blink: network connction dialed.
 
+A steady green light likely indicates that the signal quality is not sufficient
+to register and attach to the desired network operator.
+
 > Please note: A bug currently exists in the driver that can produce a state
-where the LEDs are not updated with the correct frequency. The distro built for
-Smart Cities contains a work around service for this issue.
+where the LEDs are not updated with the correct frequency if the host has not
+actively communicated with the host for some time. Until this issue is resolved,
+the host should use a scripted means of occaisionally contacting the V2X control
+port. The distro built for Smart Cities contains a work around service for this
+issue.
+
+If the lights are not visible, this should indicate the device is not powered.
 
 ### Nominal smart cities <a name="nominal-smart-cities"></a>
 
@@ -173,6 +214,9 @@ Hold button for longer than N seconds and release.
   will retain power
 * \> 5 seconds: Turn off V2X board
 
+> While no LEDs currently dedicated to indicating power state of the board
+> itself, powering off the board will deactivate the LEDs.
+
 ### Button failure or fallback procedure <a name="button-failure"></a>
 
 V2X board supports a command set over a USB-serial port.
@@ -182,16 +226,45 @@ troubleshooting.
 
 ### When all else fails <a name="when-fails"></a>
 
-Disconnecting the board from the OBD port will cut power. Allow a few seconds,
-then reconnect. Use the button repower the system.
+Disconnect the board from the OBD port to cut power. Allow a few seconds, then
+reconnect. Use the button repower the system.
 
 ### Command options for power off (see also command set) <a name="command-power-off"></a>
 
 >TODO: Describe contacting the V2X control port, and commands that can be used
 for power state manipulation.
 
-## Runtime operation <a name="runtime-operation"></a>
-### Vehicle safety notice <a name="vehicle-safety-notice"></a>
+## V2X Interface and Control<a name="runtime-operation"></a>
+
+> TODO: com/serial port description
+
+A host computer can communicate with the components on board the device, via the
+virtual ports mounted over USB. The exact arrangement and details of these ports
+depend on the operating system of the host computer.
+
+### Micro controller / command port
+
+
+### Communication ports arrangement
+
+> Depending on operating system, arrangement of the virtual ports is at the
+> mercy of whatever order they are mounted in. This means that the serial port
+> for a particular device may not remain consistent. It is encouraged for the
+> host computer to use a rules system (like `udev` in Linux) to map consistent
+> port aliases.
+
+The common port mounting arrangement observed in Linux:
+* `/dev/ttyACM0` -> STN110/ELM327 CAN chip
+* `/dev/ttyACM1` -> V2X control port (VX command set)
+* `/dev/ttyACM2` -> Accelerometer data stream (and secret reset back channel)
+* `/dev/ttyUSB0` -> SIMCOM diagnostic port (unused)
+* `/dev/ttyUSB1` -> GPS stream
+* `/dev/ttyUSB2` -> GSM modem AT command port (PPP dialer should use this for
+  internet connection)
+* `/dev/ttyUSB3` -> SIMCOM AT control (AT command set)
+
+
+
 ### Smart-cities interaction <a name="smart-cities-interaction"></a>
 ### Verification <a name="verification"></a>
 ### Toubleshooting <a name="troubleshooting"></a>
@@ -201,6 +274,8 @@ for power state manipulation.
 
 ## Firmware upgrade <a name="firmware-upgrade"></a>
 
+> TODO: section should describe firmware, locations, etc, as well as tools.
+
 The V2X firmware is in ongoing development. Unfortunately there is no easy way
 to upgrade the firmware; instead development tools are required.
 

From 630c8372cc0938610af9c9d516bd206cd7b7e451 Mon Sep 17 00:00:00 2001
From: rgoldie2 <rgoldie@jaguarlandrover.com>
Date: Thu, 25 May 2017 16:08:40 -0700
Subject: [PATCH 68/83] Update field-support-manual.md

---
 field-support-manual.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/field-support-manual.md b/field-support-manual.md
index 9fa3f09..2b166b9 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -152,6 +152,14 @@ ejected partially from the slot.
 When the host comes on line and connects to the V2X, the lights (red, blue,
 green) on board should be visible.
 
+[NOT YET IMPLEMENTED]In addition status indicators for GPS signal and connection to the RVI server should display green. 
+
+If the GPS signal is red, check the connection and/or move the vehicle to a location with clear view of the sky. 
+
+If the RVI indicator is red, check that the SIM card is properly installed and activated. If it is yellow, contact [TBD] to verify that the RVI server is up and running. 
+
+[TODO - Ask Tasha to add additional info and pics once implemented]
+
 ### Power requirements <a name="power-requirements"></a>
 
 V2X requires constant 12v power supply to sustain operation. Very informal
@@ -288,3 +296,10 @@ to upgrade the firmware; instead development tools are required.
 >TODO: Atmel Studio programming route
 
 >TODO: AVR Dude programming route
+
+## FAQ
+
+Q: Why does the OBU occasionally take longer to boot or appear to reboot several times when starting up
+A: There is an issue with the graphics compositor in the GENIVI Development Platform and it occasionally does not load properly. Normally, this would cause a command line to appear instead of the GUI. We have created a workaround to detect this condition and reload the compositor.  A bug has been logged.
+
+

From e29ee82952862df1276691a1b12b48e89322602d Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Thu, 25 May 2017 16:24:56 -0700
Subject: [PATCH 69/83] EOD commit

Adds programming entries and command set
---
 field-support-manual.md | 189 ++++++++++++++++++++++++++++++++++------
 1 file changed, 161 insertions(+), 28 deletions(-)

diff --git a/field-support-manual.md b/field-support-manual.md
index 9fa3f09..504a45f 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -55,6 +55,7 @@ GENIVI Smart-Cities project.
 
 The Vehicle-to-Everything (V2X) board is a telemetry aggregation and delivery
 device. It provides access to:
+
 * Accelerometer
 * CAN/OBD interface via STN110/ELM327
 * GPS (requires antenna)
@@ -65,7 +66,7 @@ device. It provides access to:
 Configuration and operation can be handled manually, but the device is intended
 to be complemented by a host computer for automated operation.
 
-## Requiremments for Nominal V2X Operation <a name="requirements-v2x"></a>
+## Requirements for Nominal V2X Operation <a name="requirements-v2x"></a>
 
 ### Power / OBD <a name="requirements-power"></a>
 
@@ -85,16 +86,6 @@ GPS and cellular network connections require a combination GPS/GSM 3g antenna.
 
 Celllar network connectivity requires a properly provisioned SIM card.
 
-## Requirements for smart-cities <a name="requirements-smart-cities"></a>
-
-### Host computer <a name="requirements-host-computer"></a>
-
-#### Raspberry Pi <a name="requirements-raspberry-pi"></a>
-
-#### GENIVI Yocto image <a name="requirements-yocto"></a>
-
-#### Smart Cities application <a name="requirements-smart-cities-application"></a>
-  
 ## Hardware setup <a name="hardware-setup"></a>
 
 > TODO: links to external hardware required
@@ -103,6 +94,7 @@ Celllar network connectivity requires a properly provisioned SIM card.
 > likely easier to do so before connecting cables.
 
 Need:
+
 * V2X Board
 * OBDII to serial cable
 * GPS/GSM antenna
@@ -127,10 +119,16 @@ Need:
    host computer. This is the line of communication between the board and the
    host.
 
+> TODO: Pictures!
+
 ### Case enclosure and mounting <a name="case-enclosure-and-mounting"></a>
 
+> TODO: Pictures!
+
 ### Sim card insertion instructions <a name="sim-card-instructions"></a>
 
+> TODO: Pictures!
+
 Proper SIM card alignment is critical to cellular network operation.
 
 Please insert SIM card so that
@@ -165,7 +163,7 @@ state. If left powered when vehicle is off, the vehicle battery could be drained
 significantly. Please power off the V2X (and host computer) when disengaging the
 vehicle.
 
-## Nominal light states <a name="nominal-light-states"></a>
+### Nominal light states <a name="nominal-light-states"></a>
 
 Currently, the firmware drives the three on board LEDs respective to GSM modem
 status.
@@ -177,10 +175,10 @@ status.
 * Blue: GSM power status.
     - Active: SIMCOM chipset is powered
 
-Green: GSM network state.
-* Steady: no network operator registered.
-* 800ms blink: operator selected, no network connection dialed.
-* 200ms blink: network connction dialed.
+* Green: GSM network state.
+    - Steady: no network operator registered.
+    - 800ms blink: operator selected, no network connection dialed.
+    - 200ms blink: network connction dialed.
 
 A steady green light likely indicates that the signal quality is not sufficient
 to register and attach to the desired network operator.
@@ -194,11 +192,6 @@ issue.
 
 If the lights are not visible, this should indicate the device is not powered.
 
-### Nominal smart cities <a name="nominal-smart-cities"></a>
-
-The Smart Cities application should initialize automatically after host system
-start.
-
 ## Shutdown procedure <a name="shutdown-procedure"></a>
 
 Shutdown is currently handled by cutting power to systems; there are multiple
@@ -209,6 +202,7 @@ methods available.
 The button on the V2X board can be used to control the power states.
 
 Hold button for longer than N seconds and release.
+
 * \> 1 second: Turn on all board components (including Host)
 * \> 3 seconds: Turn off all board components (including Host), only Atmel CPU
   will retain power
@@ -234,6 +228,11 @@ reconnect. Use the button repower the system.
 >TODO: Describe contacting the V2X control port, and commands that can be used
 for power state manipulation.
 
+### Nominal smart cities <a name="nominal-smart-cities"></a>
+
+The Smart Cities application should initialize automatically after host system
+start.
+
 ## V2X Interface and Control<a name="runtime-operation"></a>
 
 > TODO: com/serial port description
@@ -245,7 +244,7 @@ depend on the operating system of the host computer.
 ### Micro controller / command port
 
 
-### Communication ports arrangement
+### Communication ports 
 
 > Depending on operating system, arrangement of the virtual ports is at the
 > mercy of whatever order they are mounted in. This means that the serial port
@@ -254,6 +253,7 @@ depend on the operating system of the host computer.
 > port aliases.
 
 The common port mounting arrangement observed in Linux:
+
 * `/dev/ttyACM0` -> STN110/ELM327 CAN chip
 * `/dev/ttyACM1` -> V2X control port (VX command set)
 * `/dev/ttyACM2` -> Accelerometer data stream (and secret reset back channel)
@@ -263,15 +263,90 @@ The common port mounting arrangement observed in Linux:
   internet connection)
 * `/dev/ttyUSB3` -> SIMCOM AT control (AT command set)
 
-
-
-### Smart-cities interaction <a name="smart-cities-interaction"></a>
 ### Verification <a name="verification"></a>
 ### Toubleshooting <a name="troubleshooting"></a>
 ## V2X Command set <a name="v2x-command-set"></a>
 
 >TODO: Include V2X command set
 
+| VXAD |		A |	D |		Disable the accelerometer	--	"OK" |  \
+
+| VXAE |		A |	E |		Enable the accelerometer	--	"OK" |  \
+
+| VXAI |		A |	I |		Accelerometer device information	--	Description of device used |  \
+
+| VXAQ |		A |	Q |		Accelerometer state query	--	"ACL=x" 1=on 0=off |  \
+
+| VXAR |		A |	R |		Restart the Accelerometer	--	"OK" |  \
+
+| VXASxxxx |	A |	Sxxxx |	Change the sample rate to xxx	1,3,6,12,25,50,100,200,400,800,1600,3200	Number confirmed |  \
+
+| VXAXxxxx |	A |	Xxxxx |	Accelerometer X axis offset (zero)	-127 to 127	Number confirmed |  \
+
+| VXAYxxxx |	A |	Yxxxx |	Accelerometer Y axis offset (zero)	-127 to 127	Number confirmed |  \
+
+| VXAZxxxx |	A |	Zxxxx |	Accelerometer Z axis offset (zero)	-127 to 127	Number confirmed |  \
+
+| VXAG |		A |	G |		Get single Accelerometer sample	--	XYZT |  \
+
+| VXARxx |		A |	Rxx |	Set G-range 	2, 4, 8, 16	Number confirmed |  \
+
+| VXCD |		C |	D |		Disable the CAN interface	--	"OK" |  \
+
+| VXCE |		C |	E |		Enable the CAN interface	--	"OK" |  \
+
+| VXCI |		C |	I |		CANbus device information	--	Description of device used |  \
+
+| VXCQ |		C |	Q |		CAN state information	--	"CAN=x" 1=on 0=off |  \
+
+| VXCR |		C |	R |		Restart the CAN	--	"OK" |  \
+
+| VXI |			I |			V2X | Device Information	--	Specifies HW and SW revs |  \
+
+| VXMD |		M |	D |		Disable the Modem	--	"OK" |  \
+
+| VXME |		M |	E |		Enable the Modem	--	"OK" |  \
+
+| VXMI |		M |	I |		Modem device information	--	Description of device used |  \
+
+| VXMQ |		M |	Q |		Modem state query	--	"SIMPWR=x, SIMNET=x" 1=on 0=off |  \
+
+| VXMR |		M |	R |		Rerestart the Modem	--	"OK" |  \
+
+| VXPD3 |		P |	D3 |	Disable the 3V power supply		"OK" |  \
+
+| VXPD4 |		P |	D4 |	Disable the 4V power supply		"OK" |  \
+
+| VXPD5 |		P |	D5 |	Disable the 5V power supply		"OK" |  \
+
+| VXPDH |		P |	DH |	Disable the Host power port		"OK" |  \
+
+| VXPDDx |		P |	DDx |	Disable host with delay	x: seconds	Number confirmed |  \
+
+| VXPE3 |		P |	E3 |	Enable the 3V power supply		"OK" |  \
+
+| VXPE4 |		P |	E4 |	Enable the 4V power supply		"OK" |  \
+
+| VXPE5 |		P |	E5 |	Enable the 5V power supply		"OK" |  \
+
+| VXPEH |		P |	EH |	Enable the Host power port		"OK" |  \
+
+| VXPQ |		P |	Q |		Power state query		"3V3=x, 4V1=x, 5V0=x, HOST=x" 1=on 0=off |  \
+
+| VXW |			W |			Wake | up event query		  \
+
+| VXQ |			Q |			Whole | system status query		All other query results rolled into one |  \
+
+| VXTD |		T |	D |		disable wakeup timers 		  \
+
+| VXTWxxxxx |	T |			Wxxxxx |	Wakeup timer set for xxxxx seconds from now		 |  \
+
+| VXR |			R |			V2X | board reset		  \
+
+| VXS |			S |			SIMCARD | check		"SIMCARD=x" 1=in 0=out |  \
+
+
+
 ## Firmware upgrade <a name="firmware-upgrade"></a>
 
 > TODO: section should describe firmware, locations, etc, as well as tools.
@@ -279,12 +354,70 @@ The common port mounting arrangement observed in Linux:
 The V2X firmware is in ongoing development. Unfortunately there is no easy way
 to upgrade the firmware; instead development tools are required.
 
+Using a hardware programmer and a software utility, the V2X device can be
+flashed with new firmware.
+
 ### Tools required <a name="firmware-tools-required"></a>
 
+#### Programmer/Debugger
+
+A plethora of hardware programming/debugger solutions are available. The AVR
+Dragon is one such device.
+
+[AVR Dragon product page](http://www.atmel.com/tools/avrdragon.aspx)
+
 >TODO: AVR Dragon or compatible debugging board
 
-### Procedure <a name="firmware-procedure"></a>
+### Programmer Connection to the V2X Board
+
+#### Example: AVR Dragon
+
+* Connect one end of the programming ribbon cable to the Dragon board on the set
+  of pins marked *1 ISP 5*. Ensure that the red stripe on the ribbon is aligned
+  with the *1* on the pin port.
+* Connect the other end of the cable to the set of pins marked *PDI* on top of
+  the V2X board. Align the connector so that the red stripe is closest to the
+  bottom corner nearest the *PDI* marking.
+
+> TODO: image of proper connection
+
+To check if the cable has been correctly connected and aligned, use programming
+software to read the voltage of the device while the board is powered. The
+voltage should read **3.2v**.
+
+### Firmware Upgrade Procedure <a name="firmware-procedure"></a>
+
+#### Atmel Studio
+
+> A full reiteration of the programming instructions for the board are currently
+> out of scope of this document.
+
+Atmel Studio supports an easy programming interface for loading firmware .hex
+files onto the board.
+
+[Atmel Studio Programming Dialog
+documentation](http://www.atmel.com/webdoc/atmelstudio/atmelstudio.AVRStudio.ProgrammingDialog.Introduction.html)
+
+#### AVRDUDE
+
+AVRDude is a cross platform (Linux/Windows) programming software utility.
+
+
+[AVRDUDE Documentation](http://nongnu.askapache.com/avrdude/avrdude-doc-6.3.pdf)
+
+Please read the above documentation for details and options for using AVRDUDE.
+
+Ultimately, the usage will boil down to something like this:
+
+```
+avrdude -p x128a4u -c <programmer-id> -e -U flash:w:<file-name>.hex
+```
+## Links and Resources
+
 
->TODO: Atmel Studio programming route
 
->TODO: AVR Dude programming route
+[v2x-board-connected-top]: [v2x-board-connected-under]:
+[v2x-connections-facing]: [v2x-dragon-v2x-connected]:
+[v2x-dragon-v2x-connected-detail]: [v2x-lights-on]:
+[v2x-sim-card-alignment-under]: [v2x-sim-card-ejected]: [v2x-obd-connection]:
+[v2x-mounted-enclosure]:

From b57b582aec03eecce039bf9a52e3574f6110d103 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 26 May 2017 13:34:44 -0700
Subject: [PATCH 70/83] Fix table of v2x commands

Table using github flavoured markdown
---
 field-support-manual.md | 142 ++++++++++++++++------------------------
 1 file changed, 58 insertions(+), 84 deletions(-)

diff --git a/field-support-manual.md b/field-support-manual.md
index 504a45f..f4e2473 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -158,7 +158,7 @@ computer connected. When V2X is supplying power to a host such as a Raspberry Pi
 3 with attached touch screen, power draw is ~0.6 amps.
 
 > #### Battery warning <a name="battery-warning"></a>
->As noted above, the V2X firmware does not yet support low power / standby
+> As noted above, the V2X firmware does not yet support low power / standby
 state. If left powered when vehicle is off, the vehicle battery could be drained
 significantly. Please power off the V2X (and host computer) when disengaging the
 vehicle.
@@ -215,7 +215,7 @@ Hold button for longer than N seconds and release.
 
 V2X board supports a command set over a USB-serial port.
 
->TODO: Later section with details on using command set for power management and
+> TODO: Later section with details on using command set for power management and
 troubleshooting.
 
 ### When all else fails <a name="when-fails"></a>
@@ -225,7 +225,7 @@ reconnect. Use the button repower the system.
 
 ### Command options for power off (see also command set) <a name="command-power-off"></a>
 
->TODO: Describe contacting the V2X control port, and commands that can be used
+> TODO: Describe contacting the V2X control port, and commands that can be used
 for power state manipulation.
 
 ### Nominal smart cities <a name="nominal-smart-cities"></a>
@@ -267,96 +267,70 @@ The common port mounting arrangement observed in Linux:
 ### Toubleshooting <a name="troubleshooting"></a>
 ## V2X Command set <a name="v2x-command-set"></a>
 
->TODO: Include V2X command set
-
-| VXAD |		A |	D |		Disable the accelerometer	--	"OK" |  \
-
-| VXAE |		A |	E |		Enable the accelerometer	--	"OK" |  \
-
-| VXAI |		A |	I |		Accelerometer device information	--	Description of device used |  \
-
-| VXAQ |		A |	Q |		Accelerometer state query	--	"ACL=x" 1=on 0=off |  \
-
-| VXAR |		A |	R |		Restart the Accelerometer	--	"OK" |  \
-
-| VXASxxxx |	A |	Sxxxx |	Change the sample rate to xxx	1,3,6,12,25,50,100,200,400,800,1600,3200	Number confirmed |  \
-
-| VXAXxxxx |	A |	Xxxxx |	Accelerometer X axis offset (zero)	-127 to 127	Number confirmed |  \
-
-| VXAYxxxx |	A |	Yxxxx |	Accelerometer Y axis offset (zero)	-127 to 127	Number confirmed |  \
-
-| VXAZxxxx |	A |	Zxxxx |	Accelerometer Z axis offset (zero)	-127 to 127	Number confirmed |  \
-
-| VXAG |		A |	G |		Get single Accelerometer sample	--	XYZT |  \
-
-| VXARxx |		A |	Rxx |	Set G-range 	2, 4, 8, 16	Number confirmed |  \
-
-| VXCD |		C |	D |		Disable the CAN interface	--	"OK" |  \
-
-| VXCE |		C |	E |		Enable the CAN interface	--	"OK" |  \
-
-| VXCI |		C |	I |		CANbus device information	--	Description of device used |  \
-
-| VXCQ |		C |	Q |		CAN state information	--	"CAN=x" 1=on 0=off |  \
-
-| VXCR |		C |	R |		Restart the CAN	--	"OK" |  \
-
-| VXI |			I |			V2X | Device Information	--	Specifies HW and SW revs |  \
-
-| VXMD |		M |	D |		Disable the Modem	--	"OK" |  \
-
-| VXME |		M |	E |		Enable the Modem	--	"OK" |  \
-
-| VXMI |		M |	I |		Modem device information	--	Description of device used |  \
-
-| VXMQ |		M |	Q |		Modem state query	--	"SIMPWR=x, SIMNET=x" 1=on 0=off |  \
-
-| VXMR |		M |	R |		Rerestart the Modem	--	"OK" |  \
-
-| VXPD3 |		P |	D3 |	Disable the 3V power supply		"OK" |  \
-
-| VXPD4 |		P |	D4 |	Disable the 4V power supply		"OK" |  \
-
-| VXPD5 |		P |	D5 |	Disable the 5V power supply		"OK" |  \
-
-| VXPDH |		P |	DH |	Disable the Host power port		"OK" |  \
-
-| VXPDDx |		P |	DDx |	Disable host with delay	x: seconds	Number confirmed |  \
-
-| VXPE3 |		P |	E3 |	Enable the 3V power supply		"OK" |  \
-
-| VXPE4 |		P |	E4 |	Enable the 4V power supply		"OK" |  \
-
-| VXPE5 |		P |	E5 |	Enable the 5V power supply		"OK" |  \
-
-| VXPEH |		P |	EH |	Enable the Host power port		"OK" |  \
-
-| VXPQ |		P |	Q |		Power state query		"3V3=x, 4V1=x, 5V0=x, HOST=x" 1=on 0=off |  \
-
-| VXW |			W |			Wake | up event query		  \
-
-| VXQ |			Q |			Whole | system status query		All other query results rolled into one |  \
-
-| VXTD |		T |	D |		disable wakeup timers 		  \
-
-| VXTWxxxxx |	T |			Wxxxxx |	Wakeup timer set for xxxxx seconds from now		 |  \
-
-| VXR |			R |			V2X | board reset		  \
-
-| VXS |			S |			SIMCARD | check		"SIMCARD=x" 1=in 0=out |  \
-
-
+> TODO: Include V2X command set
+
+|  Command     | Submodule | Action | Description                    |
+|--------------|-----------|--------|--------------------------------|
+| VXAD         | A         |  D     | Disable the accelerometer   
+| VXAE         | A         |  E     | Enable the accelerometer    
+| VXAI         | A         |  I     | Accelerometer device information
+| VXAQ         | A         |  Q     | Accelerometer state query   
+| VXAR         | A         |  R     | Restart the Accelerometer   
+| VXASxxx      | A         | Sxxxx  | Change the sample rate to xxx   1,3,6,12,25,50,100,200,400,800,1600,3200
+| VXAXxxx      | A         | Xxxxx  | Accelerometer X axis offset (zero)  -127 to 127 Number confirmed    
+| VXAYxxx      | A         | Yxxxx  | Accelerometer Y axis offset (zero)  -127 to 127 Number confirmed    
+| VXAZxxx      | A         | Zxxxx  | Accelerometer Z axis offset (zero)  -127 to 127 Number confirmed    
+| VXAG         | A         |  G     | Get single Accelerometer sample 
+| VXARxx       | A         | Rxx    | Set G-range 
+| VXCD         | C         |  D     | Disable the CAN interface   
+| VXCE         | C         |  E     | Enable the CAN interface    
+| VXCI         | C         |  I     | CANbus device information   
+| VXCQ         | C         |  Q     | CAN state information 
+| VXCR         | C         |  R     | Restart the CAN 
+| VXI          | I         |        | V2X   Device Information 
+| VXMD         | M         |  D     | Disable the Modem   
+| VXME         | M         |  E     | Enable the Modem    
+| VXMI         | M         |  I     | Modem device information  
+| VXMQ         | M         |  Q     | Modem state query   
+| VXMR         | M         |  R     | Rerestart the Modem 
+| VXPD3        | P         | D3     | Disable the 3V power supply
+| VXPD4        | P         | D4     | Disable the 4V power supply
+| VXPD5        | P         | D5     | Disable the 5V power supply
+| VXPDH        | P         | DH     | Disable the Host power port
+| VXPDDx       | P         | DDx    | Disable host with delay x: seconds
+| VXPE3        | P         | E3     | Enable the 3V power supply 
+| VXPE4        | P         | E4     | Enable the 4V power supply 
+| VXPE5        | P         | E5     | Enable the 5V power supply 
+| VXPEH        | P         | EH     | Enable the Host power port 
+| VXPQ         | P         | Q      | Power state query       "3V3=x, 4V1=x, 5V0=x, HOST=x" 1=on 0=off    
+| VXW          | W         |        | Wake   up event query         
+| VXQ          | Q         |        | Whole   system status query     All other query results rolled into one    
+| VXTD         | T         |    D   | disable wakeup timers         
+| VXTWxxxx     | x         |        | Wxxxxx      Wakeup timer set for xxxxx seconds from now         
+| VXR          | R         |        | V2X   board reset         
+| VXS          | S         |        | SIMCARD   check     "SIMCARD=x" 1=in 0=out    
 
 ## Firmware upgrade <a name="firmware-upgrade"></a>
 
 > TODO: section should describe firmware, locations, etc, as well as tools.
 
-The V2X firmware is in ongoing development. Unfortunately there is no easy way
+The V2X firmware is in ongoing development. Unfortunately there is no easy (or remote) way
 to upgrade the firmware; instead development tools are required.
 
 Using a hardware programmer and a software utility, the V2X device can be
 flashed with new firmware.
 
+> Recent firmware releases should be available on the repo.
+
+> TODO: Make releases available and link to them here.
+
+If you wish to compile an image from source, firmware image should be compiled into a *.hex* format. 
+The AVR toolchain is available for
+[Linux](http://www.atmel.com/toolsATMELAVRTOOLCHAINFORLINUX.aspx),
+[Windows](http://www.atmel.com/tools/atmelavrtoolchainforwindows.aspx),
+and comes bundled in 
+[Atmel Studio](http://www.atmel.com/microsite/atmel-studio/). 
+
 ### Tools required <a name="firmware-tools-required"></a>
 
 #### Programmer/Debugger
@@ -366,7 +340,7 @@ Dragon is one such device.
 
 [AVR Dragon product page](http://www.atmel.com/tools/avrdragon.aspx)
 
->TODO: AVR Dragon or compatible debugging board
+> TODO: AVR Dragon or compatible debugging board
 
 ### Programmer Connection to the V2X Board
 

From 9db3453d8a94f41b168b1545aaeaf6582f8b6e5d Mon Sep 17 00:00:00 2001
From: Tatiana Jamison <tjamison@jaguarlandrover.com>
Date: Fri, 26 May 2017 14:18:01 -0700
Subject: [PATCH 71/83] Explain GPS and RVI indicators

Signed-off-by: Tatiana Jamison <tjamison@jaguarlandrover.com>
---
 field-support-manual.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/field-support-manual.md b/field-support-manual.md
index 504a45f..a7b0140 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -150,6 +150,18 @@ ejected partially from the slot.
 When the host comes on line and connects to the V2X, the lights (red, blue,
 green) on board should be visible.
 
+In addition, the color of  the time and date lines under the GENIVI logo
+indicate the status of GPS and RVI, respectively.
+
+When GPS is active, the text displaying the time will be white. If the time is
+displayed in pink text, GPS is in an error status. Check the connection or move
+the vehicle to a location with a clear view of the sky.
+
+When RVI is active, the date will be displayed in white text. If the date text
+is pink, check that the SIM card is properly installed and activated. If the
+date text is blue, contact [TBD] to verify that the RVI server is up and
+running.
+
 ### Power requirements <a name="power-requirements"></a>
 
 V2X requires constant 12v power supply to sustain operation. Very informal

From 75041f9dc6735da7431eda2f13ce95d59cda350d Mon Sep 17 00:00:00 2001
From: Tatiana Jamison <tjamison@jaguarlandrover.com>
Date: Fri, 26 May 2017 14:25:30 -0700
Subject: [PATCH 72/83] Clarify that powering off V2X also powers off host

Signed-off-by: Tatiana Jamison <tjamison@jaguarlandrover.com>
---
 field-support-manual.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/field-support-manual.md b/field-support-manual.md
index 504a45f..583622e 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -160,8 +160,8 @@ computer connected. When V2X is supplying power to a host such as a Raspberry Pi
 > #### Battery warning <a name="battery-warning"></a>
 >As noted above, the V2X firmware does not yet support low power / standby
 state. If left powered when vehicle is off, the vehicle battery could be drained
-significantly. Please power off the V2X (and host computer) when disengaging the
-vehicle.
+significantly. Please power off the V2X when disengaging the vehicle. Note that
+powering off the V2X will also power off the host computer.
 
 ### Nominal light states <a name="nominal-light-states"></a>
 

From 1eafc240352658f36b369a52c57a063128ca3943 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 26 May 2017 14:56:49 -0700
Subject: [PATCH 73/83] Table of contents links and port descriptions

---
 field-support-manual.md | 86 ++++++++++++++++++++++++++++++-----------
 1 file changed, 64 insertions(+), 22 deletions(-)

diff --git a/field-support-manual.md b/field-support-manual.md
index f4e2473..9c4f901 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -40,16 +40,23 @@ GENIVI Smart-Cities project.
         * [Button failure or fallback procedure](#button-failure)
     * [When all else fails](#when-fails)
     * [Command options for power off (see also command set)](#command-power-off)
-* [Runtime operation](#runtime-operation)
-    * [Vehicle safety notice](#vehicle-safety-notice)
+* [V2X Interface and Control](#runtime-operation)
+    * [Communication Ports](#communication-ports)
+        * [Linux](#communication-ports-linux)
+        * [Windows](#communication-ports-windows)
     * [Smart-cities interaction](#smart-cities-interaction)
     * [Cellular](#cellular-operations)
     * [Verification](#verification)
     * [Toubleshooting](#troubleshooting)
 * [V2X Command set](#v2x-command-set)
 * [Firmware upgrade](#firmware-upgrade)
-    - [Tools required](#firmware-tools-required)
-    - [Procedure](#firmware-procedure)
+    * [Tools required](#firmware-tools-required)
+        * [Programmer/Debugger](#tools-programmer)
+    * [Programmer Connection](#programmer-connection)
+        * [Example: AVR Dragon](#programmer-connection-dragon)
+    * [Procedure](#firmware-procedure)
+        * [Atmel Studio](#firmware-atmel-studio)
+        * [AVRDUDE](#firmware-avrdude)
 
 ## V2X Board Description <a name="v2x-board-description"></a>
 
@@ -86,6 +93,17 @@ GPS and cellular network connections require a combination GPS/GSM 3g antenna.
 
 Celllar network connectivity requires a properly provisioned SIM card.
 
+
+## Requirements for Smart Cities <a name="requirements-smart-cities"></a>
+
+### Host Computer <a name="requirements-host-computer"></a>
+
+#### Raspberry Pi <a name="requirements-raspberry-pi"></a>
+
+#### GENIVI Yocto image <a name="requirements-yocto"></a>
+
+#### Smart Cities application <a name="requirements-smart-cities-application"></a>
+
 ## Hardware setup <a name="hardware-setup"></a>
 
 > TODO: links to external hardware required
@@ -233,7 +251,7 @@ for power state manipulation.
 The Smart Cities application should initialize automatically after host system
 start.
 
-## V2X Interface and Control<a name="runtime-operation"></a>
+## V2X Interface and Control <a name="runtime-operation"></a>
 
 > TODO: com/serial port description
 
@@ -241,10 +259,7 @@ A host computer can communicate with the components on board the device, via the
 virtual ports mounted over USB. The exact arrangement and details of these ports
 depend on the operating system of the host computer.
 
-### Micro controller / command port
-
-
-### Communication ports 
+### Communication ports <a name="communication-ports"></a> 
 
 > Depending on operating system, arrangement of the virtual ports is at the
 > mercy of whatever order they are mounted in. This means that the serial port
@@ -252,6 +267,8 @@ depend on the operating system of the host computer.
 > host computer to use a rules system (like `udev` in Linux) to map consistent
 > port aliases.
 
+#### Linux <a name="communication-ports-linux"></a> 
+
 The common port mounting arrangement observed in Linux:
 
 * `/dev/ttyACM0` -> STN110/ELM327 CAN chip
@@ -263,6 +280,27 @@ The common port mounting arrangement observed in Linux:
   internet connection)
 * `/dev/ttyUSB3` -> SIMCOM AT control (AT command set)
 
+#### Windows <a name="communication-ports-windows"></a>
+
+On Windows, the arrangement is slightly less intuitive, and the ports require a driver to be installed. The requisite files, *atmel_devices_cdc.cat* and *atmel_devices_cdc.inf* are available in the Atmel Software Framework, 
+[on Atmel's site](http://www.atmel.com/tools/avrsoftwareframework.aspx),
+[Microchip](http://www.atmel.com/tools/avrsoftwareframework.aspx),
+or bundled with Atmel Studio.
+
+Communication with the SIMCOM chip requires drivers appropriate to the operating system version. Repository is available [here](http://simcom.ee/documents/?dir=SIM5320).
+
+Common port mounting arrangement observed in Windows (designated by name, as COM<x> is determined at runtime:
+
+* `Ports (COM & LPT)`
+* ->`Communication Device Class ASF example3, COM1` -> STN110/ELM327 CAN chip
+* ->`Communication Device Class ASF example3, COM2` -> V2X control port (VX command set)
+* ->`Communication Device Class ASF example3, COM3` -> Accelerometer data stream (and secret reset back channel)
+* ->`Qualcomm HS-USB Diagnostics 9000` -> SIMCOM diagnostic port (unused)
+* ->`Qualcomm HS-USB NMEA 9000` -> GPS stream
+* ->`Sim Tech HS-USB AT Port 9000` -> SIMCOM AT control (AT command set)
+* `Modems`
+* ->`Qualcomm HS-USB Modem 9000` -> GSM modem AT command port (PPP dialer should use this for
+
 ### Verification <a name="verification"></a>
 ### Toubleshooting <a name="troubleshooting"></a>
 ## V2X Command set <a name="v2x-command-set"></a>
@@ -314,8 +352,8 @@ The common port mounting arrangement observed in Linux:
 
 > TODO: section should describe firmware, locations, etc, as well as tools.
 
-The V2X firmware is in ongoing development. Unfortunately there is no easy (or remote) way
-to upgrade the firmware; instead development tools are required.
+The V2X firmware is in ongoing development. Unfortunately there is no easy (or
+remote) way to upgrade the firmware; instead development tools are required.
 
 Using a hardware programmer and a software utility, the V2X device can be
 flashed with new firmware.
@@ -324,16 +362,15 @@ flashed with new firmware.
 
 > TODO: Make releases available and link to them here.
 
-If you wish to compile an image from source, firmware image should be compiled into a *.hex* format. 
-The AVR toolchain is available for
+If you wish to compile an image from source, firmware image should be compiled
+into a *.hex* format. The AVR toolchain is available for
 [Linux](http://www.atmel.com/toolsATMELAVRTOOLCHAINFORLINUX.aspx),
-[Windows](http://www.atmel.com/tools/atmelavrtoolchainforwindows.aspx),
-and comes bundled in 
-[Atmel Studio](http://www.atmel.com/microsite/atmel-studio/). 
+[Windows](http://www.atmel.com/tools/atmelavrtoolchainforwindows.aspx), and
+comes bundled in [Atmel Studio](http://www.atmel.com/microsite/atmel-studio/).
 
 ### Tools required <a name="firmware-tools-required"></a>
 
-#### Programmer/Debugger
+#### Programmer/Debugger <a name="tools-programmer"></a>
 
 A plethora of hardware programming/debugger solutions are available. The AVR
 Dragon is one such device.
@@ -342,9 +379,9 @@ Dragon is one such device.
 
 > TODO: AVR Dragon or compatible debugging board
 
-### Programmer Connection to the V2X Board
+### Programmer Connection to the V2X Board <a name="programmer-connection"></a>
 
-#### Example: AVR Dragon
+#### Example: AVR Dragon <a name="programmer-connection-dragon"></a>
 
 * Connect one end of the programming ribbon cable to the Dragon board on the set
   of pins marked *1 ISP 5*. Ensure that the red stripe on the ribbon is aligned
@@ -361,7 +398,12 @@ voltage should read **3.2v**.
 
 ### Firmware Upgrade Procedure <a name="firmware-procedure"></a>
 
-#### Atmel Studio
+> During the flashing process, power must be maintained to the board. A constant
+> 12v power supply is required. In the current hardware revision, the 4v rail
+> must be held high by pressing and holding the button prior to and during the
+> flashing process.
+
+#### Atmel Studio <a name="firmware-atmel-studio"></a>
 
 > A full reiteration of the programming instructions for the board are currently
 > out of scope of this document.
@@ -372,7 +414,7 @@ files onto the board.
 [Atmel Studio Programming Dialog
 documentation](http://www.atmel.com/webdoc/atmelstudio/atmelstudio.AVRStudio.ProgrammingDialog.Introduction.html)
 
-#### AVRDUDE
+#### AVRDUDE <a name="firmware-avrdude"></a>
 
 AVRDude is a cross platform (Linux/Windows) programming software utility.
 
@@ -386,7 +428,7 @@ Ultimately, the usage will boil down to something like this:
 ```
 avrdude -p x128a4u -c <programmer-id> -e -U flash:w:<file-name>.hex
 ```
-## Links and Resources
+## Links and Resources <a name="links-resources"></a>
 
 
 

From 3583e52c9f1683e432b0e24ea7d0b0060aefc097 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 26 May 2017 15:08:32 -0700
Subject: [PATCH 74/83] Adjust location of smart cities run time information

Placed after leds, as this is a section that calls out runtime status.
---
 field-support-manual.md | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/field-support-manual.md b/field-support-manual.md
index 181b8dd..576aa30 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -168,18 +168,6 @@ ejected partially from the slot.
 When the host comes on line and connects to the V2X, the lights (red, blue,
 green) on board should be visible.
 
-In addition, the color of  the time and date lines under the GENIVI logo
-indicate the status of GPS and RVI, respectively.
-
-When GPS is active, the text displaying the time will be white. If the time is
-displayed in pink text, GPS is in an error status. Check the connection or move
-the vehicle to a location with a clear view of the sky.
-
-When RVI is active, the date will be displayed in white text. If the date text
-is pink, check that the SIM card is properly installed and activated. If the
-date text is blue, contact [TBD] to verify that the RVI server is up and
-running.
-
 ### Power requirements <a name="power-requirements"></a>
 
 V2X requires constant 12v power supply to sustain operation. Very informal
@@ -222,6 +210,20 @@ issue.
 
 If the lights are not visible, this should indicate the device is not powered.
 
+### Smart Cities Application
+
+In addition, the color of the time and date lines under the GENIVI logo
+indicate the status of GPS and RVI, respectively.
+
+When GPS is active, the text displaying the time will be white. If the time is
+displayed in pink text, GPS is in an error status. Check the connection or move
+the vehicle to a location with a clear view of the sky.
+
+When RVI is active, the date will be displayed in white text. If the date text
+is pink, check that the SIM card is properly installed and activated. If the
+date text is blue, contact [TBD] to verify that the RVI server is up and
+running.
+
 ## Shutdown procedure <a name="shutdown-procedure"></a>
 
 Shutdown is currently handled by cutting power to systems; there are multiple

From 88ce216fa5e605f32ac71571259140ec82c64d70 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 26 May 2017 15:35:32 -0700
Subject: [PATCH 75/83] Formatting

---
 field-support-manual.md | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/field-support-manual.md b/field-support-manual.md
index 576aa30..e40e61b 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -212,8 +212,8 @@ If the lights are not visible, this should indicate the device is not powered.
 
 ### Smart Cities Application
 
-In addition, the color of the time and date lines under the GENIVI logo
-indicate the status of GPS and RVI, respectively.
+In addition, the color of the time and date lines under the GENIVI logo indicate
+the status of GPS and RVI, respectively.
 
 When GPS is active, the text displaying the time will be white. If the time is
 displayed in pink text, GPS is in an error status. Check the connection or move
@@ -296,24 +296,32 @@ The common port mounting arrangement observed in Linux:
 
 #### Windows <a name="communication-ports-windows"></a>
 
-On Windows, the arrangement is slightly less intuitive, and the ports require a driver to be installed. The requisite files, *atmel_devices_cdc.cat* and *atmel_devices_cdc.inf* are available in the Atmel Software Framework, 
-[on Atmel's site](http://www.atmel.com/tools/avrsoftwareframework.aspx),
-[Microchip](http://www.atmel.com/tools/avrsoftwareframework.aspx),
-or bundled with Atmel Studio.
+On Windows, the arrangement is slightly less intuitive, and the ports require a
+driver to be installed. The requisite files, *atmel_devices_cdc.cat* and
+*atmel_devices_cdc.inf* are available in the Atmel Software Framework, [on
+Atmel's site](http://www.atmel.com/tools/avrsoftwareframework.aspx),
+[Microchip](http://www.atmel.com/tools/avrsoftwareframework.aspx), or bundled
+with Atmel Studio.
 
-Communication with the SIMCOM chip requires drivers appropriate to the operating system version. Repository is available [here](http://simcom.ee/documents/?dir=SIM5320).
+Communication with the SIMCOM chip requires drivers appropriate to the operating
+system version. Repository is available
+[here](http://simcom.ee/documents/?dir=SIM5320).
 
-Common port mounting arrangement observed in Windows (designated by name, as COM<x> is determined at runtime:
+Common port mounting arrangement observed in Windows (designated by name, as
+COM<x> is determined at runtime:
 
 * `Ports (COM & LPT)`
 * ->`Communication Device Class ASF example3, COM1` -> STN110/ELM327 CAN chip
-* ->`Communication Device Class ASF example3, COM2` -> V2X control port (VX command set)
-* ->`Communication Device Class ASF example3, COM3` -> Accelerometer data stream (and secret reset back channel)
+* ->`Communication Device Class ASF example3, COM2` -> V2X control port (VX
+  command set)
+* ->`Communication Device Class ASF example3, COM3` -> Accelerometer data stream
+  (and secret reset back channel)
 * ->`Qualcomm HS-USB Diagnostics 9000` -> SIMCOM diagnostic port (unused)
 * ->`Qualcomm HS-USB NMEA 9000` -> GPS stream
 * ->`Sim Tech HS-USB AT Port 9000` -> SIMCOM AT control (AT command set)
 * `Modems`
-* ->`Qualcomm HS-USB Modem 9000` -> GSM modem AT command port (PPP dialer should use this for
+* ->`Qualcomm HS-USB Modem 9000` -> GSM modem AT command port (PPP dialer should
+  use this for
 
 ### Verification <a name="verification"></a>
 ### Toubleshooting <a name="troubleshooting"></a>

From c2c8209147e3e1683cef4aa5df0577d6400d4a91 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Fri, 26 May 2017 15:50:57 -0700
Subject: [PATCH 76/83] Formatting

---
 field-support-manual.md | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/field-support-manual.md b/field-support-manual.md
index 18d35f9..1247c95 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -452,18 +452,14 @@ avrdude -p x128a4u -c <programmer-id> -e -U flash:w:<file-name>.hex
 ```
 ## Links and Resources <a name="links-resources"></a>
 
-
-
-[v2x-board-connected-top]: [v2x-board-connected-under]:
-[v2x-connections-facing]: [v2x-dragon-v2x-connected]:
-[v2x-dragon-v2x-connected-detail]: [v2x-lights-on]:
-[v2x-sim-card-alignment-under]: [v2x-sim-card-ejected]: [v2x-obd-connection]:
-[v2x-mounted-enclosure]:
-
 ## FAQ
 
-*Q*: Why does the OBU occasionally take longer to boot or appear to reboot several times when starting up
+**Q**: Why does the OBU occasionally take longer to boot or appear to reboot
+several times when starting up
 
-*A*: There is an issue with the graphics compositor in the GENIVI Development Platform and it occasionally does not load properly. Normally, this would cause a command line to appear instead of the GUI. We have created a workaround to detect this condition and reload the compositor.  A bug has been logged.
+**A**: There is an issue with the graphics compositor in the GENIVI Development
+Platform and it occasionally does not load properly. Normally, this would cause
+a command line to appear instead of the GUI. We have created a workaround to
+detect this condition and reload the compositor.  A bug has been logged.
 
 

From 24ab775cc4be4195c12e702f939a761eb7f73242 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 30 May 2017 09:49:51 -0700
Subject: [PATCH 77/83] Add disclaimer

---
 field-support-manual.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/field-support-manual.md b/field-support-manual.md
index 1247c95..e5e28dc 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -1,5 +1,7 @@
 # V2X Field Support Documentation
 
+> Work in progress. Some entries may be incomplete or missing.
+
 This documentation is intended to cover common V2X board use cases in the field.
 
 Please note that the documentation will include some information specific to the

From 4713df8c57e02cb14db72ad3e053614e4a8ea1ed Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 30 May 2017 11:06:34 -0700
Subject: [PATCH 78/83] Prepare readme for 0.2 release candidate

Refined format and corrected some typos.
Added relevant links and descriptions.
---
 README.md | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3c746a1..a0cc87b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,49 @@
 # rvi_v2x_firmware
-This repo contains the Firmware design files for the JLR OSTC V2X project. Firmware for an open source CAN/OBD2/2G/3G/GPS/Accelerometer with Power sequencing of RaspberryPi 2B host with RVI node installed.
+This repo contains the firmware source and  design files for the JLR OSTC V2X
+project, an open source hardware device equipped with
+* CAN/OBD2 interface
+* 2G/3G/GPS/GSM modem
+* Accelerometer
 
-Tools in use: Atmel Studio 7 - Primary software IDE. Available at http://www.atmel.com/tools/ATMELSTUDIO.aspx AVR Draggon - in-circuit programmer and debugger. Available at http://www.atmel.com/tools/AVRDRAGON.aspx FOXIT - PDF printer and viewer. Available at https://www.foxitsoftware.com/products/pdf-reader/ V2X development Hardware - OSTC prototype device.
+This project, and its associated firmware and hardware, are under ongoing
+development through the joint efforts of
+* [Jaguar Land Rover Open Software Technology Center
+(https://github.com/PDXostc)](https://github.com/PDXostc) and the
+* [GENIVI Alliance (https://github.com/GENIVI)](https://github.com/GENIVI)
 
-Primary Development by Jesse Banks - jbanks2@jaguarlandrover.com Other Contributions from UCSD ECE191 Students Jaguar Land Rover OSTC - Portland, Oregon 2015-2016
\ No newline at end of file
+Hardware repo can be found at
+[https://github.com/PDXostc/rvi_v2x_hardware](https://github.com/PDXostc/rvi_v2x_hardware).
+
+> At the time of writing, current firmware version 0.2 (link to tag here) is 
+> intended to be used with the hardware 2.0 release (link to tag here).
+
+Usage profile suggests pairing with a RaspberryPi host with 
+[RVI node](https://github.com/GENIVI/rvi_lib) 
+installed, for telemetry preprocessing and automated control. Suggested host
+software is located with the 
+[GENIVI Smart Cities pilot project yocto layer](https://github.com/GENIVI/meta-smart-cities-pilot)
+and 
+[GENIVI Smart Cities application](https://github.com/GENIVI/meta-smart-cities-pilot). 
+Use of this software is not required for operation, but can provide a certain 
+reference implementation.
+
+Tips for use in the field can be found in the [Support Manual](field-support-manual.md), 
+located in this repo.
+
+Tools in use:
+* [Atmel Studio 7 - Primary software
+  IDE](http://www.atmel.com/tools/ATMELSTUDIO.aspx)
+* [AVR Dragon - in-circuit programmer and
+  debugger](http://www.atmel.com/tools/avrdragon.aspx)
+* [FOXIT - PDF printer and
+  viewer](https://www.foxitsoftware.com/products/pdf-reader/)
+* [V2X development hardware](https://github.com/PDXostc/rvi_v2x_hardware), OSTC
+  prototype device
+
+Primary Development by Jesse Banks - jbanks2@jaguarlandrover.com.
+
+Other Contributions from UCSD ECE191 Students Jaguar Land Rover OSTC - Portland,
+Oregon 2015-2016.
+
+Current release maintained by Steve Miller - [smiller6 at
+jaguarlandrover.com](smiller6@jaguarlandrover.com)
\ No newline at end of file

From b4f85dd59b6168cca8d21db021675f9497cd0d03 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 30 May 2017 13:21:48 -0700
Subject: [PATCH 79/83] Replace spaces with hyphens

Spaces are bad
---
 V2X project setup.pdf => V2X-project-setup.pdf | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename V2X project setup.pdf => V2X-project-setup.pdf (100%)

diff --git a/V2X project setup.pdf b/V2X-project-setup.pdf
similarity index 100%
rename from V2X project setup.pdf
rename to V2X-project-setup.pdf

From e6a8590c9a226db0677cf1eb7cb9f0135eb08ae0 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Tue, 30 May 2017 13:40:54 -0700
Subject: [PATCH 80/83] Add headings

---
 README.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a0cc87b..3a9e879 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,7 @@
 # rvi_v2x_firmware
+
+## Description
+
 This repo contains the firmware source and  design files for the JLR OSTC V2X
 project, an open source hardware device equipped with
 * CAN/OBD2 interface
@@ -14,8 +17,8 @@ development through the joint efforts of
 Hardware repo can be found at
 [https://github.com/PDXostc/rvi_v2x_hardware](https://github.com/PDXostc/rvi_v2x_hardware).
 
-> At the time of writing, current firmware version 0.2 (link to tag here) is 
-> intended to be used with the hardware 2.0 release (link to tag here).
+> At the time of writing, current [firmware version 0.2](insert-link-here)
+> intended to be used with the [hardware 2.1 release](https://github.com/PDXostc/rvi_v2x_hardware/commit/71e0d74038f05f68dc1f46546d6cc1ff5eac84f3).
 
 Usage profile suggests pairing with a RaspberryPi host with 
 [RVI node](https://github.com/GENIVI/rvi_lib) 
@@ -27,6 +30,12 @@ and
 Use of this software is not required for operation, but can provide a certain 
 reference implementation.
 
+## Installation
+
+Please see the [*V2X-project-setup.pdf*](V2X-project-setup.pdf) for instructions
+on correctly setting up the project in the Atmel environment and with the 
+[Atmel Software Framework](http://www.atmel.com/tools/avrsoftwareframework.aspx).
+
 Tips for use in the field can be found in the [Support Manual](field-support-manual.md), 
 located in this repo.
 
@@ -40,6 +49,8 @@ Tools in use:
 * [V2X development hardware](https://github.com/PDXostc/rvi_v2x_hardware), OSTC
   prototype device
 
+## Contributors
+
 Primary Development by Jesse Banks - jbanks2@jaguarlandrover.com.
 
 Other Contributions from UCSD ECE191 Students Jaguar Land Rover OSTC - Portland,

From d642dd543e031606e86e019f1fabc69480112b13 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Thu, 1 Jun 2017 13:02:31 -0700
Subject: [PATCH 81/83] Correct typos

Correct typos per feedback from rstreif
---
 field-support-manual.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/field-support-manual.md b/field-support-manual.md
index e5e28dc..c2d8b03 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -127,7 +127,7 @@ Need:
 2. Connect GPS/GSM antenna cables.
     > Typical configuration requires attaching
     >* "gold" head to port marked "**GPS Antenna**"
-    >* "silver" head to port marked "**3g Cellula Network Antenna**"
+    >* "silver" head to port marked "**3g Cellular Network Antenna**"
 
     > Incorrectly reversing this connection will inhibit GPS signal, and should
       be one of the first things to check if no GPS signal is observed.
@@ -190,7 +190,7 @@ status.
 
 * Red: SIM card insertion status.
     - Active: SIM card is inserted (properly)
-    - Inactive: SIM card missing or instered improperly
+    - Inactive: SIM card missing or inserted improperly
 
 * Blue: GSM power status.
     - Active: SIMCOM chipset is powered
@@ -205,7 +205,7 @@ to register and attach to the desired network operator.
 
 > Please note: A bug currently exists in the driver that can produce a state
 where the LEDs are not updated with the correct frequency if the host has not
-actively communicated with the host for some time. Until this issue is resolved,
+actively communicated with the board for some time. Until this issue is resolved,
 the host should use a scripted means of occaisionally contacting the V2X control
 port. The distro built for Smart Cities contains a work around service for this
 issue.

From 224410d95e9698b21694f065fa933411213e3702 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Thu, 1 Jun 2017 14:33:23 -0700
Subject: [PATCH 82/83] Add entry for power by bench supply

Description of required pinouts for making a powered cable
for using the board on a bench / test setup.
---
 field-support-manual.md | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/field-support-manual.md b/field-support-manual.md
index c2d8b03..832d705 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -32,6 +32,7 @@ GENIVI Smart-Cities project.
     * [Cable connection](#cable-connection)
     * [Case enclosure and mounting](#case-enclosure-and-mounting)
     * [Sim card insertion instructions](#sim-card-instructions)
+    * [Bench Power Supply](#bench-power-supply)
 * [Startup procedure](#startup-procedure)
     * [Power requirements](#power-requirements)
         * [Battery warning](#battery-warning)
@@ -161,6 +162,43 @@ ejected partially from the slot.
 
 >TODO: Do we need a diagram for this?
 
+### Bench Power Supply <a name="bench-power-supply"></a>
+
+In lieu of an OBD2 connection, the V2X can be powered by any cable that meets the 
+power pinout requirements of the OBD2->DB9 standard.
+
+The V2X requires power through the DB9 connection. For bench testing, we use a
+simple spliced cable, terminated DB9 at the V2X board and using either: positive
+and ground wires running to a bench supply; barrel jack from wall supply. In
+either case please ensure a 12v constant supply.
+
+Our simple cable terminates on the DB9 end with
+* *Power* - pin 9
+* *GND* - pin 3
+
+Note that the above configuration is just a power supply and will of course not 
+support any CAN traffic.
+
+The standard can be found [here](http://affon.narod.ru/CAN/DS102.pdf). For 
+full pinout table see section *6.2.2 Mechanical Parameters*.
+
+**Pinning:**
+
+| Pin | Signal   | Description                        |
+|-----|--------  |-------------                       |
+| 1   | -        | Reserved                           |
+| 2   | CAN_L    | CAN_L bus line (dominant low)      |
+| 3   | CAN_GND  | CAN ground                         |
+| 4   | -        | Reserved                           |
+| 5   | CAN_SHLD | optional CAN shield                |
+| 6   | GND      | optional CAN ground                |
+| 7   | CAN_H    | CAN_H bus line (dominant high)     |
+| 8   | -        | Reserved (error line)              |
+| 9   | CAN_V+   | optional CAN external supply *(1)* |
+
+*(1) Not at all optional, in our bench supply case. 12v goes here.*
+
+
 ## Startup procedure <a name="startup-procedure"></a>
 
 1. Press red button. The driver is configured to bring all components to full

From 0692175db540326989358811eb8fd239d629d9c4 Mon Sep 17 00:00:00 2001
From: Steve Miller <smiller6@jaguarlandrover.com>
Date: Thu, 1 Jun 2017 15:49:06 -0700
Subject: [PATCH 83/83] Correct pinout errors

Previous entry incorrectly referred to the CAN->DB9 instead of ODB2->DB9 pinout.
---
 field-support-manual.md | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/field-support-manual.md b/field-support-manual.md
index 832d705..4491af8 100644
--- a/field-support-manual.md
+++ b/field-support-manual.md
@@ -174,30 +174,26 @@ either case please ensure a 12v constant supply.
 
 Our simple cable terminates on the DB9 end with
 * *Power* - pin 9
-* *GND* - pin 3
+* *GND* - pin 2
 
 Note that the above configuration is just a power supply and will of course not 
 support any CAN traffic.
 
-The standard can be found [here](http://affon.narod.ru/CAN/DS102.pdf). For 
-full pinout table see section *6.2.2 Mechanical Parameters*.
+For full pinout, refer to the table below.
 
 **Pinning:**
 
-| Pin | Signal   | Description                        |
-|-----|--------  |-------------                       |
-| 1   | -        | Reserved                           |
-| 2   | CAN_L    | CAN_L bus line (dominant low)      |
-| 3   | CAN_GND  | CAN ground                         |
-| 4   | -        | Reserved                           |
-| 5   | CAN_SHLD | optional CAN shield                |
-| 6   | GND      | optional CAN ground                |
-| 7   | CAN_H    | CAN_H bus line (dominant high)     |
-| 8   | -        | Reserved (error line)              |
-| 9   | CAN_V+   | optional CAN external supply *(1)* |
-
-*(1) Not at all optional, in our bench supply case. 12v goes here.*
-
+| Pin Description  | OBDII | DB9 |
+|----------------- |-------|-----|
+| J1850 BUS+       | 2     | 7   |
+| Chassis Ground   | 4     | 2   |
+| Signal Ground    | 5     | 1   |
+| CAN High J-2284  | 6     | 3   |
+| ISO 9141-2 K Line| 7     | 4   |
+| J1850 BUS-       | 10    | 6   |
+| CAN Low J-2284   | 14    | 5   |
+| ISO 9141-2 L Line| 15    | 8   |
+| Battery Power    | 16    | 9   |
 
 ## Startup procedure <a name="startup-procedure"></a>