#define FTM_CONF_BDMMODE (((n) & 3) << 6) // Behavior when in debug mode
#define FTM_CONF_NUMTOF (((n) & 31) << 0) // ratio of counter overflows#define FTM_CONF_BDMMODE(n) (((n) & 3) << 6) // Behavior when in debug mode
#define FTM_CONF_NUMTOF(n) (((n) & 31) << 0) // ratio of counter overflowsindex 248cb1e..8508e85 100644
--- a/hardware/teensy/boards.txt
+++ b/hardware/teensy/boards.txt
@@ -146,6 +146,7 @@ teensy3.build.option3=-D__MK20DX128__
teensy3.build.option4=-DTEENSYDUINO=120
teensy3.build.cppoption1=-fno-rtti
teensy3.build.linkoption1=-mthumb
+teensy3.build.linkoption2=-Wl,-Map,map.out
teensy3.build.additionalobject1=-larm_cortexM4l_math
teensy3.build.linkscript=mk20dx128.ld
teensy3.build.architecture=arm-none-eabi
@@ -162,6 +163,8 @@ teensy3.build.dependency=true
teensy3.build.time_t=true
#teensy3.build.linker_relaxation=true
teensy3.build.post_compile_script=teensy_post_compile
+teensy3.menu.usb.none.name=None
+teensy3.menu.usb.none.build.define0=-DUSB_NONE
teensy3.menu.usb.serial.name=Serial
teensy3.menu.usb.serial.build.define0=-DUSB_SERIAL
teensy3.menu.usb.hid.name=Keyboard + Mouse + Joystick
diff --git a/hardware/teensy/cores/teensy3/usb_desc.h b/hardware/teensy/cores/teensy3/usb_desc.h
index c3cf15c..f1240e6 100644
--- a/hardware/teensy/cores/teensy3/usb_desc.h
+++ b/hardware/teensy/cores/teensy3/usb_desc.h
@@ -83,7 +83,27 @@ let me know? http://forum.pjrc.com/forums/4-Suggestions-amp-Bug-Reports
-#if defined(USB_SERIAL)
+#if defined(USB_NONE)
+ #define VENDOR_ID 0x16C0
+ #define PRODUCT_ID 0x0483
+ #define MANUFACTURER_NAME {'T','e','e','n','s','y','d','u','i','n','o'}
+ #define MANUFACTURER_NAME_LEN 11
+ #define PRODUCT_NAME {'U','S','B',' ','F','l','a','s','h'}
+ #define PRODUCT_NAME_LEN 9
+ #define EP0_SIZE 8
+ #define NUM_ENDPOINTS 0
+ #define NUM_USB_BUFFERS 0
+ #define NUM_INTERFACE 2
+ #define CDC_STATUS_INTERFACE 0
+ #define CDC_DATA_INTERFACE 1
+ #define CDC_ACM_ENDPOINT 2
+ #define CDC_RX_ENDPOINT 3
+ #define CDC_TX_ENDPOINT 4
+ #define CDC_ACM_SIZE 16
+ #define CDC_RX_SIZE 64
+ #define CDC_TX_SIZE 64
+ #define CONFIG_DESC_SIZE (9+9+5+5+4+5+7+9+7+7)
+#elif defined(USB_SERIAL)
#define VENDOR_ID 0x16C0
#define PRODUCT_ID 0x0483
#define DEVICE_CLASS 2 // 2 = Communication Class
diff --git a/hardware/teensy/cores/teensy3/yield.cpp b/hardware/teensy/cores/teensy3/yield.cpp
index 55e7d29..16ae996 100644
--- a/hardware/teensy/cores/teensy3/yield.cpp
+++ b/hardware/teensy/cores/teensy3/yield.cpp
@@ -40,7 +40,9 @@ void yield(void)
if (running) return; // TODO: does this need to be atomic?
running = 1;
+#ifdef USB_SERIAL
if (Serial.available()) serialEvent();
+#endif
if (Serial1.available()) serialEvent1();
if (Serial2.available()) serialEvent2();
if (Serial3.available()) serialEvent3();diff --git a/hardware/teensy/cores/teensy3/mk20dx128.c b/hardware/teensy/cores/teensy3/mk20dx128.c
index d9a751f..04abe32 100644
--- a/hardware/teensy/cores/teensy3/mk20dx128.c
+++ b/hardware/teensy/cores/teensy3/mk20dx128.c
@@ -407,9 +407,13 @@ void ResetHandler(void)
while (dest < &_ebss) *dest++ = 0;
// default all interrupts to medium priority level
+#if defined(STATIC_VECTOR_TABLE)
+ SCB_VTOR = (uint32_t)_VectorsFlash; // use vector table in FLASH
+#else
for (i=0; i < NVIC_NUM_INTERRUPTS + 16; i++) _VectorsRam[i] = _VectorsFlash[i];
- for (i=0; i < NVIC_NUM_INTERRUPTS; i++) NVIC_SET_PRIORITY(i, 128);
SCB_VTOR = (uint32_t)_VectorsRam; // use vector table in RAM
+#endif
+ for (i=0; i < NVIC_NUM_INTERRUPTS; i++) NVIC_SET_PRIORITY(i, 128);
// hardware always starts in FEI mode
// C1[CLKS] bits are written to 00
)char tempBuffer[100] = {0};
const int MaxInput = 10;
elapsedMillis hBeat; // "waiting" starts at zero
// ---------------------------------------------------------------------------
void setup()
// ---------------------------------------------------------------------------
{
Serial.begin(115200);
while (!Serial); // wait for connection to terminal emulator
Serial.println("Enter something");
}
// ---------------------------------------------------------------------------
void loop()
// ---------------------------------------------------------------------------
{
if (hBeat >= 1000)
{
Serial.println(".");
hBeat = 0; // reset count
}
}
// ---------------------------------------------------------------------------
void serialEvent()
// ---------------------------------------------------------------------------
{
static unsigned int input_pos = 0;
//Serial.println("+"); // debug so we know this has been called
while (Serial.available())
{
char inByte = (char)Serial.read();
switch (inByte)
{
case '\n': // end of text
tempBuffer [input_pos] = 0; // terminating null byte
Serial.println(tempBuffer);
input_pos = 0;
break;
default:
// only allow alphabet and punctuation chrs
if (inByte >= 32 && inByte <= 126)
{
// keep adding if not full ... allow for terminating null byte
if (input_pos < (MaxInput - 1)) tempBuffer[input_pos++] = inByte;
} // end if((inByte ....
break;
}
}
}static inline uint32_t sl_hw_lock(void) __attribute__((always_inline, unused));
static inline void sl_hw_unlock(uint32_t primask) __attribute__((always_inline,
unused));
/**
* Lock interrupts to start a critical section.
*
* When used with sl_hw_unlock() this function starts a critical section that
* works properly even if nested in another critical section because it reads
* the PRIMASK value so it can be restored.
*
* @return the priority mask (PRIMASK) register value upon entry
*/
static inline uint32_t
sl_hw_lock(void)
{
uint32_t primask;
asm volatile("mrs %0, primask\n" : "=r" (primask)::);
__disable_irq();
return primask;
}
/**
* Unlock interrupts to end a critical section.
*
* When used with sl_hw_lock() this function ends a critical section that works
* properly even if nested in another critical section because it uses the
* previous interrupt locking state (defined by PRIMASK) to selectively unlock
* interrupts.
*
* @param primask The previous priority mask (PRIMASK) register value as
* returned by sl_hw_lock().
*/
static inline void
sl_hw_unlock(uint32_t primask)
{
if (primask == 0) {
__enable_irq();
}
}
char tempBuffer[100] = {0};
const int MaxInput = 10;
long prevMillis = 0;
int loopDelay = 1000;
// ---------------------------------------------------------------------------
void setup()
// ---------------------------------------------------------------------------
{
Serial.begin(115200);
while (!Serial); // wait for connection to terminal emulator
Serial.println("Enter something");
}
// ---------------------------------------------------------------------------
void loop()
// ---------------------------------------------------------------------------
{
if (millis() > prevMillis + loopDelay)
{
prevMillis = millis(); // reset count
Serial.println(".");
}
}
// ---------------------------------------------------------------------------
void serialEvent()
// ---------------------------------------------------------------------------
{
static unsigned int input_pos = 0;
//Serial.println("+"); // debug so we know this has been called
while (Serial.available())
{
char inByte = (char)Serial.read();
switch (inByte)
{
case '\n': // end of text
tempBuffer [input_pos] = 0; // terminating null byte
Serial.println(tempBuffer);
input_pos = 0;
break;
default:
// only allow alphabet and punctuation chrs
if (inByte >= 32 && inByte <= 126)
{
// keep adding if not full ... allow for terminating null byte
if (input_pos < (MaxInput - 1)) tempBuffer[input_pos++] = inByte;
} // end if((inByte ....
break;
}
}
}