Mercurial > louis > kiibohd-controller

changeset 68:2c0c2fbd76c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updating Debug Modules to new abstracted hierarchy - Also added some extra CMake build messages for indicating the Compiler family and chip being built for
author Jacob Alexander <triplehaata@gmail.com>
date Sat, 26 Jan 2013 15:43:59 -0500
parents 9ad7c1a28661
children 87658fa6091b
files CMakeLists.txt Debug/led/led.c Debug/led/led.h Debug/print/print.h arm.cmake avr.cmake
diffstat 6 files changed, 52 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Sat Jan 26 15:05:28 2013 -0500
+++ b/CMakeLists.txt	Sat Jan 26 15:43:59 2013 -0500
@@ -30,6 +30,9 @@
 #set( COMPILER_FAMILY "arm" )
 set( COMPILER_FAMILY "avr" )
 
+message( STATUS "Compiler Family:" )
+message( "${COMPILER_FAMILY}" )
+
 
 
 #| Load the compiler family specific configurations
--- a/Debug/led/led.c	Sat Jan 26 15:05:28 2013 -0500
+++ b/Debug/led/led.c	Sat Jan 26 15:43:59 2013 -0500
@@ -21,7 +21,9 @@
 
 // ----- Includes -----
 
-// AVR Includes
+// Compiler Includes
+#include <Lib/MainLib.h>
+
 
 // Project Includes
 #include "led.h"
@@ -33,13 +35,29 @@
 // Error LED Setup
 inline void init_errorLED()
 {
+// AVR
+#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
+
 	// Use pin D6 as an output (LED)
 	DDRD |= (1<<6);
+
+// ARM
+#elif defined(_mk20dx128_)
+
+	// Setup pin - Pin 11 -> C5 - See Lib/pin_map.teensy3 for more details on pins
+	PORTC_PCR5 = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(1);
+	// Enable pin
+	GPIO_BITBAND_MODREG( GPIOC_PDOR, 5 ) = 1;
+
+#endif
 }
 
 // Error LED Control
 inline void errorLED( uint8_t on )
 {
+// AVR
+#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
+
 	// Error LED On (D6)
 	if ( on ) {
 		PORTD |= (1<<6);
@@ -48,5 +66,19 @@
 	else {
 		PORTD &= ~(1<<6);
 	}
+
+// ARM
+#elif defined(_mk20dx128_)
+
+	// Error LED On (C5)
+	if ( on ) {
+		GPIOC_PSOR |= (1<<5);
+	}
+	// Error LED Off
+	else {
+		GPIOC_PCOR |= (1<<5);
+	}
+
+#endif
 }
 
--- a/Debug/led/led.h	Sat Jan 26 15:05:28 2013 -0500
+++ b/Debug/led/led.h	Sat Jan 26 15:43:59 2013 -0500
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 by Jacob Alexander
+/* Copyright (C) 2011-2013 by Jacob Alexander
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,9 +24,6 @@
 
 // ----- Includes -----
 
-// AVR Includes
-#include <avr/io.h>
-
 
 
 // ----- Functions -----
--- a/Debug/print/print.h	Sat Jan 26 15:05:28 2013 -0500
+++ b/Debug/print/print.h	Sat Jan 26 15:43:59 2013 -0500
@@ -24,14 +24,16 @@
 
 // ----- Includes -----
 
-// AVR Includes
-#include <avr/pgmspace.h>
+// Compiler Includes
+#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
 
-// USB Includes
-#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
+#include <avr/pgmspace.h>
 #include "avr/usb_keyboard_debug.h"
+
 #elif defined(_mk20dx128_)
+
 #include "arm/usb_keyboard.h"
+
 #endif
 
 
--- a/arm.cmake	Sat Jan 26 15:05:28 2013 -0500
+++ b/arm.cmake	Sat Jan 26 15:43:59 2013 -0500
@@ -36,6 +36,9 @@
 #| "mk20dx128"        # Teensy   3.0
 set( CHIP "mk20dx128" )
 
+message( STATUS "Chip Selected:" )
+message( "${CHIP}" )
+
 
 #| CPU Type
 #| You _MUST_ set this to match the board you are using
@@ -44,6 +47,9 @@
 #| "cortex-m4"        # Teensy   3.0
 set( CPU "cortex-m4" )
 
+message( STATUS "CPU Selected:" )
+message( "${CPU}" )
+
 
 #| Extra Compiler Sources
 #| Mostly for convenience functions like interrupt handlers
--- a/avr.cmake	Sat Jan 26 15:05:28 2013 -0500
+++ b/avr.cmake	Sat Jan 26 15:43:59 2013 -0500
@@ -40,6 +40,9 @@
 #set( MCU "atmega32u4" )
 set( MCU "at90usb1286" )
 
+message( STATUS "MCU Selected:" )
+message( "${MCU}" )
+
 
 #| Extra Compiler Sources
 #| Mostly for convenience functions like interrupt handlers