Skip to content

Commit 283e990

Browse files
committed
Added K64F to tests
1 parent 220c0bb commit 283e990

File tree

12 files changed

+68
-26
lines changed

12 files changed

+68
-26
lines changed

libraries/rpc/parse_pins.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ PinName parse_pins(const char *str) {
4343
}
4444
return port_pin((PortName)port, pin);
4545

46-
#elif defined(TARGET_KL25Z)
46+
#elif defined(TARGET_KL25Z) || defined(TARGET_K64F)
4747
if (str[0] == 'P' && str[1] == 'T') { // PTx_n
4848
uint32_t port = str[2] - 'A';
4949
uint32_t pin = str[3] - '0'; // PTxn

libraries/tests/mbed/analog/main.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#include "test_env.h"
22

3-
#if defined(TARGET_KL25Z)
3+
#if defined(TARGET_K64F)
4+
AnalogIn in(A0);
5+
AnalogOut out(A5);
6+
7+
#elif defined(TARGET_KL25Z)
48
AnalogIn in(PTC2);
59
AnalogOut out(PTE30);
610

libraries/tests/mbed/digitalin_digitalout/main.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#include "test_env.h"
22

3-
#if defined(TARGET_KL25Z)
3+
#if defined(TARGET_K64F)
4+
DigitalOut out(D0);
5+
DigitalIn in(D7);
6+
7+
#elif defined(TARGET_KL25Z)
48
DigitalOut out(PTA5);
59
DigitalIn in(PTC6);
610

libraries/tests/mbed/digitalinout/main.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#include "test_env.h"
22

3-
#if defined(TARGET_KL25Z)
3+
#if defined(TARGET_K64F)
4+
DigitalInOut d1(D0);
5+
DigitalInOut d2(D7);
6+
7+
#elif defined(TARGET_KL25Z)
48
DigitalInOut d1(PTA5);
59
DigitalInOut d2(PTC6);
610

libraries/tests/mbed/i2c_eeprom/main.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ that uses two byte addresses should work.
2525
static const int ntests = 10000;
2626
static const int i2c_freq_hz = 400000;
2727
static const int i2c_delay_us = 0;
28-
//#define I2C_EEPROM_VERBOSE
28+
#define I2C_EEPROM_VERBOSE
2929
// End of test configuration block
3030

3131
#if defined(TARGET_KL25Z)
3232
I2C i2c(PTE0, PTE1);
3333
#elif defined(TARGET_NUCLEO_F103RB)
3434
I2C i2c(I2C_SDA, I2C_SCL);
35+
#elif defined(TARGET_K64F)
36+
I2C i2c(PTE25, PTE24);
3537
#else
3638
I2C i2c(p28, p27);
3739
#endif

libraries/tests/mbed/portout_portin/main.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
#include "test_env.h"
22

3-
#if defined(TARGET_LPC11U24)
3+
#if defined(TARGET_K64F)
4+
#define P1_1 D0
5+
#define P1_2 D1
6+
#define PORT_1 PortC
7+
8+
#define P2_1 D7
9+
#define P2_2 D6
10+
#define PORT_2 PortC
11+
12+
#elif defined(TARGET_LPC11U24)
413
#define P1_1 (1 << 9) // p0.9
514
#define P1_2 (1 << 8) // p0.8
615
#define PORT_1 Port0

libraries/tests/mbed/pwm/pwm.cpp renamed to libraries/tests/mbed/pwm/main.cpp

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,23 @@ CT32B0/MR0 p25 (P1_24)
1313
CT32B0/MR1 p26 (P1_25) and USBTX (P0_19)
1414
CT32B0/MR2 p10 (P1_26)
1515
*/
16+
17+
float value = 0.75;
1618

1719
int main() {
18-
#if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC11U24) || defined(TARGET_LPC4088)
19-
PwmOut pwm_p25(p25);
20+
#if defined(TARGET_K64F) || defined(TARGET_KL05Z) || defined(TARGET_KL25Z) || defined(TARGET_NUCLEO_F401RE)
21+
PwmOut pwm(D9);
22+
23+
pwm.period_ms(10);
24+
pwm.write(value);
25+
26+
float result = floor(pwm.read() * 100 + 0.5) / 100; // round it to 0.xx
27+
printf("%.2f\n", result);
28+
29+
notify_completion(result == value ? true : false);
30+
31+
#elif defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC11U24) || defined(TARGET_LPC4088)
32+
PwmOut pwm_p25(p25);
2033
PwmOut pwm_p26(p26);
2134

2235
pwm_p25.write(0.75);
@@ -35,22 +48,9 @@ int main() {
3548
printf("Initialize PWM on pin 24 with duty cycle: %.2f\n", pwm_dp24.read());
3649
printf("Initialize PWM on pin 18 with duty cycle: %.2f\n", pwm_dp18.read());
3750

38-
#elif defined(TARGET_KL25Z)
39-
PwmOut pwm_d2(D2);
40-
41-
pwm_d2.period_ms(10);
42-
pwm_d2.write(0.75);
43-
printf("%.2f\n", pwm_d2.read());
44-
45-
#elif defined(TARGET_KL05Z)
46-
PwmOut pwm_d2(D3);
47-
48-
pwm_d2.period_ms(10);
49-
pwm_d2.write(0.75);
50-
printf("%.2f\n", pwm_d2.read());
5151
#elif defined(TARGET_nRF51822)
5252
PwmOut pwm_p24(p24);
53-
PwmOut pwm_p25(p25);
53+
PwmOut pwm_p25(p25);
5454

5555
pwm_p24.write(0.75);
5656
pwm_p25.write(0.50);
@@ -76,6 +76,8 @@ int main() {
7676

7777
printf("Initialize PWM on pin PA_7 with duty cycle: %.2f\n", pwm_1.read());
7878
printf("Initialize PWM on pin PC_7 with duty cycle: %.2f\n", pwm_2.read());
79+
#else
80+
#error This test is not supported on this target.
7981
#endif
8082

8183
notify_completion(true);

libraries/tests/mbed/pwm_led/pwm.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
#include "mbed.h"
22

3-
#ifdef TARGET_NUCLEO_F103RB
4-
PwmOut led(D3);
3+
#if defined(TARGET_K64F)
4+
#define TEST_LED D5
5+
6+
#elif defined(TARGET_NUCLEO_F103RB)
7+
#define TEST_LED D3
8+
59
#else
610
#error This test is not supported on this target.
711
#endif
812

13+
PwmOut led(TEST_LED);
14+
915
int main() {
1016
float crt = 1.0, delta = 0.05;
1117

libraries/tests/mbed/ticker_2/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ DigitalOut out(PTB1);
1414
#elif defined(TARGET_KL46Z)
1515
DigitalOut out(PTA1);
1616

17+
#elif defined(TARGET_K64F)
18+
DigitalOut out(PTA1);
1719

1820
#else
1921
DigitalOut out(p5);

libraries/tests/mbed/time_us/main.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ DigitalOut out(PTB1);
99
#elif defined(TARGET_KL46Z)
1010
DigitalOut out(PTA1);
1111

12+
#elif defined(TARGET_K64F)
13+
DigitalOut out(PTA1);
14+
1215
#elif defined(TARGET_LPC812)
1316
DigitalOut out(D10);
1417

libraries/tests/mbed/timeout/main.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ DigitalOut out(P0_12);
1717
#elif defined(TARGET_LPC1114)
1818
DigitalOut out(LED2);
1919

20+
#elif defined(TARGET_K64F)
21+
DigitalOut out(LED1);
22+
2023
#else
2124
DigitalOut out(p5);
2225
#endif

workspace_tools/tests.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,19 @@
4343
* KL25Z: (SDA=PTC9, SCL=PTC8)
4444
4545
* digital_loop (Digital(In|Out|InOut), InterruptIn):
46+
* Arduino headers: (D0 <-> D7)
4647
* LPC1*: (p5 <-> p25 )
4748
* KL25Z: (PTA5<-> PTC6)
4849
* NUCLEO_F103RB: (PC_6 <-> PB_8)
4950
5051
* port_loop (Port(In|Out|InOut)):
51-
* LPC1*: (p5 <-> p25 ), (p6 <-> p26 )
52+
* Arduino headers: (D0 <-> D7), (D1 <-> D6)
53+
* LPC1*: (p5 <-> p25), (p6 <-> p26)
5254
* KL25Z: (PTA5 <-> PTC6), (PTA4 <-> PTC5)
5355
* NUCLEO_F103RB: (PC_6 <-> PB_8), (PC_5 <-> PB_9)
5456
5557
* analog_loop (AnalogIn, AnalogOut):
58+
* Arduino headers: (A0 <-> A5)
5659
* LPC1*: (p17 <-> p18 )
5760
* KL25Z: (PTE30 <-> PTC2)
5861
@@ -125,7 +128,7 @@
125128
"dependencies": [MBED_LIBRARIES, TEST_MBED_LIB],
126129
"automated": True,
127130
"peripherals": ["analog_loop"],
128-
"mcu": ["LPC1768", "LPC2368", "KL25Z", "LPC4088"]
131+
"mcu": ["LPC1768", "LPC2368", "KL25Z", "K64F", "LPC4088"]
129132
},
130133
{
131134
"id": "MBED_A9", "description": "Serial Echo at 115200",

0 commit comments

Comments
 (0)