visus
/
teensy-core-4.1
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

More defs

teensy4-core
PaulStoffregen 9 years ago
parent
d54debdb91
commit
e0dd146824
9 changed files with 23 additions and 23 deletions
Split View Show Diff Stats
  1. +1
    -1
      teensy3/WProgram.h
  2. +2
    -2
      teensy3/analog.c
  3. +2
    -2
      teensy3/avr_emulation.h
  4. +3
    -3
      teensy3/core_pins.h
  5. +1
    -1
      teensy3/kinetis.h
  6. +1
    -1
      teensy3/memcpy-armv7m.S
  7. +2
    -2
      teensy3/mk20dx128.c
  8. +2
    -2
      teensy3/pins_arduino.h
  9. +9
    -9
      teensy3/pins_teensy.c

+ 1
- 1
teensy3/WProgram.h View File

@@ -61,7 +61,7 @@ long map(long, long, long, long, long);


// Fast memcpy
#if defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK66FX1M0__)
#if defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)
#ifdef __cplusplus
extern "C" {
extern void *memcpy (void *dst, const void *src, size_t count);

+ 2
- 2
teensy3/analog.c View File

@@ -31,7 +31,7 @@
#include "core_pins.h"
//#include "HardwareSerial.h"

#if defined(__MK66FX1M0__) // ugly hack for now...
#if defined(__MK64FX512__) || defined(__MK66FX1M0__) // ugly hack for now...
#define __MK20DX256__
#endif

@@ -516,7 +516,7 @@ void analogWriteDAC0(int val)
}


#if defined(__MK66FX1M0__)
#if defined(__MK64FX512__) || defined(__MK66FX1M0__)
void analogWriteDAC1(int val)
{
SIM_SCGC2 |= SIM_SCGC2_DAC1;

+ 2
- 2
teensy3/avr_emulation.h View File

@@ -1479,7 +1479,7 @@ extern SREGemulation SREG;
// 84062840
// 322111
// 17395173
#if defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK66FX1M0__)
#if defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)

#if defined(__MK20DX128__) || defined(__MK20DX256__)
#define EIMSK_pA 0x01000018 // pins 3, 4, 24
@@ -1487,7 +1487,7 @@ extern SREGemulation SREG;
#define EIMSK_pC 0x78C0BE00 // pins 9-13, 15, 22, 23, 27-30
#define EIMSK_pD 0x003041E4 // pins 2, 5-8, 14, 20, 21
#define EIMSK_pE 0x84000000 // pins 26, 31
#elif defined(__MK66FX1M0__)
#elif defined(__MK64FX512__) || defined(__MK66FX1M0__)
#define EIMSK_pA 0x1E000018 // pins 3, 4, 25-28
#define EIMSK_pB 0xE00F0003 // pins 0, 1, 16-19, 29-31
#define EIMSK_pC 0x00C0BE00 // pins 9-13, 15, 22, 23

+ 3
- 3
teensy3/core_pins.h View File

@@ -111,7 +111,7 @@
#define CORE_NUM_INTERRUPT 24 // really only 18, but 6 "holes"
#define CORE_NUM_ANALOG 13
#define CORE_NUM_PWM 10
#elif defined(__MK66FX1M0__)
#elif defined(__MK64FX512__) || defined(__MK66FX1M0__)
#define CORE_NUM_TOTAL_PINS 40
#define CORE_NUM_DIGITAL 40
#define CORE_NUM_INTERRUPT 40
@@ -727,7 +727,7 @@
#define CORE_INT23_PIN 23


#elif defined(__MK66FX1M0__)
#elif defined(__MK64FX512__) || defined(__MK66FX1M0__)

#define CORE_PIN0_BIT 16
#define CORE_PIN1_BIT 17
@@ -1462,7 +1462,7 @@ void analogReadAveraging(unsigned int num);
void analog_init(void);


#if defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK66FX1M0__)
#if defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)
#define DEFAULT 0
#define INTERNAL 2
#define INTERNAL1V2 2

+ 1
- 1
teensy3/kinetis.h View File

@@ -743,7 +743,7 @@ enum IRQ_NUMBER_t {

#if (F_CPU == 192000000)
#define F_PLL 192000000
#define F_BUS 64000000
#define F_BUS 48000000
#define F_MEM 27428571
#elif (F_CPU == 180000000)
#define F_PLL 180000000

+ 1
- 1
teensy3/memcpy-armv7m.S View File

@@ -26,7 +26,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#if defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK66FX1M0__)
#if defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)
#if defined (__ARM_ARCH_7M__) || defined (__ARM_ARCH_7EM__)
#define __ARM_FEATURE_UNALIGNED 1

+ 2
- 2
teensy3/mk20dx128.c View File

@@ -877,9 +877,9 @@ void ResetHandler(void)
#endif
// now program the clock dividers
#if F_CPU == 192000000
// config divisors: 192 MHz core, 64 MHz bus, 27.4 MHz flash, USB = 192 * 4
// config divisors: 192 MHz core, 48 MHz bus, 27.4 MHz flash, USB = 192 * 4
// TODO: gradual ramp-up for HSRUN mode
SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIV1(0) | SIM_CLKDIV1_OUTDIV2(2) | SIM_CLKDIV1_OUTDIV4(6);
SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIV1(0) | SIM_CLKDIV1_OUTDIV2(3) | SIM_CLKDIV1_OUTDIV4(6);
SIM_CLKDIV2 = SIM_CLKDIV2_USBDIV(3);
#elif F_CPU == 180000000
// config divisors: 180 MHz core, 60 MHz bus, 25.7 MHz flash, USB = not feasible

+ 2
- 2
teensy3/pins_arduino.h View File

@@ -65,7 +65,7 @@ const static uint8_t A20 = 31;
const static uint8_t A10 = 24;
const static uint8_t A11 = 25;
const static uint8_t A12 = 26;
#elif defined(__MK66FX1M0__)
#elif defined(__MK64FX512__) || defined(__MK66FX1M0__)
const static uint8_t A10 = 40;
const static uint8_t A11 = 41;
const static uint8_t A12 = 31;
@@ -109,7 +109,7 @@ const static uint8_t SCL = 19;
#define analogInputToDigitalPin(p) (((p) <= 9) ? (p) + 14 : (((p) <= 12) ? (p) + 14 : -1))
#define digitalPinHasPWM(p) ((p) == 3 || (p) == 4 || (p) == 6 || (p) == 9 || (p) == 10 || (p) == 16 || (p) == 17 || (p) == 20 || (p) == 22 || (p) == 23)
#define digitalPinToInterrupt(p) ((((p) >= 2 && (p) <= 15) || ((p) >= 20 && (p) <= 23)) ? (p) : -1)
#elif defined(__MK66FX1M0__)
#elif defined(__MK64FX512__) || defined(__MK66FX1M0__)
#define analogInputToDigitalPin(p) (((p) <= 9) ? (p) + 14 : (((p) >= 12 && (p) <= 20) ? (p) + 19 : -1))
#define digitalPinHasPWM(p) (((p) >= 2 && (p) <= 10) || (p) == 14 || ((p) >= 20 && (p) <= 23) || (p) == 29 || (p) == 30 || ((p) >= 35 && (p) <= 38))
#define digitalPinToInterrupt(p) ((p) < NUM_DIGITAL_PINS ? (p) : -1)

+ 9
- 9
teensy3/pins_teensy.c View File

@@ -284,7 +284,7 @@ static void portcd_interrupt(void)
if ((isfr & CORE_PIN21_BITMASK) && intFunc[21]) intFunc[21]();
}

#elif defined(__MK66FX1M0__)
#elif defined(__MK64FX512__) || defined(__MK66FX1M0__)

static void porta_interrupt(void)
{
@@ -360,7 +360,7 @@ static void porte_interrupt(void)
#endif


#if defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK66FX1M0__)
#if defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)

unsigned long rtc_get(void)
{
@@ -516,7 +516,7 @@ extern void usb_init(void);
//void init_pins(void)
void _init_Teensyduino_internal_(void)
{
#if defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK66FX1M0__)
#if defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)
NVIC_ENABLE_IRQ(IRQ_PORTA);
NVIC_ENABLE_IRQ(IRQ_PORTB);
NVIC_ENABLE_IRQ(IRQ_PORTC);
@@ -536,11 +536,11 @@ void _init_Teensyduino_internal_(void)
FTM0_C3SC = 0x28;
FTM0_C4SC = 0x28;
FTM0_C5SC = 0x28;
#if defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK66FX1M0__)
#if defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)
FTM0_C6SC = 0x28;
FTM0_C7SC = 0x28;
#endif
#if defined(__MK66FX1M0__)
#if defined(__MK64FX512__) || defined(__MK66FX1M0__)
FTM3_C0SC = 0x28;
FTM3_C1SC = 0x28;
FTM3_C2SC = 0x28;
@@ -556,14 +556,14 @@ void _init_Teensyduino_internal_(void)
FTM1_C0SC = 0x28;
FTM1_C1SC = 0x28;
FTM1_SC = FTM_SC_CLKS(1) | FTM_SC_PS(DEFAULT_FTM_PRESCALE);
#if defined(__MK20DX256__) || defined(__MK66FX1M0__) || defined(__MKL26Z64__)
#if defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__) || defined(__MKL26Z64__)
FTM2_CNT = 0;
FTM2_MOD = DEFAULT_FTM_MOD;
FTM2_C0SC = 0x28;
FTM2_C1SC = 0x28;
FTM2_SC = FTM_SC_CLKS(1) | FTM_SC_PS(DEFAULT_FTM_PRESCALE);
#endif
#if defined(__MK66FX1M0__)
#if defined(__MK64FX512__) || defined(__MK66FX1M0__)
FTM3_CNT = 0;
FTM3_MOD = DEFAULT_FTM_MOD;
FTM3_C0SC = 0x28;
@@ -613,7 +613,7 @@ void _init_Teensyduino_internal_(void)
#define FTM1_CH1_PIN 17
#define FTM2_CH0_PIN 3
#define FTM2_CH1_PIN 4
#elif defined(__MK66FX1M0__)
#elif defined(__MK64FX512__) || defined(__MK66FX1M0__)
#define FTM0_CH0_PIN 22
#define FTM0_CH1_PIN 23
#define FTM0_CH2_PIN 9
@@ -671,7 +671,7 @@ void analogWrite(uint8_t pin, int val)
analogWriteDAC0(val);
return;
}
#elif defined(__MK66FX1M0__)
#elif defined(__MK64FX512__) || defined(__MK66FX1M0__)
if (pin == A21 || pin == A22) {
uint8_t res = analog_write_res;
if (res < 12) {

Write Preview
Loading…
Cancel
Save