Permalink
Browse files

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.
  • Loading branch information...
dergraaf committed Nov 8, 2009
1 parent 2ea1f2b commit e239176972d7a663dfc6b9aa17e42eb256b7968a
Showing with 1,301 additions and 585 deletions.
  1. +1 −1 SConstruct
  2. +4 −2 misc/python/scons/build_properties.py
  3. +10 −8 properties.yaml
  4. +0 −3 src/xpcc/hal/avr/properties.yaml
  5. +0 −50 src/xpcc/hal/avr/uart/uart0_put.cpp
  6. +0 −75 src/xpcc/hal/avr/uart/uart1.cpp
  7. +0 −48 src/xpcc/hal/avr/uart/uart1_put.cpp
  8. +0 −75 src/xpcc/hal/avr/uart/uart2.cpp
  9. +0 −49 src/xpcc/hal/avr/uart/uart2_put.cpp
  10. +0 −75 src/xpcc/hal/avr/uart/uart3.cpp
  11. +0 −48 src/xpcc/hal/avr/uart/uart3_put.cpp
  12. 0 src/xpcc/hal/{avr → peripheral/atmega}/pin.hpp
  13. +3 −0 src/xpcc/hal/peripheral/atmega/properties.yaml
  14. 0 src/xpcc/hal/{avr → peripheral/atmega}/spi/spi.cpp
  15. 0 src/xpcc/hal/{avr → peripheral/atmega}/spi/spi.hpp
  16. +36 −0 src/xpcc/hal/peripheral/atmega/uart/generate.py
  17. 0 src/xpcc/hal/{avr → peripheral/atmega/uart}/uart.hpp
  18. +56 −33 src/xpcc/hal/{avr → peripheral/atmega}/uart/uart0.cpp
  19. +10 −1 src/xpcc/hal/{avr → peripheral/atmega/uart}/uart0.hpp
  20. +83 −0 src/xpcc/hal/peripheral/atmega/uart/uart0_put.cpp
  21. +116 −0 src/xpcc/hal/peripheral/atmega/uart/uart1.cpp
  22. +10 −1 src/xpcc/hal/{avr → peripheral/atmega/uart}/uart1.hpp
  23. +83 −0 src/xpcc/hal/peripheral/atmega/uart/uart1_put.cpp
  24. +116 −0 src/xpcc/hal/peripheral/atmega/uart/uart2.cpp
  25. +10 −1 src/xpcc/hal/{avr → peripheral/atmega/uart}/uart2.hpp
  26. +83 −0 src/xpcc/hal/peripheral/atmega/uart/uart2_put.cpp
  27. +116 −0 src/xpcc/hal/peripheral/atmega/uart/uart3.cpp
  28. +10 −1 src/xpcc/hal/{avr → peripheral/atmega/uart}/uart3.hpp
  29. +83 −0 src/xpcc/hal/peripheral/atmega/uart/uart3_put.cpp
  30. 0 src/xpcc/hal/{avr → peripheral/atmega}/uart/uart_defaults.h
  31. +1 −24 src/xpcc/hal/{avr → peripheral/atmega}/uart/uart_defines.h
  32. +154 −0 src/xpcc/hal/peripheral/atmega/uart/uartn.cpp.tmpl
  33. +72 −0 src/xpcc/hal/peripheral/atmega/uart/uartn.hpp.tmpl
  34. +77 −0 src/xpcc/hal/peripheral/atmega/uart/uartn_put.cpp.tmpl
  35. +3 −0 src/xpcc/hal/peripheral/atxmega/properties.yaml
  36. +11 −0 src/xpcc/hal/peripheral/avr/avr.dox
  37. +8 −7 src/xpcc/hal/{avr/cxxabi → peripheral/avr/cpputils}/cxxabi.cpp
  38. +6 −5 src/xpcc/hal/{avr/cxxabi → peripheral/avr/cpputils}/newdelete.cpp
  39. +103 −0 src/xpcc/hal/peripheral/avr/math/math.hpp
  40. +7 −58 src/xpcc/hal/{avr/math/math.hpp → peripheral/avr/math/math_impl.hpp}
  41. 0 src/xpcc/hal/{ → peripheral}/avr/math/sqrt32_floor.S
  42. 0 src/xpcc/hal/{ → peripheral}/avr/math/sqrt32_round.S
  43. +5 −0 src/xpcc/hal/peripheral/avr/properties.yaml
  44. +5 −5 src/xpcc/hal/{avr/memory/memory_allocation.cpp → peripheral/avr/ram/allocator.cpp}
  45. +15 −12 src/xpcc/hal/{avr/memory/memory_allocation.hpp → peripheral/avr/ram/allocator.hpp}
  46. +4 −2 src/xpcc/math/cartesian_coordinate_impl.hpp
  47. +0 −1 tests/hal/avr/uart_test.cpp
@@ -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,
@@ -32,8 +32,10 @@ def __init__(self, properties, target=None):
target = properties.get('target', 'pc')
self.target = target
if self.target == 'avr':
self.avr = self.AvrProperties(properties.get('avr', {}))
if self.target == 'atmega':
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:
@@ -1,15 +1,19 @@
#target: avr
#target: atmega
#target: atxmega
target: pc
avr:
# device: atmega2560
atmega:
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:

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit e239176

Please sign in to comment.