Test program running on MAX32625MBED. Control through USB Serial commands using a terminal emulator such as teraterm or putty.
Dependencies: MaximTinyTester MAX11131 CmdLine MAX541 USBDevice
Diff: main.cpp
- Revision:
- 8:132276960128
- Parent:
- 7:eb54828e501b
- Child:
- 9:32f27a0857bf
--- a/main.cpp Thu Jun 20 22:03:03 2019 +0000 +++ b/main.cpp Thu Jun 20 22:48:54 2019 +0000 @@ -240,7 +240,7 @@ // LED1 is shared with SPI_SCK on NUCLEO_F446RE PA_5, so don't use LED1. #define USE_LEDS 0 // SPI spi(SPI_MOSI, SPI_MISO, SPI_SCK); -// Serial microUSBserial(SERIAL_TX, SERIAL_RX); +// Serial serial(SERIAL_TX, SERIAL_RX); #define analogIn4_IS_HIGH_RANGE_OF_analogIn0 0 const float ADC_FULL_SCALE_VOLTAGE = 3.300; // TODO: ADC_FULL_SCALE_VOLTAGE Pico? // @@ -658,8 +658,7 @@ #define HAS_DAPLINK_SERIAL 1 // Virtual serial port over USB // The baud rate does not affect the virtual USBSerial UART. -USBSerial microUSBserial; - #define HAS_MICROUSBSERIAL 1 +USBSerial serial; //-------------------------------------------------- #elif defined(TARGET_MAX32625MBED) #include "USBSerial.h" @@ -669,17 +668,14 @@ #define HAS_DAPLINK_SERIAL 1 // Virtual serial port over USB // The baud rate does not affect the virtual USBSerial UART. -USBSerial microUSBserial; - #define HAS_MICROUSBSERIAL 1 +USBSerial serial; //-------------------------------------------------- #elif defined(TARGET_NUCLEO_F446RE) || defined(TARGET_NUCLEO_F401RE) -Serial microUSBserial(SERIAL_TX, SERIAL_RX); // tx, rx - #define HAS_MICROUSBSERIAL 1 +Serial serial(SERIAL_TX, SERIAL_RX); // tx, rx //-------------------------------------------------- // TODO1: TARGET=MAX32625MBED ARM Cortex-M4F 96MHz 512kB Flash 160kB SRAM #elif defined(TARGET_LPC1768) -Serial microUSBserial(USBTX, USBRX); // tx, rx - #define HAS_MICROUSBSERIAL 1 +Serial serial(USBTX, USBRX); // tx, rx #else // unknown target #endif @@ -693,11 +689,7 @@ # if HAS_DAPLINK_SERIAL CmdLine cmdLine_DAPLINKserial(DAPLINKserial, "DAPLINK"); # endif // HAS_DAPLINK_SERIAL -// TODO1: diagnostic: define HAS_MICROUSBSERIAL 0 -//~ #define HAS_MICROUSBSERIAL 0 -# if HAS_MICROUSBSERIAL -CmdLine cmdLine_microUSBserial(microUSBserial, "microUSB"); -# endif // HAS_MICROUSBSERIAL +CmdLine cmdLine_serial(serial, "serial"); //-------------------------------------------------- @@ -1883,27 +1875,25 @@ DAPLINKserial.printf(" DAPLINKserial\r\n"); #endif // HAS_DAPLINK_SERIAL -#if HAS_MICROUSBSERIAL - microUSBserial.printf("\r\n"); + serial.printf("\r\n"); # if defined(TARGET_MAX32630) - microUSBserial.printf("MAX32630"); + serial.printf("MAX32630"); # elif defined(TARGET_MAX32625MBED) - microUSBserial.printf("MAX32625MBED"); + serial.printf("MAX32625MBED"); # elif defined(TARGET_NUCLEO_F446RE) - microUSBserial.printf("NUCLEO_F446RE"); + serial.printf("NUCLEO_F446RE"); # elif defined(TARGET_NUCLEO_F401RE) - microUSBserial.printf("NUCLEO_F401RE"); + serial.printf("NUCLEO_F401RE"); # elif defined(TARGET_LPC1768) - microUSBserial.printf("LPC1768"); + serial.printf("LPC1768"); # else // unknown target - microUSBserial.printf("unknownTarget"); + serial.printf("unknownTarget"); # endif - microUSBserial.printf(" microUSBserial\r\n"); -#endif // HAS_MICROUSBSERIAL + serial.printf(" Tester\r\n"); } -// DigitalInOut pin resource: print the pin index names to microUSBserial +// DigitalInOut pin resource: print the pin index names to serial #if HAS_digitalInOuts void list_digitalInOutPins(Stream& serialStream) { @@ -2089,7 +2079,7 @@ } #endif -// AnalogIn pin resource: print the pin index names to microUSBserial +// AnalogIn pin resource: print the pin index names to serial #if HAS_analogIns void list_analogInPins(Stream& serialStream) { @@ -2477,7 +2467,7 @@ # if HAS_DAPLINK_SERIAL DAPLINKserial.printf(" Timer Enable %d us\r\n", periodicInterruptTimer_interval_usec); # endif - microUSBserial.printf(" Timer Enable %d us", periodicInterruptTimer_interval_usec); + serial.printf(" Timer Enable %d us", periodicInterruptTimer_interval_usec); periodicInterruptTimer.attach_us(&onTimerTick, periodicInterruptTimer_interval_usec); // -- periodicInterruptTimer.attach(&onTimerTick, interval_sec); // the address of the function to be attached (onTimerTick) and the interval (2 seconds) // -- periodicInterruptTimer.attach_us(&onTimerTick, interval_usec); // the address of the function to be attached (onTimerTick) and the interval (2 seconds) @@ -2494,7 +2484,7 @@ # if HAS_DAPLINK_SERIAL DAPLINKserial.printf(" Timer Disable\r\n"); # endif - microUSBserial.printf(" Timer Disable "); + serial.printf(" Timer Disable "); periodicInterruptTimer.detach(); // Detach the function } #endif @@ -2529,11 +2519,7 @@ //~ ThisThread::sleep_for(250); // [since mbed-os-5.10] vs Thread::wait(250); //~ rgb_led.yellow(); // diagnostic rbg led RED+GREEN=YELLOW -#if HAS_MICROUSBSERIAL - SelfTest(cmdLine_microUSBserial); -#elif HAS_DAPLINK_SERIAL - SelfTest(cmdLine_DAPLINKserial); -#endif + SelfTest(cmdLine_serial); #if 0 // APPLICATION_MAX5715 // onButton1FallingEdge BUTTON1 demo configuration MAX5715BOB //~ cmdLine.serial().printf("MAX5715_REF(REF_AlwaysOn_2V500)"); @@ -4014,7 +4000,7 @@ DigitalInOut& digitalInOutPin = find_digitalInOutPin(pinIndex); digitalInOutPin.input(); #endif - microUSBserial.printf(" digitalInOutPin %d Input ", pinIndex); + serial.printf(" digitalInOutPin %d Input ", pinIndex); #if ARDUINO_STYLE int value = digitalRead(pinIndex); #else @@ -5976,25 +5962,19 @@ # if HAS_DAPLINK_SERIAL cmdLine_DAPLINKserial.serial().printf("\r\nMAX5715_Init()"); # endif -# if HAS_MICROUSBSERIAL - cmdLine_microUSBserial.serial().printf("\r\nMAX5715_Init()"); -# endif + cmdLine_serial.serial().printf("\r\nMAX5715_Init()"); int initResult = g_MAX5715_device.Init(); // defined in #include MAX5715.h # if HAS_DAPLINK_SERIAL cmdLine_DAPLINKserial.serial().printf("\r\nMAX5715_Init() returned %d\r\n", initResult); # endif -# if HAS_MICROUSBSERIAL - cmdLine_microUSBserial.serial().printf("\r\nMAX5715_Init() returned %d\r\n", initResult); -# endif + cmdLine_serial.serial().printf("\r\nMAX5715_Init() returned %d\r\n", initResult); #endif // APPLICATION_MAX5715 #if APPLICATION_MAX11131 // InitializeConfiguration # if HAS_DAPLINK_SERIAL cmdLine_DAPLINKserial.serial().printf("\r\nMAX11131_Init()"); # endif -# if HAS_MICROUSBSERIAL - cmdLine_microUSBserial.serial().printf("\r\nMAX11131_Init()"); -# endif + cmdLine_serial.serial().printf("\r\nMAX11131_Init()"); g_MAX11131_device.Init(); // defined in #include MAX11131.h #endif // APPLICATION_MAX11131 @@ -6002,48 +5982,36 @@ # if HAS_DAPLINK_SERIAL cmdLine_DAPLINKserial.serial().printf("\r\nMAX5171_Init()"); # endif -# if HAS_MICROUSBSERIAL - cmdLine_microUSBserial.serial().printf("\r\nMAX5171_Init()"); -# endif + cmdLine_serial.serial().printf("\r\nMAX5171_Init()"); int initResult = g_MAX5171_device.Init(); // defined in #include MAX5171.h # if HAS_DAPLINK_SERIAL cmdLine_DAPLINKserial.serial().printf("\r\nMAX5171_Init() returned %d\r\n", initResult); # endif -# if HAS_MICROUSBSERIAL - cmdLine_microUSBserial.serial().printf("\r\nMAX5171_Init() returned %d\r\n", initResult); -# endif + cmdLine_serial.serial().printf("\r\nMAX5171_Init() returned %d\r\n", initResult); #endif // APPLICATION_MAX5171 #if APPLICATION_MAX11410 // InitializeConfiguration # if HAS_DAPLINK_SERIAL cmdLine_DAPLINKserial.serial().printf("\r\nMAX11410_Init()"); # endif -# if HAS_MICROUSBSERIAL - cmdLine_microUSBserial.serial().printf("\r\nMAX11410_Init()"); -# endif + cmdLine_serial.serial().printf("\r\nMAX11410_Init()"); int initResult = g_MAX11410_device.Init(); // defined in #include MAX11410.h # if HAS_DAPLINK_SERIAL cmdLine_DAPLINKserial.serial().printf("\r\nMAX11410_Init() returned %d\r\n", initResult); # endif -# if HAS_MICROUSBSERIAL - cmdLine_microUSBserial.serial().printf("\r\nMAX11410_Init() returned %d\r\n", initResult); -# endif + cmdLine_serial.serial().printf("\r\nMAX11410_Init() returned %d\r\n", initResult); #endif // APPLICATION_MAX11410 #if APPLICATION_MAX12345 // InitializeConfiguration # if HAS_DAPLINK_SERIAL cmdLine_DAPLINKserial.serial().printf("\r\nMAX12345_Init()"); # endif -# if HAS_MICROUSBSERIAL - cmdLine_microUSBserial.serial().printf("\r\nMAX12345_Init()"); -# endif + cmdLine_serial.serial().printf("\r\nMAX12345_Init()"); int initResult = MAX12345_Init(); // defined in #include MAX12345.h # if HAS_DAPLINK_SERIAL cmdLine_DAPLINKserial.serial().printf("\r\nMAX12345_Init() returned %d\r\n", initResult); # endif -# if HAS_MICROUSBSERIAL - cmdLine_microUSBserial.serial().printf("\r\nMAX12345_Init() returned %d\r\n", initResult); -# endif + cmdLine_serial.serial().printf("\r\nMAX12345_Init() returned %d\r\n", initResult); #endif // APPLICATION_MAX12345 } @@ -6105,7 +6073,7 @@ #if defined(TARGET_MAX32630) // Note: DAPLINKserial interferes with the timer tick interrupt. Try faster baud rate? DAPLINKserial.baud(115200); // default 9600 baud - //microUSBserial.baud(9600); // class USBSerial has no baud function + //serial.baud(9600); // class USBSerial has no baud function # if HAS_DAPLINK_SERIAL DAPLINKserial.printf("\r\n\r\nDAPLINK_SERIAL: main() startup\r\n"); # endif @@ -6113,25 +6081,23 @@ #elif defined(TARGET_MAX32625MBED) // MAX32625MBED crash if DAPLINKserial.baud(anything other than 9600 baud) // xxx DAPLINKserial.baud(115200); // default 9600 baud - //microUSBserial.baud(9600); // class USBSerial has no baud function + //serial.baud(9600); // class USBSerial has no baud function # if HAS_DAPLINK_SERIAL DAPLINKserial.printf("\r\n\r\nDAPLINK_SERIAL: main() startup\r\n"); # endif //-------------------------------------------------- #elif defined(TARGET_LPC1768) - microUSBserial.baud(115200); // default 9600 baud + serial.baud(115200); // default 9600 baud #else // unknown target #endif -# if HAS_MICROUSBSERIAL - cmdLine_microUSBserial.clear(); - //~ cmdLine_microUSBserial.serial().printf("\r\n cmdLine_microUSBserial.serial().printf test\r\n"); - cmdLine_microUSBserial.onEOLcommandParser = main_menu_onEOLcommandParser; + cmdLine_serial.clear(); + //~ cmdLine_serial.serial().printf("\r\n cmdLine_serial.serial().printf test\r\n"); + cmdLine_serial.onEOLcommandParser = main_menu_onEOLcommandParser; /// @todo CmdLine::set_immediate_handler(char, functionPointer_void_void_on_immediate_0x21); - cmdLine_microUSBserial.on_immediate_0x21 = on_immediate_0x21; - cmdLine_microUSBserial.on_immediate_0x7b = on_immediate_0x7b; - cmdLine_microUSBserial.on_immediate_0x7d = on_immediate_0x7d; -# endif + cmdLine_serial.on_immediate_0x21 = on_immediate_0x21; + cmdLine_serial.on_immediate_0x7b = on_immediate_0x7b; + cmdLine_serial.on_immediate_0x7d = on_immediate_0x7d; # if HAS_DAPLINK_SERIAL cmdLine_DAPLINKserial.clear(); //~ cmdLine_DAPLINKserial.serial().printf("\r\n cmdLine_DAPLINKserial.serial().printf test\r\n"); @@ -6315,10 +6281,9 @@ cmdLine_DAPLINKserial.append(DAPLINKserial.getc()); } # endif // HAS_DAPLINK_SERIAL - # if HAS_MICROUSBSERIAL - if (microUSBserial.readable()) { - int c = microUSBserial.getc(); - cmdLine_microUSBserial.append(c); + if (serial.readable()) { + int c = serial.getc(); + cmdLine_serial.append(c); #if IGNORE_AT_COMMANDS # if HAS_DAPLINK_SERIAL cmdLine_DAPLINKserial.serial().printf("%c", c); @@ -6326,6 +6291,5 @@ #endif // IGNORE_AT_COMMANDS // } - # endif // HAS_MICROUSBSERIAL } // while(1) }