Skip to content

Mbed 6.4.0+rebase #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 15 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions cores/arduino/Arduino.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
#define F Mbed_F
#endif // !ARDUINO_AS_MBED_LIBRARY
#include "mbed_config.h"
#include "mbed/drivers/InterruptIn.h"
#include "mbed/drivers/PwmOut.h"
#include "mbed/drivers/AnalogIn.h"
#include "mbed/drivers/DigitalInOut.h"
#include "drivers/InterruptIn.h"
#include "drivers/PwmOut.h"
#include "drivers/AnalogIn.h"
#include "drivers/DigitalInOut.h"
#include "mbed.h"
#undef F
#endif //__cplusplus
Expand Down
2 changes: 1 addition & 1 deletion cores/arduino/Serial.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "api/RingBuffer.h"
#include "Arduino.h"
#include "api/HardwareSerial.h"
#include "mbed/drivers/UnbufferedSerial.h"
#include "drivers/UnbufferedSerial.h"

#ifdef __cplusplus

Expand Down
2 changes: 1 addition & 1 deletion cores/arduino/USB/PluggableUSBSerial.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "Arduino.h"
#include "USBCDC.h"
#include "platform/Stream.h"
#include "mbed/rtos/rtos.h"
#include "rtos/rtos.h"
#include "Callback.h"

/**
Expand Down
3 changes: 3 additions & 0 deletions cores/arduino/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ int main(void)
init();
initVariant();

// we are never going to use getchar/scanf directly
mbed::mbed_file_handle(STDIN_FILENO)->enable_input(false);

#if defined(SERIAL_CDC)
PluggableUSBD().begin();
SerialUSB.begin(115200);
Expand Down
Loading