typo fix, moar mappings

HelsinkiHacklab · Feb 3, 2013 · a56fe44 · a56fe44
1 parent 336cd47
commit a56fe44
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 31 deletions.
diff --git a/software/arduino-xmega/add_to_boards.txt b/software/arduino-xmega/add_to_boards.txt
@@ -2,21 +2,21 @@
 # http://kirjoitusalusta.fi/hacklab-xmega
 #
 
-hhl_xmega32_v1.name=HHL Xmega32 rev 1 (PDI)
+hhl_xmega32_v1_pdi_nortc.name=HHL Xmega32 rev 1 (PDI, NORTC)
 
-hhl_xmega32_v1.build.mcu=atxmega32a4
-hhl_xmega32_v1.build.f_cpu=32000000L
-hhl_xmega32_v1.build.core=xmega
-hhl_xmega32_v1.build.variant=hhl_xmega32_v1
+hhl_xmega32_v1_pdi_nortc.build.mcu=atxmega32a4
+hhl_xmega32_v1_pdi_nortc.build.f_cpu=32000000L
+hhl_xmega32_v1_pdi_nortc.build.core=xmega
+hhl_xmega32_v1_pdi_nortc.build.variant=hhl_xmega32_v1_pdi_nortc
 
-xplain_pdi.upload.using=avrisppdi
-hhl_xmega32_v1.upload.maximum_size=32768
+hhl_xmega32_v1_pdi_nortc.upload.using=avrisppdi
+hhl_xmega32_v1_pdi_nortc.upload.maximum_size=32768
 
-#hhl_xmega32_v1.bootloader.path=hhl_xmega32_v1
-#hhl_xmega32_v1.bootloader.file=hhl_xmega32_v1-boot.hex
+#hhl_xmega32_v1_pdi_nortc.bootloader.path=hhl_xmega32_v1_pdi_nortc
+#hhl_xmega32_v1_pdi_nortc.bootloader.file=hhl_xmega32_v1_pdi_nortc-boot.hex
 
-hhl_xmega32_v1.bootloader.fuse1=0x00
-hhl_xmega32_v1.bootloader.fuse2=0x9F
-hhl_xmega32_v1.bootloader.fuse4=0xFF
-hhl_xmega32_v1.bootloader.fuse5=0xF0
+hhl_xmega32_v1_pdi_nortc.bootloader.fuse1=0x00
+hhl_xmega32_v1_pdi_nortc.bootloader.fuse2=0x9F
+hhl_xmega32_v1_pdi_nortc.bootloader.fuse4=0xFF
+hhl_xmega32_v1_pdi_nortc.bootloader.fuse5=0xF0
 
diff --git a/software/arduino-xmega/variants/hhl_xmega32_v1/pins_arduino.h b/software/arduino-xmega/variants/hhl_xmega32_v1/pins_arduino.h
@@ -190,10 +190,13 @@ const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = {
 		_BV( 5 ),
 };
 
-// TODO: Map correctly
 const uint8_t PROGMEM digital_pin_to_timer_PGM[] = {
 	// TIMERS		
 	// -------------------------------------------		
+	TIMER_E0A   	, 
+	TIMER_E0B   	, 
+	TIMER_E0C   	, 
+	TIMER_E0D   	,   // 5
 	NOT_ON_TIMER	, 
 	NOT_ON_TIMER	, 
 	NOT_ON_TIMER	, 
@@ -202,28 +205,24 @@ const uint8_t PROGMEM digital_pin_to_timer_PGM[] = {
 	NOT_ON_TIMER	, 
 	NOT_ON_TIMER	, 
 	NOT_ON_TIMER	, 
+	NOT_ON_TIMER	, // 13
 	NOT_ON_TIMER	, 
 	NOT_ON_TIMER	, 
 	NOT_ON_TIMER	, 
+	TIMER_C0A   	,  // 17 
+	TIMER_C0B   	, 
+	TIMER_C0C   	, 
+	TIMER_C0D   	, 
+	TIMER_C1A   	, 
+	TIMER_C1B   	, 
 	NOT_ON_TIMER	, 
 	NOT_ON_TIMER	, 
-	NOT_ON_TIMER	, 
-	NOT_ON_TIMER	, 
-	NOT_ON_TIMER	, 
-	NOT_ON_TIMER	, 
-	NOT_ON_TIMER	, 
-	NOT_ON_TIMER	, 
-	NOT_ON_TIMER	, 
-	NOT_ON_TIMER	, 
-	NOT_ON_TIMER	, 
-	NOT_ON_TIMER	, 
-	NOT_ON_TIMER	, 
-	NOT_ON_TIMER	, 
-	NOT_ON_TIMER	, 
-	NOT_ON_TIMER	, 
-	NOT_ON_TIMER	, 
-	NOT_ON_TIMER	, 
-	NOT_ON_TIMER	, 
+	TIMER_D0A       ,  // 25
+	TIMER_D0B       , 
+	TIMER_D0C       , 
+	TIMER_D0D       , 
+	TIMER_D1A       , 
+	TIMER_D1B       , 
 };
 
 // TODO: Map correctly