diff --git a/config/project.yml b/config/project.yml index 92b66fc2..e47631d6 100644 --- a/config/project.yml +++ b/config/project.yml @@ -194,17 +194,6 @@ unit-test: query: onewire_DS18x20_board == '1:1' working_dir: extras/arduino-core-tests - unit-test-iic-pingpong-1400: - - description: Compiling, flashing and monitoring I2C pingpong slave unit test. - command: make test_wire_connected2_slavepingpong - query: iic_ping_pong_multiple_boards_slave == '2:1' - working_dir: extras/arduino-core-tests - - - description: Compiling, flashing and monitoring I2C pingpong master unit test. - command: make test_wire_connected2_masterpingpong - query: iic_ping_pong_multiple_boards_master == '2:1' - working_dir: extras/arduino-core-tests - unit-test-digital-io-1400: - description: Compiling, flashing and monitoring digital IO unit test. command: make test_digitalio_single @@ -241,27 +230,51 @@ unit-test: query: analogio_pwm_single_board == '2:1' working_dir: extras/arduino-core-tests - unit-test-iic-1400: - - description: Compiling, flashing and monitoring timer unit test. - command: make test_wire_connected1_pingpong - query: iic_ping_pong_single_board == '2:1' + # unit-test-iic-1400: + # - description: Compiling, flashing and monitoring timer unit test. + # command: make test_wire_connected1_pingpong + # query: iic_ping_pong_single_board == '2:1' + # working_dir: extras/arduino-core-tests + + unit-test-iic-pingpong-1400: + - description: Compiling, flashing and monitoring I2C pingpong slave unit test. + command: make test_wire_connected2_slavepingpong + query: iic_ping_pong_multiple_boards_slave == '2:1' + working_dir: extras/arduino-core-tests + + - description: Compiling, flashing and monitoring I2C pingpong master unit test. + command: make test_wire_connected2_masterpingpong + query: iic_ping_pong_multiple_boards_master == '2:1' + working_dir: extras/arduino-core-tests + + unit-test-pulse-1400: + - description: Compiling, flashing and monitoring pulse board1 unit test. + command: make test_pulse_board1 + query: adv_io_pulse_board1 == '2:1' + working_dir: extras/arduino-core-tests + + - description: Compiling, flashing and monitoring pulse board2 unit test. + command: make test_pulse_board2 + query: adv_io_pulse_board2 == '2:1' working_dir: extras/arduino-core-tests - unit-test-can-single-1400-2go: + unit-test-spi-single-pingpong-1400: + - description: Compiling, flashing and monitoring SPI pingpong single_board. + command: make test_spi_connected1_loopback + query: spi_ping_pong_single_board == '2:1' + working_dir: extras/arduino-core-tests + + unit-test-onewire-DS18x20-1400: + - description: Compiling, flashing and monitoring OneWire sensor DS18B20 data. + command: make test_onewire_DS18x20 + query: onewire_DS18x20_board == '2:1' + working_dir: extras/arduino-core-tests + + unit-test-can-1400-2go: - description: Compiling, flashing and monitoring CAN unit test. command: make test_can_single query: can_single_board == '1:1' working_dir: extras/arduino-core-tests - unit-test-can-multi-1400-2go: - - description: Compiling, flashing and monitoring can node 1 test. - command: make test_can_connected2_node1 - query: can_multiple_boards_node1 == '1:1' - working_dir: extras/arduino-core-tests - - - description: Compiling, flashing and monitoring can node 2 test. - command: make test_can_connected2_node2 - query: can_multiple_boards_node2 == '1:1' - working_dir: extras/arduino-core-tests \ No newline at end of file diff --git a/config/user.yml b/config/user.yml index 63802f81..917ae382 100644 --- a/config/user.yml +++ b/config/user.yml @@ -27,14 +27,15 @@ unit-test: - unit-test-uart-4700 - unit-test-spi-single-pingpong-4700 - unit-test-onewire-DS18x20-4700 - - unit-test-can-single-1400-2go - - unit-test-can-multi-1400-2go - - - # - unit-test-digital-io-1400 - # - unit-test-tone-1400 - # - unit-test-interrupts-1400 - # - unit-test-random-1400 - # - unit-test-time-1400 - # - unit-test-analog-io-pwm-1400 - # - unit-test-analog-io-adc-1400 \ No newline at end of file + - unit-test-can-1400-2go + - unit-test-digital-io-1400 + - unit-test-tone-1400 + - unit-test-iic-pingpong-1400 + - unit-test-interrupts-1400 + - unit-test-random-1400 + - unit-test-spi-single-pingpong-1400 + - unit-test-pulse-1400 + - unit-test-time-1400 + - unit-test-onewire-DS18x20-1400 + # - unit-test-analog-io-adc-1400 + # - unit-test-analog-io-pwm-1400 diff --git a/extras/arduino-core-api b/extras/arduino-core-api index 4a02bfc0..0f4e57ea 160000 --- a/extras/arduino-core-api +++ b/extras/arduino-core-api @@ -1 +1 @@ -Subproject commit 4a02bfc0a924e1fec34c3bb82ffd5dfba7643a0c +Subproject commit 0f4e57ea193a00163ae59f0f0ff478feae7eb5db diff --git a/extras/arduino-devops b/extras/arduino-devops index 267471c7..b086dd5a 160000 --- a/extras/arduino-devops +++ b/extras/arduino-devops @@ -1 +1 @@ -Subproject commit 267471c79da2e7da81759d27b519da3507b5a563 +Subproject commit b086dd5a1d1ef117677cb292b6b0821628eed7de diff --git a/extras/arduino-examples b/extras/arduino-examples index 4901be04..f2bf63b4 160000 --- a/extras/arduino-examples +++ b/extras/arduino-examples @@ -1 +1 @@ -Subproject commit 4901be04d38d690efefedbed271d2eb534512436 +Subproject commit f2bf63b4499fdd984891b6dff074732f3e9effaf diff --git a/extras/makers-devops b/extras/makers-devops index 663d0491..e1bf7a3d 160000 --- a/extras/makers-devops +++ b/extras/makers-devops @@ -1 +1 @@ -Subproject commit 663d04911cd3d2b1191be6fc7a08f83c38ed49f7 +Subproject commit e1bf7a3d928d88948bc18be8e5d961d650ad6943 diff --git a/tests/test_config.h b/tests/test_config.h index 60d97248..ad907755 100644 --- a/tests/test_config.h +++ b/tests/test_config.h @@ -17,14 +17,14 @@ #define SPI_TRANSFER_DELAY_US 2000 // Test Pin Definitions - #define TEST_PIN_DIGITAL_IO_OUTPUT 3 // IO_4 - #define TEST_PIN_DIGITAL_IO_INPUT 2 // IO_3 - #define TEST_PIN_SYNC_IO 4 // IO_1 - #define TEST_PIN_PULSE 5 // IO_2 - #define TEST_PIN_SPI_SSEL 10 // IO_0 + #define TEST_PIN_SYNC_IO 4 // IO_1 + #define TEST_PIN_SPI_SSEL 10 // IO_0 #define TEST_PIN_ONEWIRE 7 #if defined(KIT_XMC47_RELAX) + #define TEST_PIN_DIGITAL_IO_OUTPUT 3 // IO_4 + #define TEST_PIN_DIGITAL_IO_INPUT 2 // IO_3 + #define TEST_PIN_PULSE 5 // IO_2 #define PWM_FREQUENCY_HZ 490 // PWM Frequency in Hz #define TEST_PIN_ANALOG_IO_VREF A2 // Pin connected to Vdd #define TEST_PIN_ANALOG_IO_DIVIDER A1 // Pin connected to voltage divider @@ -35,6 +35,18 @@ #define TEST_PIN_ANALOG_IO_DAC 53 #define TEST_PIN_ANALOG_IO_DAC_INPUT A3 + #elif defined(KIT_XMC1400_ARDUINO) + #define TEST_PIN_DIGITAL_IO_OUTPUT 4 + #define TEST_PIN_DIGITAL_IO_INPUT 25 + #define TEST_PIN_PULSE 6 + + #define PWM_FREQUENCY_HZ 490 // PWM Frequency in Hz + #define TEST_PIN_ANALOG_IO_VREF A2 // Pin connected to Vdd + #define TEST_PIN_ANALOG_IO_DIVIDER A1 // Pin connected to voltage divider + #define TEST_PIN_ANALOG_IO_GND A0 // Pin connected to Ground + #define TEST_ADC_MAX_VALUE 1023 + #define TEST_ADC_RESOLUTION 10 // ADC resolution + #elif defined(KIT_XMC14_2GO) #define PWM_FREQUENCY_HZ 490 // PWM Frequency in Hz #define TEST_PIN_ANALOG_IO_VREF A0 // Pin connected to Vdd diff --git a/variants/XMC1400/config/KIT_XMC1400_ARDUINO/pins_arduino.h b/variants/XMC1400/config/KIT_XMC1400_ARDUINO/pins_arduino.h index 52240066..3a02c8ac 100644 --- a/variants/XMC1400/config/KIT_XMC1400_ARDUINO/pins_arduino.h +++ b/variants/XMC1400/config/KIT_XMC1400_ARDUINO/pins_arduino.h @@ -109,10 +109,10 @@ extern uint8_t SCK; #define LED3 26 #define LED_BUILTIN LED1 -#define EXT_INTR_0 3 -#define EXT_INTR_1 25 +#define EXT_INTR_0 25 +#define EXT_INTR_1 3 -#define digitalPinToInterrupt(p) ((p) == 3 ? 0 : ((p) == 25 ? 1 : -1)) +#define digitalPinToInterrupt(p) ((p) == 25 ? 0 : ((p) == 3 ? 1 : -1)) /* Mapping interrupt handlers. Notice that XMC1400 can have interrupt handlers working in 3 modes, the defines below assumes the mode A. For details refer to assembly file and reference manual. @@ -180,8 +180,8 @@ bool gpio_current_value[NUM_DIGITAL] = {false}; ; const XMC_PIN_INTERRUPT_t mapping_interrupt[] = { - /* 0 */ {CCU40, CCU40_CC41, 1, 1, CCU40_IN1_U0C1_DX2INS}, - /* 1 */ {CCU40, CCU40_CC40, 0, 0, CCU40_IN0_U0C0_DX2INS}}; + /* 0 */ {CCU40, CCU40_CC40, 0, 0, CCU40_IN0_U0C0_DX2INS}, + /* 1 */ {CCU40, CCU40_CC41, 1, 1, CCU40_IN1_U0C1_DX2INS}}; const uint8_t NUM_INTERRUPT = (sizeof(mapping_interrupt) / sizeof(XMC_PIN_INTERRUPT_t)); /* Mapping of Arduino Pins to PWM4 channels as pin and index in PWM4 channel