浏览代码

Merge pull request #37 from xxxajk/master

Addition to gitignore and  Fix Yield when no Serial on USB
main
Paul Stoffregen 10 年前
父节点
当前提交
7d51b56af0
共有 2 个文件被更改,包括 10 次插入7 次删除
  1. +7
    -0
      .gitignore
  2. +3
    -7
      teensy3/usb_serial.h

+ 7
- 0
.gitignore 查看文件

*.d *.d
*.hex *.hex
*.o *.o
nbproject
*~
*.bak
*.BAK
*.orig
*.tmp
*.TMP

+ 3
- 7
teensy3/usb_serial.h 查看文件

#ifndef USBserial_h_ #ifndef USBserial_h_
#define USBserial_h_ #define USBserial_h_


#if defined(USB_SERIAL) || defined(USB_SERIAL_HID)
#if (F_CPU >= 20000000) && (defined(USB_SERIAL) || defined(USB_SERIAL_HID))


#include <inttypes.h> #include <inttypes.h>


#if F_CPU >= 20000000

// C language implementation // C language implementation
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif // __cplusplus #endif // __cplusplus




#else // F_CPU < 20 MHz
#else // F_CPU < 20 MHz && !(USB_SERIAL || USB_SERIAL_HID)


// Allow Arduino programs using Serial to compile, but Serial will do nothing. // Allow Arduino programs using Serial to compile, but Serial will do nothing.
#ifdef __cplusplus #ifdef __cplusplus
extern void serialEvent(void); extern void serialEvent(void);
#endif // __cplusplus #endif // __cplusplus


#endif // F_CPU

#endif // USB_SERIAL || USB_SERIAL_HID
#endif // F_CPU && USB_SERIAL || USB_SERIAL_HID


#endif // USBserial_h_ #endif // USBserial_h_

正在加载...
取消
保存