split target 'avr' to 'atmega' and 'atxmega' because there are to man…

…y differences and it is easier to maintain that way. Introduced a way to generate the uart defintion files from a template.
roboterclubaachen · Nov 8, 2009 · e239176 · e239176
1 parent 2ea1f2b
commit e239176
Show file tree

Hide file tree

Showing 47 changed files with 1,301 additions and 585 deletions.
diff --git a/SConstruct b/SConstruct
@@ -54,7 +54,7 @@ parser = PropertyParser(GetOption('properties'), target, verbose)
 # create a build-environment for the specific target
 
 build = parser.getGlobalProperties()
-if build.target == 'avr':
+if build.target == 'atmega' or build.target == 'atxmega':
 	env = Environment(
 			ARCHITECTURE = 'avr',
 			AVRDUDE = build.avr.avrdude,

diff --git a/misc/python/scons/build_properties.py b/misc/python/scons/build_properties.py
@@ -32,8 +32,10 @@ def __init__(self, properties, target=None):
 			target = properties.get('target', 'pc')
 		self.target = target
 
-		if self.target == 'avr':
+		if self.target == 'atmega':
-			self.avr = self.AvrProperties(properties.get('avr', {}))
+			self.avr = self.AvrProperties(properties.get('atmega', {}))
+		elif self.target == 'atxmega':
+			self.avr = self.AvrProperties(properties.get('atxmega', {}))
 
 	def getLocalProperties(self, path, target, tag):
 		try:

diff --git a/properties.yaml b/properties.yaml
@@ -1,15 +1,19 @@
 
-#target: avr
+#target: atmega
+#target: atxmega
 target: pc
 
-avr:
+atmega:
-#  device: atmega2560
+  device: atmega2560
+  clock: 14745600
+  avrdude:
+    programmer: stk500
+    port: /dev/ttyUSB0
+
+atxmega:
   device: atxmega128a1
   clock: 32000000
-#  clock: 14745600
   avrdude:
-#    programmer: stk500
-#    port: /dev/ttyUSB0
     programmer: avrispmkII
     port: usb
 
@@ -37,5 +41,3 @@ library:
 tests:
   include: no
 
-unittest:
-
diff --git a/src/xpcc/hal/avr/properties.yaml b/src/xpcc/hal/avr/properties.yaml
diff --git a/src/xpcc/hal/avr/uart/uart0_put.cpp b/src/xpcc/hal/avr/uart/uart0_put.cpp
diff --git a/src/xpcc/hal/avr/uart/uart1.cpp b/src/xpcc/hal/avr/uart/uart1.cpp
diff --git a/src/xpcc/hal/avr/uart/uart1_put.cpp b/src/xpcc/hal/avr/uart/uart1_put.cpp
diff --git a/src/xpcc/hal/avr/uart/uart2.cpp b/src/xpcc/hal/avr/uart/uart2.cpp
diff --git a/src/xpcc/hal/avr/uart/uart2_put.cpp b/src/xpcc/hal/avr/uart/uart2_put.cpp