Parcourir la source

remove extraneous includes from WProgram.h

since 'Serial' is faked as USB Serial, only usb_serial.h is needed here
to "trick" dependent libraries. including the other usb headers there
just adds bloat to an already overbloated header (ala typical
Arduino-style includes)
main
John Robinson il y a 3 ans
Parent
révision
8f36ef9e96
Aucune clé connue n'a été trouvée dans la base pour cette signature
5 fichiers modifiés avec 5 ajouts et 15 suppressions
  1. +2
    -2
      include/core/Arduino.h
  2. +0
    -13
      include/core/WProgram.h
  3. +1
    -0
      src/core/Tone.cpp
  4. +1
    -0
      src/core/usb_inst.cpp
  5. +1
    -0
      src/core/yield.cpp

+ 2
- 2
include/core/Arduino.h Voir le fichier

@@ -3,7 +3,7 @@
#ifndef Arduino_h
#define Arduino_h

#include "core/WProgram.h"
#include "core/pins_arduino.h"
#include "./WProgram.h"
#include "./pins_arduino.h"

#endif

+ 0
- 13
include/core/WProgram.h Voir le fichier

@@ -49,22 +49,9 @@

#include "core/avr_emulation.h"
#include "core/usb_serial.h"
#include "core/usb_seremu.h"
#include "core/usb_keyboard.h"
#include "core/usb_mouse.h"
#include "core/usb_joystick.h"
#include "core/usb_midi.h"
#include "core/usb_rawhid.h"
#include "core/usb_flightsim.h"
//#include "core/usb_mtp.h"
#include "core/usb_audio.h"
#include "core/usb_touch.h"
//#include "core/usb_undef.h" // do not allow usb_desc.h stuff to leak to user programs

#include "core/WCharacter.h"
#include "core/WString.h"
#include "core/elapsedMillis.h"
#include "core/IntervalTimer.h"

uint16_t makeWord(uint16_t w);
uint16_t makeWord(byte h, byte l);

+ 1
- 0
src/core/Tone.cpp Voir le fichier

@@ -29,6 +29,7 @@
*/

#include <core/Arduino.h>
#include <core/IntervalTimer.h>

// IntervalTimer based tone. This allows tone() to share the timers with other
// libraries, rather than permanently hogging one PIT timer even for projects

+ 1
- 0
src/core/usb_inst.cpp Voir le fichier

@@ -30,6 +30,7 @@

#include <core/Arduino.h>
#include "core/usb_desc.h"
#include "core/usb_serial.h"

#if F_CPU >= 20000000


+ 1
- 0
src/core/yield.cpp Voir le fichier

@@ -30,6 +30,7 @@

#include <core/Arduino.h>
#include "core/EventResponder.h"
#include "core/usb_serial.h"

#ifdef USB_TRIPLE_SERIAL
uint8_t yield_active_check_flags = YIELD_CHECK_USB_SERIAL | YIELD_CHECK_USB_SERIALUSB1 | YIELD_CHECK_USB_SERIALUSB2; // default to check USB.

Chargement…
Annuler
Enregistrer