Skip to content

Commit 4a65e01

Browse files
mhollfeldermhollfelder
committed
Merge branch 'release'
2 parents a62b67c + 9d1b3da commit 4a65e01

File tree

36 files changed

+11422
-427
lines changed

36 files changed

+11422
-427
lines changed

‎.travis.yml‎

Lines changed: 42 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,36 @@
11
language: python
22
python:
33
- "2.7"
4-
4+
sudo: required
55
env:
6-
# defining this variable creates multiple jobs in Travis
7-
# TODO keep these examples up-to-date with the ones in the core
8-
- PLATFORMIO_PROJECT_DIR=examples/arduino-blink
9-
- PLATFORMIO_PROJECT_DIR=examples/arduino-wire/master_reader
10-
- PLATFORMIO_PROJECT_DIR=examples/arduino-wire/master_writer
11-
- PLATFORMIO_PROJECT_DIR=examples/arduino-wire/slave_receiver
12-
- PLATFORMIO_PROJECT_DIR=examples/arduino-wire/slave_sender
13-
- PLATFORMIO_PROJECT_DIR=examples/device-control/DieTemperatureMeasurement
14-
- PLATFORMIO_PROJECT_DIR=examples/device-control/HeapMemoryMeasurement
15-
- PLATFORMIO_PROJECT_DIR=examples/device-control/SleepModeXMC1100
16-
- PLATFORMIO_PROJECT_DIR=examples/device-control/SleepModeXMC4700
17-
- PLATFORMIO_PROJECT_DIR=examples/device-control/StackMemoryMeasurement
18-
- PLATFORMIO_PROJECT_DIR=examples/ifx9201/MotorControl
19-
- PLATFORMIO_PROJECT_DIR=examples/rtc/AlarmRTC
20-
- PLATFORMIO_PROJECT_DIR=examples/rtc/HibernateRTCAlarm
21-
- PLATFORMIO_PROJECT_DIR=examples/rtc/SimpleRTC
22-
- PLATFORMIO_PROJECT_DIR=examples/spi/BarometricPressureSensor
23-
- PLATFORMIO_PROJECT_DIR=examples/spi/DigitalPotControl
24-
- PLATFORMIO_PROJECT_DIR=examples/ultrasonic/betterecho
25-
- PLATFORMIO_PROJECT_DIR=examples/ultrasonic/simple-echo
26-
# - PLATFORMIO_PROJECT_DIR=examples/radar/doppler_speed
6+
global:
7+
- LIB_NAME=I2S
8+
- LIB_PATH=./arm/libraries/I2S
9+
- USR_NAME="Sun Yuxi (IFAG DES SDF FW)"
10+
- USR_EMAIL="[email protected]"
11+
- secure: eR/vXO8e4Se4Wgq4FeBSXOkHqZuZM5oygF6awDOr+xNBKhG3H7oVdJ2poNUqGvn2UbkhLQedB8P3rBQfOAb2YDccklCb4LhXU+gZ4dNoh+uVOhlZeVk1hnP4DHttFt1HBW5nbdNBMfNE4DQgF1D9NagwSt2nRrxWFZHD1uAvRyZvZ0RmBbclmb3TP/onIsdbdEhGX05Z9ztG7qtell+Rl/BrhVRzyshA2BSpX3qyDMUtL6DO1uSPLJhNsEAdnTaOQ0USEvdIbxeH8Wqi1ivK8nor3UdZ8jD/wME8YONgvl5aYOLDJCe17TOQDHLj2lMlwN43Xsxqyo/AFy4X6+8jQK792EA0y7hvNbwEwpinaCNtD1Rmjv8N362mrP9vYSJg17cs1RUtAtdp9K57r+yV7CxdJCjhipecJfkll+aMb2lV2+URfOVF7f3FXemuxBiyMxCYKKwJAdhLsuKCwmCMBEYXhgusq6GBBXfvwgn4F9o7hk9sUdIKovl4us5iLNv2/8rRRSP1AEaW8a1D2ADh6WVNg0SjqyNKvGhrv20jundVP76p35ucyVpTR3mLsziLiDDotwzGq3MVAkGEMBjQjsqHAW3riCNY+oJL3Niy/A8vNr4xJCUaPL0wTgug8XGb5QzXc2cGcp9zlUiFU1LNHMGoWkEFiAeu4Obi2fwV7wA=
12+
matrix:
13+
# defining this variable creates multiple jobs in Travis
14+
# TODO keep these examples up-to-date with the ones in the core
15+
#- PLATFORMIO_PROJECT_DIR=examples/arduino-blink
16+
- PLATFORMIO_PROJECT_DIR=examples/arduino-wire/master_reader
17+
- PLATFORMIO_PROJECT_DIR=examples/arduino-wire/master_writer
18+
- PLATFORMIO_PROJECT_DIR=examples/arduino-wire/slave_receiver
19+
- PLATFORMIO_PROJECT_DIR=examples/arduino-wire/slave_sender
20+
# - PLATFORMIO_PROJECT_DIR=examples/device-control/DieTemperatureMeasurement
21+
# - PLATFORMIO_PROJECT_DIR=examples/device-control/HeapMemoryMeasurement
22+
# - PLATFORMIO_PROJECT_DIR=examples/device-control/SleepModeXMC1100
23+
# - PLATFORMIO_PROJECT_DIR=examples/device-control/SleepModeXMC4700
24+
# - PLATFORMIO_PROJECT_DIR=examples/device-control/StackMemoryMeasurement
25+
# - PLATFORMIO_PROJECT_DIR=examples/ifx9201/MotorControl
26+
# - PLATFORMIO_PROJECT_DIR=examples/rtc/AlarmRTC
27+
# - PLATFORMIO_PROJECT_DIR=examples/rtc/HibernateRTCAlarm
28+
# - PLATFORMIO_PROJECT_DIR=examples/rtc/SimpleRTC
29+
# - PLATFORMIO_PROJECT_DIR=examples/spi/BarometricPressureSensor
30+
# - PLATFORMIO_PROJECT_DIR=examples/spi/DigitalPotControl
31+
# - PLATFORMIO_PROJECT_DIR=examples/ultrasonic/betterecho
32+
# - PLATFORMIO_PROJECT_DIR=examples/ultrasonic/simple-echo
33+
# - PLATFORMIO_PROJECT_DIR=examples/radar/doppler_speed
2734
install:
2835
- zip -r /tmp/framework-arduinoxmc.zip ./arm
2936
- git clone https://github.com/Infineon/platformio-infineonxmc.git /tmp/builder
@@ -37,4 +44,16 @@ install:
3744
- platformio platform install -f file://.
3845

3946
script:
40-
- platformio run -d $PLATFORMIO_PROJECT_DIR
47+
- platformio run -d $PLATFORMIO_PROJECT_DIR
48+
49+
after_success:
50+
# only build once (after one job by checking id, however this does not work reliably)
51+
- |
52+
if [ $(($TRAVIS_JOB_ID - $TRAVIS_BUILD_ID)) -eq 1 ]; then
53+
export REPO_NAME=${LIB_NAME#*/}
54+
cd $LIB_PATH
55+
git clone https://github.com/Infineon/InfineonDoxyGenerator.git
56+
cd InfineonDoxyGenerator/docs
57+
chmod +x publish_pdf.sh
58+
./publish_pdf.sh
59+
fi

‎arm/boards.txt‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,41 @@ XMC1300_Sense2GoL.build.board_variant=XMC1300_Sense2GoL
171171
XMC1300_Sense2GoL.build.flash_size=64K
172172
XMC1300_Sense2GoL.build.flash_ld=linker_script.ld
173173
XMC1300_Sense2GoL.build.extra_flags=-DARM_MATH_CM0
174+
175+
####################################################
176+
#XMC1400_Boot_Kit.name=XMC1400 Boot Kit
177+
#XMC1400_Boot_Kit.upload.tool=xmcprog
178+
#XMC1400_Boot_Kit.upload.speed=115200
179+
#XMC1400_Boot_Kit.upload.resetmethod=ck
180+
#XMC1400_Boot_Kit.upload.maximum_size=2048000
181+
#XMC1400_Boot_Kit.upload.wait_for_upload_port=true
182+
183+
#XMC1400_Boot_Kit.communication=usb
184+
#XMC1400_Boot_Kit.protocol=dragon_isp
185+
#XMC1400_Boot_Kit.program.protocol=dragon_isp
186+
#XMC1400_Boot_Kit.program.tool=xmcprog
187+
#XMC1400_Boot_Kit.program.extra_params=-Pusb
188+
189+
#XMC1400_Boot_Kit.serial.disableDTR=true
190+
#XMC1400_Boot_Kit.serial.disableRTS=true
191+
192+
#XMC1400_Boot_Kit.build.mcu=cortex-m0
193+
#XMC1400_Boot_Kit.build.f_cpu=48000000L
194+
#XMC1400_Boot_Kit.build.board=ARM_XMC
195+
#XMC1400_Boot_Kit.build.board.version=1404
196+
#XMC1400_Boot_Kit.build.board.type=Q064x0200
197+
#XMC1400_Boot_Kit.build.board.v=0200
198+
#XMC1400_Boot_Kit.build.core=./
199+
#XMC1400_Boot_Kit.build.variant=XMC1400
200+
#XMC1400_Boot_Kit.build.board_variant=XMC1400_Boot_Kit
201+
#XMC1400_Boot_Kit.build.flash_size=200K
202+
#XMC1400_Boot_Kit.build.flash_ld=linker_script.ld
203+
#XMC1400_Boot_Kit.build.extra_flags=-DARM_MATH_CM0
204+
#XMC1400_Boot_Kit.menu.UART.debug=PC
205+
#XMC1400_Boot_Kit.menu.UART.debug.flag.selected=SERIAL_HOSTPC
206+
#XMC1400_Boot_Kit.menu.UART.onBoard=On Board
207+
#XMC1400_Boot_Kit.menu.UART.onBoard.flag.selected=SERIAL_ONBOARD
208+
174209
####################################################
175210
XMC4700_Relax_Kit.name=XMC4700 Relax Kit
176211
XMC4700_Relax_Kit.upload.tool=xmcprog

‎arm/cores/Arduino.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ extern "C" {
109109
bool enabled ;
110110
} XMC_PWM4_t;
111111

112-
#ifdef CCU8V2
112+
#if defined (CCU8V2) ||defined (CCU8V3)
113113
/*
114114
* XMC PWM type (CCU8)
115115
*/
@@ -182,7 +182,7 @@ extern "C" {
182182
extern const uint8_t mapping_pin_PWM4[][ 2 ];
183183
extern XMC_PWM4_t mapping_pwm4[];
184184
extern XMC_ADC_t mapping_adc[];
185-
#ifdef CCU8V2
185+
#if defined (CCU8V2) || defined(CCU8V3)
186186
extern const uint8_t mapping_pin_PWM8[][ 2 ];
187187
extern XMC_PWM8_t mapping_pwm8[];
188188
#endif

‎arm/cores/HardwareSerial.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ if( serialEvent1 )
4545
#endif
4646
}
4747

48-
4948
void USIC0_0_IRQHandler( void )
5049
{
5150
Serial.IrqHandler();

‎arm/cores/wiring_time.h‎

Lines changed: 63 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -38,62 +38,72 @@ extern "C" {
3838

3939
#if ((UC_FAMILY == XMC4) && (F_CPU == 144000000U))
4040
// 142 NOPS
41-
#define NOPS_FOR_USEC() { asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
42-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
43-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
44-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
45-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
46-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
47-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
48-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
49-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
50-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
51-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
52-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
53-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
54-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
55-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
56-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
57-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
58-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
59-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
60-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
61-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
62-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
63-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
64-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
65-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
66-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
67-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
68-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
69-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
70-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
71-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
72-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
73-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
74-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
75-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
76-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
77-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
78-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
79-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
80-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
81-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
82-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
83-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
84-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
85-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
86-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
87-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
88-
asm volatile("nop"); }
41+
#define NOPS_FOR_USEC() { asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
42+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
43+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
44+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
45+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
46+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
47+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
48+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
49+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
50+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
51+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
52+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
53+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
54+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
55+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
56+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
57+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
58+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
59+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
60+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
61+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
62+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
63+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
64+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
65+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
66+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
67+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
68+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
69+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
70+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
71+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
72+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
73+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
74+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
75+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
76+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
77+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
78+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
79+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
80+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
81+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
82+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
83+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
84+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
85+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
86+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
87+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
88+
asm volatile("nop");}
8989
#elif ((UC_FAMILY == XMC1) && (F_CPU == 32000000U))
9090
// 16 NOPS
91-
#define NOPS_FOR_USEC() { asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
92-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
93-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
94-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
95-
asm volatile("nop"); asm volatile("nop"); asm volatile("nop"); \
91+
#define NOPS_FOR_USEC() { asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
92+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
93+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
94+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
95+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
9696
asm volatile("nop"); }
97+
#elif ((UC_FAMILY == XMC1) && (F_CPU == 48000000U))
98+
// 24 NOPS
99+
#define NOPS_FOR_USEC() { asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
100+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
101+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
102+
asm volatile("nop"); asm volatile("nop"); asm volatile("nop");\
103+
asm volatile("nop"); asm volatile("nop");asm volatile("nop");\
104+
asm volatile("nop"); asm volatile("nop");asm volatile("nop");\
105+
asm volatile("nop"); asm volatile("nop");asm volatile("nop");\
106+
asm volatile("nop"); asm volatile("nop");asm volatile("nop"); }
97107
#else
98108
#error wiring_time: NOPS_FOR_USEC not defined
99109
#endif

0 commit comments

Comments
 (0)