mirror of https://github.com/ARMmbed/mbed-os.git
Merge pull request #505 from bcostm/master
[Tests] Nucleo - Re-order and add new targetspull/509/head^2
commit
f276ee2507
|
@ -20,6 +20,21 @@ AnalogOut out(PTE30);
|
|||
AnalogIn in(A0);
|
||||
AnalogOut out(D12); //D12 is P0_12, the DAC output pin
|
||||
|
||||
// No DAC on these targets:
|
||||
//TARGET_NUCLEO_F103RB
|
||||
//TARGET_NUCLEO_F030R8
|
||||
//TARGET_NUCLEO_F401RE
|
||||
//TARGET_NUCLEO_F411RE
|
||||
#elif defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F091RC) || \
|
||||
defined(TARGET_NUCLEO_F302R8) || \
|
||||
defined(TARGET_NUCLEO_F303RE) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_L053R8) || \
|
||||
defined(TARGET_NUCLEO_L152RE)
|
||||
AnalogIn in(A0);
|
||||
AnalogOut out(A2); // DAC output
|
||||
|
||||
#else
|
||||
AnalogIn in(p17);
|
||||
AnalogOut out(p18);
|
||||
|
|
|
@ -10,15 +10,17 @@ DigitalIn in(dp2);
|
|||
DigitalOut out(D7);
|
||||
DigitalIn in(D2);
|
||||
|
||||
#elif defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_L152RE) || \
|
||||
#elif defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F091RC) || \
|
||||
defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_F302R8) || \
|
||||
defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F303RE) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_F401RE) || \
|
||||
defined(TARGET_NUCLEO_F411RE) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_L053R8)
|
||||
defined(TARGET_NUCLEO_L053R8) || \
|
||||
defined(TARGET_NUCLEO_L152RE)
|
||||
DigitalOut out(PC_7);
|
||||
DigitalIn in(PB_8);
|
||||
|
||||
|
|
|
@ -10,15 +10,17 @@ DigitalInOut d2(dp2);
|
|||
DigitalInOut d1(D2);
|
||||
DigitalInOut d2(D7);
|
||||
|
||||
#elif defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_L152RE) || \
|
||||
#elif defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F091RC) || \
|
||||
defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_F302R8) || \
|
||||
defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F303RE) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_F401RE) || \
|
||||
defined(TARGET_NUCLEO_F411RE) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_L053R8)
|
||||
defined(TARGET_NUCLEO_L053R8) || \
|
||||
defined(TARGET_NUCLEO_L152RE)
|
||||
DigitalInOut d1(PC_7);
|
||||
DigitalInOut d2(PB_8);
|
||||
|
||||
|
|
|
@ -66,15 +66,17 @@ int main()
|
|||
#elif defined(TARGET_nRF51822)
|
||||
//SDFileSystem sd(p20, p22, p25, p24, "sd");
|
||||
SDFileSystem sd(p12, p13, p15, p14, "sd");
|
||||
#elif defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_L152RE) || \
|
||||
#elif defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F091RC) || \
|
||||
defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_F302R8) || \
|
||||
defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F303RE) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_F401RE) || \
|
||||
defined(TARGET_NUCLEO_F411RE) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_L053R8)
|
||||
defined(TARGET_NUCLEO_L053R8) || \
|
||||
defined(TARGET_NUCLEO_L152RE)
|
||||
SDFileSystem sd(D11, D12, D13, D10, "sd");
|
||||
#else
|
||||
SDFileSystem sd(p11, p12, p13, p14, "sd");
|
||||
|
|
|
@ -13,15 +13,17 @@ TMP102 temperature(p9, p10, 0x90);
|
|||
#elif defined(TARGET_LPC2368)
|
||||
TMP102 temperature(p28, p27, 0x90);
|
||||
|
||||
#elif defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_L152RE) || \
|
||||
#elif defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F091RC) || \
|
||||
defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_F302R8) || \
|
||||
defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F303RE) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_F401RE) || \
|
||||
defined(TARGET_NUCLEO_F411RE) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_L053R8)
|
||||
defined(TARGET_NUCLEO_L053R8) || \
|
||||
defined(TARGET_NUCLEO_L152RE)
|
||||
TMP102 temperature(I2C_SDA, I2C_SCL, 0x90);
|
||||
|
||||
#else
|
||||
|
|
|
@ -39,15 +39,17 @@ I2C i2c(P0_10, P0_11);
|
|||
#elif defined(TARGET_LPC1549)
|
||||
I2C i2c(P0_23, P0_22);
|
||||
|
||||
#elif defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_L152RE) || \
|
||||
#elif defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F091RC) || \
|
||||
defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_F302R8) || \
|
||||
defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F303RE) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_F401RE) || \
|
||||
defined(TARGET_NUCLEO_F411RE) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_L053R8)
|
||||
defined(TARGET_NUCLEO_L053R8) || \
|
||||
defined(TARGET_NUCLEO_L152RE)
|
||||
I2C i2c(I2C_SDA, I2C_SCL);
|
||||
|
||||
#elif defined(TARGET_LPC11U68)
|
||||
|
|
|
@ -52,15 +52,17 @@ I2C i2c(P0_23, P0_22);
|
|||
#elif defined(TARGET_LPC11U68)
|
||||
I2C i2c(SDA, SCL);
|
||||
|
||||
#elif defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_L152RE) || \
|
||||
#elif defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F091RC) || \
|
||||
defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_F302R8) || \
|
||||
defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F303RE) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_F401RE) || \
|
||||
defined(TARGET_NUCLEO_F411RE) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_L053R8)
|
||||
defined(TARGET_NUCLEO_L053R8) || \
|
||||
defined(TARGET_NUCLEO_L152RE)
|
||||
I2C i2c(I2C_SDA, I2C_SCL);
|
||||
|
||||
#else
|
||||
|
|
|
@ -35,15 +35,17 @@ void in_handler() {
|
|||
#define PIN_IN (p11)
|
||||
#define PIN_OUT (p12)
|
||||
|
||||
#elif defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_L152RE) || \
|
||||
#elif defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F091RC) || \
|
||||
defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_F302R8) || \
|
||||
defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F303RE) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_F401RE) || \
|
||||
defined(TARGET_NUCLEO_F411RE) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_L053R8)
|
||||
defined(TARGET_NUCLEO_L053R8) || \
|
||||
defined(TARGET_NUCLEO_L152RE)
|
||||
#define PIN_IN PB_8
|
||||
#define PIN_OUT PC_6
|
||||
|
||||
|
|
|
@ -63,7 +63,17 @@
|
|||
#define P2_2 (1 << 25) // p25
|
||||
#define PORT_2 Port0
|
||||
|
||||
#elif defined(TARGET_NUCLEO_F103RB)
|
||||
#elif defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F091RC) || \
|
||||
defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_F302R8) || \
|
||||
defined(TARGET_NUCLEO_F303RE) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_F401RE) || \
|
||||
defined(TARGET_NUCLEO_F411RE) || \
|
||||
defined(TARGET_NUCLEO_L053R8) || \
|
||||
defined(TARGET_NUCLEO_L152RE)
|
||||
#define P1_1 (1 << 6) // PC_6
|
||||
#define P1_2 (1 << 5) // PC_5
|
||||
#define PORT_1 PortC
|
||||
|
|
|
@ -63,7 +63,17 @@
|
|||
#define P2_2 (1 << 25) // p25
|
||||
#define PORT_2 Port0
|
||||
|
||||
#elif defined(TARGET_NUCLEO_F103RB)
|
||||
#elif defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F091RC) || \
|
||||
defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_F302R8) || \
|
||||
defined(TARGET_NUCLEO_F303RE) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_F401RE) || \
|
||||
defined(TARGET_NUCLEO_F411RE) || \
|
||||
defined(TARGET_NUCLEO_L053R8) || \
|
||||
defined(TARGET_NUCLEO_L152RE)
|
||||
#define P1_1 (1 << 6) // PC_6
|
||||
#define P1_2 (1 << 5) // PC_5
|
||||
#define PORT_1 PortC
|
||||
|
|
|
@ -3,7 +3,17 @@
|
|||
#if defined(TARGET_K64F)
|
||||
#define TEST_LED D9
|
||||
|
||||
#elif defined(TARGET_NUCLEO_F103RB)
|
||||
#elif defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F091RC) || \
|
||||
defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_F302R8) || \
|
||||
defined(TARGET_NUCLEO_F303RE) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_F401RE) || \
|
||||
defined(TARGET_NUCLEO_F411RE) || \
|
||||
defined(TARGET_NUCLEO_L053R8) || \
|
||||
defined(TARGET_NUCLEO_L152RE)
|
||||
#define TEST_LED D3
|
||||
|
||||
#elif defined (TARGET_K22F)
|
||||
|
|
|
@ -17,15 +17,17 @@ SDFileSystem sd(PTD2, PTD3, PTD1, PTC2, "sd");
|
|||
#elif defined(TARGET_nRF51822)
|
||||
SDFileSystem sd(p12, p13, p15, p14, "sd");
|
||||
|
||||
#elif defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_L152RE) || \
|
||||
#elif defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F091RC) || \
|
||||
defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_F302R8) || \
|
||||
defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F303RE) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_F401RE) || \
|
||||
defined(TARGET_NUCLEO_F411RE) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_L053R8)
|
||||
defined(TARGET_NUCLEO_L053R8) || \
|
||||
defined(TARGET_NUCLEO_L152RE)
|
||||
SDFileSystem sd(D11, D12, D13, D10, "sd");
|
||||
|
||||
#elif defined(TARGET_DISCO_F051R8)
|
||||
|
|
|
@ -19,15 +19,17 @@ SDFileSystem sd(PTD2, PTD3, PTD1, PTC2, "sd");
|
|||
#elif defined(TARGET_nRF51822)
|
||||
SDFileSystem sd(p12, p13, p15, p14, "sd");
|
||||
|
||||
#elif defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_L152RE) || \
|
||||
#elif defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F091RC) || \
|
||||
defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_F302R8) || \
|
||||
defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F303RE) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_F401RE) || \
|
||||
defined(TARGET_NUCLEO_F411RE) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_L053R8)
|
||||
defined(TARGET_NUCLEO_L053R8) || \
|
||||
defined(TARGET_NUCLEO_L152RE)
|
||||
SDFileSystem sd(D11, D12, D13, D10, "sd");
|
||||
|
||||
#elif defined(TARGET_DISCO_F051R8)
|
||||
|
|
|
@ -19,15 +19,17 @@ SDFileSystem sd(PTD2, PTD3, PTD1, PTC2, "sd");
|
|||
#elif defined(TARGET_nRF51822)
|
||||
SDFileSystem sd(p12, p13, p15, p14, "sd");
|
||||
|
||||
#elif defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_L152RE) || \
|
||||
#elif defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F091RC) || \
|
||||
defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_F302R8) || \
|
||||
defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F303RE) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_F401RE) || \
|
||||
defined(TARGET_NUCLEO_F411RE) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_L053R8)
|
||||
defined(TARGET_NUCLEO_L053R8) || \
|
||||
defined(TARGET_NUCLEO_L152RE)
|
||||
SDFileSystem sd(D11, D12, D13, D10, "sd");
|
||||
|
||||
#elif defined(TARGET_DISCO_F051R8)
|
||||
|
|
|
@ -19,15 +19,17 @@ SDFileSystem sd(PTD2, PTD3, PTD1, PTC2, "sd");
|
|||
#elif defined(TARGET_nRF51822)
|
||||
SDFileSystem sd(p12, p13, p15, p14, "sd");
|
||||
|
||||
#elif defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_L152RE) || \
|
||||
#elif defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F091RC) || \
|
||||
defined(TARGET_NUCLEO_F103RB) || \
|
||||
defined(TARGET_NUCLEO_F302R8) || \
|
||||
defined(TARGET_NUCLEO_F030R8) || \
|
||||
defined(TARGET_NUCLEO_F303RE) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_F401RE) || \
|
||||
defined(TARGET_NUCLEO_F411RE) || \
|
||||
defined(TARGET_NUCLEO_F072RB) || \
|
||||
defined(TARGET_NUCLEO_F334R8) || \
|
||||
defined(TARGET_NUCLEO_L053R8)
|
||||
defined(TARGET_NUCLEO_L053R8) || \
|
||||
defined(TARGET_NUCLEO_L152RE)
|
||||
SDFileSystem sd(D11, D12, D13, D10, "sd");
|
||||
|
||||
#elif defined(TARGET_DISCO_F051R8)
|
||||
|
|
|
@ -3,11 +3,7 @@
|
|||
DigitalOut led1(LED1);
|
||||
DigitalOut led2(LED2);
|
||||
|
||||
#ifndef TARGET_NUCLEO_F103RB
|
||||
Serial computer(USBTX, USBRX);
|
||||
#else
|
||||
Serial computer(SERIAL_TX, SERIAL_RX);
|
||||
#endif
|
||||
|
||||
// This function is called when a character goes into the TX buffer.
|
||||
void txCallback() {
|
||||
|
|
Loading…
Reference in New Issue