Commit b0bb4737307960c66cb7226672a9a0a1a2aa6453

Authored by Antonio Carlos Domínguez Brito
1 parent 06494bf6
Exists in master

a small correction in README.md and CMakeList.txt adapted to Arduino DUE standard library 1.6.9

CMakeLists.txt
... ... @@ -14,15 +14,15 @@ project(tc_lib C CXX)
14 14 build_library(
15 15 arduino_due_std_lib
16 16 SRC_PATHS
17   - $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.6/cores/arduino
18   - $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.6/cores/arduino/USB
19   - $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.6/variants/arduino_due_x
20   - $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.6/libraries/SPI
  17 + $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.9/cores/arduino
  18 + $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.9/cores/arduino/USB
  19 + $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.9/variants/arduino_due_x
  20 + $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.9/libraries/SPI
21 21 INCLUDE_PATHS
22   - $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.6/cores/arduino
23   - $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.6/cores/arduino/USB
24   - $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.6/variants/arduino_due_x
25   - $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.6/libraries/SPI
  22 + $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.9/cores/arduino
  23 + $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.9/cores/arduino/USB
  24 + $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.9/variants/arduino_due_x
  25 + $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.9/libraries/SPI
26 26 )
27 27  
28 28 # checking environment variable ARDUINO_IDE_LIBRARY_PATH
... ... @@ -67,7 +67,7 @@ foreach(src_example ${TC_EXAMPLES})
67 67 add_executable(
68 68 ${src_example}.cpp.elf
69 69 ${src_example}.cpp
70   - $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.6/cores/arduino/syscalls_sam3.c
  70 + $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.9/cores/arduino/syscalls_sam3.c
71 71 )
72 72 target_compile_options(
73 73 ${src_example}.cpp.elf PUBLIC
... ... @@ -86,7 +86,7 @@ foreach(src_example ${TC_EXAMPLES})
86 86 )
87 87 target_link_libraries(
88 88 ${src_example}.cpp.elf
89   - -Os -Wl,--gc-sections -mcpu=cortex-m3 -T$ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.6/variants/arduino_due_x/linker_scripts/gcc/flash.ld -Wl,-Map,${src_example}.cpp.map -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group arduino_due_std_lib pwm_lib $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.6/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a -Wl,--end-group -lm
  89 + -Os -Wl,--gc-sections -mcpu=cortex-m3 -T$ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.9/variants/arduino_due_x/linker_scripts/gcc/flash.ld -Wl,-Map,${src_example}.cpp.map -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group arduino_due_std_lib pwm_lib $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.9/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a -Wl,--end-group -lm
90 90 )
91 91  
92 92 # bin
... ...
README.md
... ... @@ -114,7 +114,7 @@ On the examples directory you have available a basic example for using a capture
114 114  
115 115 There is third example, *pwm_capture_test.ino* which is specifically designed to check the capture objects with fast signals. For this example it is necessary the use of library pwm_lib, available at [https://github.com/antodom/pwm_lib](https://github.com/antodom/pwm_lib).
116 116  
117   -I hope all three xamples are self-explaining.
  117 +I hope all three examples are self-explaining.
118 118  
119 119 ### 6. Incompatibilities
120 120  
... ...
cmake/arduino_due_toolchain.cmake
... ... @@ -71,11 +71,11 @@ CMAKE_FORCE_C_COMPILER(${DUE_CC} arduino_due_arm)
71 71 CMAKE_FORCE_CXX_COMPILER(${DUE_CXX} arduino_due_arm)
72 72  
73 73 include_directories(
74   - $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.6/system/libsam
75   - $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.6/system/CMSIS/CMSIS/Include
76   - $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.6/system/CMSIS/Device/ATMEL $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.6/cores/arduino
77   - $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.6/cores/arduino/USB
78   - $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.6/variants/arduino_due_x
  74 + $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.9/system/libsam
  75 + $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.9/system/CMSIS/CMSIS/Include
  76 + $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.9/system/CMSIS/Device/ATMEL $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.9/cores/arduino
  77 + $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.9/cores/arduino/USB
  78 + $ENV{ARDUINO_DUE_ROOT_PATH}/hardware/sam/1.6.9/variants/arduino_due_x
79 79 )
80 80  
81 81  
... ...