diff --git a/Debug/print/print.c b/Debug/print/print.c index 2952c14..04590ad 100644 --- a/Debug/print/print.c +++ b/Debug/print/print.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011 by Jacob Alexander +/* Copyright (C) 2011-2013 by Jacob Alexander * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -34,8 +34,17 @@ // USB HID String Output void usb_debug_putstr( char* s ) { +#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR while ( *s != '\0' ) usb_debug_putchar( *s++ ); +#elif defined(_mk20dx128_) // ARM + // Count characters until NULL character, then send the amount counted + uint32_t count = 0; + while ( s[count] != '\0' ) + count++; + + usb_serial_write( s, count ); +#endif } // Multiple string Output @@ -64,6 +73,7 @@ void usb_debug_putstrs( char* first, ... ) // Print a constant string void _print(const char *s) { +#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR char c; // Acquire the character from flash, and print it, as long as it's not NULL @@ -74,6 +84,9 @@ void _print(const char *s) usb_debug_putchar('\r'); usb_debug_putchar(c); } +#elif defined(_mk20dx128_) // ARM + usb_debug_putstr( (char*)s ); +#endif } diff --git a/Debug/print/print.h b/Debug/print/print.h index e5ba872..b67f920 100644 --- a/Debug/print/print.h +++ b/Debug/print/print.h @@ -32,7 +32,7 @@ #elif defined(_mk20dx128_) -#include "arm/usb_keyboard.h" +#include "arm/usb_serial.h" #endif diff --git a/Lib/MacroLib.h b/Lib/MacroLib.h index 9bf22a8..8b92489 100644 --- a/Lib/MacroLib.h +++ b/Lib/MacroLib.h @@ -24,11 +24,15 @@ // Additional includes should only be added to this file if they should be added to *all* Macro modules. -// ----- Includes ----- - #ifndef __MACROLIB_H #define __MACROLIB_H +// ----- Includes ----- + +#include + + + // ARM #if defined(_mk20dx128_) @@ -43,7 +47,6 @@ // AVR #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) -#include #include #endif diff --git a/Lib/MainLib.h b/Lib/MainLib.h index 9ccb7e3..b3aa20e 100644 --- a/Lib/MainLib.h +++ b/Lib/MainLib.h @@ -24,10 +24,14 @@ // Additional includes should only be added to this file if they should be added to *all* Scan modules. +#ifndef __MAINLIB_H +#define __MAINLIB_H + // ----- Includes ----- -#ifndef __MACROLIB_H -#define __MACROLIB_H +#include + + // ARM #if defined(_mk20dx128_) @@ -43,7 +47,6 @@ #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) #include -#include #endif diff --git a/Lib/ScanLib.h b/Lib/ScanLib.h index 5d6d6d6..d14b091 100644 --- a/Lib/ScanLib.h +++ b/Lib/ScanLib.h @@ -24,11 +24,15 @@ // Additional includes should only be added to this file if they should be added to *all* Scan modules. -// ----- Includes ----- - #ifndef __SCANLIB_H #define __SCANLIB_H +// ----- Includes ----- + +#include + + + // ARM #if defined(_mk20dx128_) @@ -43,7 +47,6 @@ // AVR #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) -#include #include #include diff --git a/Lib/USBLib.h b/Lib/USBLib.h index 7ebd034..59b837c 100644 --- a/Lib/USBLib.h +++ b/Lib/USBLib.h @@ -24,10 +24,10 @@ // Additional includes should only be added to this file if they should be added to *all* Scan modules. -// ----- Includes ----- +#ifndef __USBLIB_H +#define __USBLIB_H -#ifndef __MACROLIB_H -#define __MACROLIB_H +// ----- Includes ----- // ARM #if defined(_mk20dx128_) diff --git a/Macro/buffer/macro.c b/Macro/buffer/macro.c index e25b0c9..b7d645e 100644 --- a/Macro/buffer/macro.c +++ b/Macro/buffer/macro.c @@ -77,6 +77,7 @@ inline void macro_finishedWithBuffer( uint8_t sentKeys ) void jumpToBootloader(void) { +#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR cli(); // disable watchdog, if enabled // disable all peripherals @@ -110,6 +111,7 @@ void jumpToBootloader(void) PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0; asm volatile("jmp 0x1FC00"); #endif +#endif } // Given a sampling array, and the current number of detected keypress diff --git a/Scan/BETKB/scan_loop.h b/Scan/BETKB/scan_loop.h index e491606..dbd1106 100644 --- a/Scan/BETKB/scan_loop.h +++ b/Scan/BETKB/scan_loop.h @@ -33,7 +33,7 @@ // ----- Defines ----- -#define KEYBOARD_SIZE 0x7F // 127 - Size of the array space for the keyboard(max index) +#define KEYBOARD_KEYS 0x7F // 127 - Size of the array space for the keyboard(max index) #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer diff --git a/Scan/BudKeypad/matrix.h b/Scan/BudKeypad/matrix.h index 1430623..978059a 100644 --- a/Scan/BudKeypad/matrix.h +++ b/Scan/BudKeypad/matrix.h @@ -36,7 +36,7 @@ // ----- Key Settings ----- -#define KEYBOARD_SIZE 16 // # of keys +#define KEYBOARD_KEYS 16 // # of keys #define MAX_ROW_SIZE 16 // # of keys in the largest row #define MAX_COL_SIZE 1 // # of keys in the largest column diff --git a/Scan/EpsonQX-10/scan_loop.h b/Scan/EpsonQX-10/scan_loop.h index 1e05626..6171ba0 100644 --- a/Scan/EpsonQX-10/scan_loop.h +++ b/Scan/EpsonQX-10/scan_loop.h @@ -33,7 +33,7 @@ // ----- Defines ----- -#define KEYBOARD_SIZE 0x68 // 104 - Size of the array space for the keyboard(max index) +#define KEYBOARD_KEYS 0x68 // 104 - Size of the array space for the keyboard(max index) #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer diff --git a/Scan/FACOM6684/scan_loop.c b/Scan/FACOM6684/scan_loop.c index 57e3683..e2225aa 100644 --- a/Scan/FACOM6684/scan_loop.c +++ b/Scan/FACOM6684/scan_loop.c @@ -108,7 +108,6 @@ ISR(USART1_RX_vect) inline void scan_setup() { // Setup the the USART interface for keyboard data input - // NOTE: The input data signal needs to be inverted for the Teensy USART to properly work // Setup baud rate // 16 MHz / ( 16 * Baud ) = UBRR diff --git a/Scan/FACOM6684/scan_loop.h b/Scan/FACOM6684/scan_loop.h index cec677c..c46a2a7 100644 --- a/Scan/FACOM6684/scan_loop.h +++ b/Scan/FACOM6684/scan_loop.h @@ -33,7 +33,7 @@ // ----- Defines ----- -#define KEYBOARD_SIZE 0x7F // 127 - Size of the array space for the keyboard(max index) +#define KEYBOARD_KEYS 0x7F // 127 - Size of the array space for the keyboard(max index) #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer diff --git a/Scan/HP150/scan_loop.h b/Scan/HP150/scan_loop.h index e491606..dbd1106 100644 --- a/Scan/HP150/scan_loop.h +++ b/Scan/HP150/scan_loop.h @@ -33,7 +33,7 @@ // ----- Defines ----- -#define KEYBOARD_SIZE 0x7F // 127 - Size of the array space for the keyboard(max index) +#define KEYBOARD_KEYS 0x7F // 127 - Size of the array space for the keyboard(max index) #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer diff --git a/Scan/HeathZenith/matrix.h b/Scan/HeathZenith/matrix.h index b8c029e..451fe39 100644 --- a/Scan/HeathZenith/matrix.h +++ b/Scan/HeathZenith/matrix.h @@ -36,7 +36,7 @@ // ----- Key Settings ----- -#define KEYBOARD_SIZE 63 // # of keys +#define KEYBOARD_KEYS 63 // # of keys #define MAX_ROW_SIZE 12 // # of keys in the largest row #define MAX_COL_SIZE 9 // # of keys in the largest column diff --git a/Scan/IBMConvertible/matrix.h b/Scan/IBMConvertible/matrix.h index 5802d6f..e89b82a 100644 --- a/Scan/IBMConvertible/matrix.h +++ b/Scan/IBMConvertible/matrix.h @@ -36,7 +36,7 @@ // ----- Key Settings ----- -#define KEYBOARD_SIZE 90 // # of keys (It actually has 78, but there are markings up to 81 on the PCB and scan lines enough for 90 +#define KEYBOARD_KEYS 90 // # of keys (It actually has 78, but there are markings up to 81 on the PCB and scan lines enough for 90 #define MAX_ROW_SIZE 6 // # of rows #define MAX_COL_SIZE 15 // # of columns diff --git a/Scan/Kaypro1/scan_loop.h b/Scan/Kaypro1/scan_loop.h index 661c204..9f84f5d 100644 --- a/Scan/Kaypro1/scan_loop.h +++ b/Scan/Kaypro1/scan_loop.h @@ -33,7 +33,7 @@ // ----- Defines ----- -#define KEYBOARD_SIZE 0x4c // 76 - Size of the array space for the keyboardr(max index) +#define KEYBOARD_KEYS 0x4c // 76 - Size of the array space for the keyboardr(max index) #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer diff --git a/Scan/MicroSwitch8304/scan_loop.h b/Scan/MicroSwitch8304/scan_loop.h index 0a46ffa..1f0c676 100644 --- a/Scan/MicroSwitch8304/scan_loop.h +++ b/Scan/MicroSwitch8304/scan_loop.h @@ -33,7 +33,7 @@ // ----- Defines ----- -#define KEYBOARD_SIZE 0x62 // 98 - Size of the array space for the keyboard(max index) +#define KEYBOARD_KEYS 0x62 // 98 - Size of the array space for the keyboard(max index) #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer diff --git a/Scan/SKM67001/matrix.h b/Scan/SKM67001/matrix.h index ebb2833..406e97c 100644 --- a/Scan/SKM67001/matrix.h +++ b/Scan/SKM67001/matrix.h @@ -36,7 +36,7 @@ // ----- Key Settings ----- -#define KEYBOARD_SIZE 85 // # of keys (It actually has 66, but there are markings up to 80 on the PCB); 85 due to there being 5 "switch" keys, that have no numbers +#define KEYBOARD_KEYS 85 // # of keys (It actually has 66, but there are markings up to 80 on the PCB); 85 due to there being 5 "switch" keys, that have no numbers #define MAX_ROW_SIZE 9 // # of keys in the largest row #define MAX_COL_SIZE 9 // # of keys in the largest column diff --git a/Scan/SonyNEWS/scan_loop.h b/Scan/SonyNEWS/scan_loop.h index 1e05626..6171ba0 100644 --- a/Scan/SonyNEWS/scan_loop.h +++ b/Scan/SonyNEWS/scan_loop.h @@ -33,7 +33,7 @@ // ----- Defines ----- -#define KEYBOARD_SIZE 0x68 // 104 - Size of the array space for the keyboard(max index) +#define KEYBOARD_KEYS 0x68 // 104 - Size of the array space for the keyboard(max index) #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer diff --git a/Scan/SonyOA-S3400/scan_loop.h b/Scan/SonyOA-S3400/scan_loop.h index 7d7f309..74b0a22 100644 --- a/Scan/SonyOA-S3400/scan_loop.h +++ b/Scan/SonyOA-S3400/scan_loop.h @@ -33,7 +33,7 @@ // ----- Defines ----- -#define KEYBOARD_SIZE 0xFF // 255 - Size of the array space for the keyboard(max index) +#define KEYBOARD_KEYS 0xFF // 255 - Size of the array space for the keyboard(max index) #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer diff --git a/Scan/Tandy1000/scan_loop.h b/Scan/Tandy1000/scan_loop.h index 911960a..b290505 100644 --- a/Scan/Tandy1000/scan_loop.h +++ b/Scan/Tandy1000/scan_loop.h @@ -33,7 +33,7 @@ // ----- Defines ----- -#define KEYBOARD_SIZE 0x5A // 90 - Size of the array space for the keyboardr(max index) +#define KEYBOARD_KEYS 0x5A // 90 - Size of the array space for the keyboardr(max index) #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer diff --git a/Scan/UnivacF3W9/scan_loop.h b/Scan/UnivacF3W9/scan_loop.h index 8f2e69e..4449e9f 100644 --- a/Scan/UnivacF3W9/scan_loop.h +++ b/Scan/UnivacF3W9/scan_loop.h @@ -33,7 +33,7 @@ // ----- Defines ----- -#define KEYBOARD_SIZE 0x68 // 104 - Size of the array space for the keyboard(max index) +#define KEYBOARD_KEYS 0x68 // 104 - Size of the array space for the keyboard(max index) #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer diff --git a/Scan/matrix/matrix_template.h b/Scan/matrix/matrix_template.h index 1573af4..719fd0a 100644 --- a/Scan/matrix/matrix_template.h +++ b/Scan/matrix/matrix_template.h @@ -38,7 +38,7 @@ // -- Example for scanCol -- /* -#define KEYBOARD_SIZE 16 // # of keys +#define KEYBOARD_KEYS 16 // # of keys #define MAX_ROW_SIZE 16 // # of keys in the largest row #define MAX_COL_SIZE 1 // # of keys in the largest column */ @@ -46,7 +46,7 @@ // -- Example for scanRow -- /* -#define KEYBOARD_SIZE 16 // # of keys +#define KEYBOARD_KEYS 16 // # of keys #define MAX_ROW_SIZE 1 // # of keys in the largest row #define MAX_COL_SIZE 16 // # of keys in the largest column */ @@ -54,7 +54,7 @@ // -- Example for scanRow_powrCol, scanCol_powrRow, and scanDual -- /* -#define KEYBOARD_SIZE 69 // # of keys +#define KEYBOARD_KEYS 69 // # of keys #define MAX_ROW_SIZE 8 // # of keys in the largest row #define MAX_COL_SIZE 9 // # of keys in the largest column */ diff --git a/Scan/matrix/scan_loop.c b/Scan/matrix/scan_loop.c index 34b72ca..3bca054 100644 --- a/Scan/matrix/scan_loop.c +++ b/Scan/matrix/scan_loop.c @@ -67,7 +67,7 @@ uint8_t scan_count = 0; // This is where the matrix scan data is held, as well as debouncing is evaluated to, which (depending on the read value) is handled // by the macro module -uint8_t KeyIndex_Array[KEYBOARD_SIZE + 1]; +uint8_t KeyIndex_Array[KEYBOARD_KEYS + 1]; diff --git a/Scan/matrix/scan_loop.h b/Scan/matrix/scan_loop.h index c0f7aa3..d3fa133 100644 --- a/Scan/matrix/scan_loop.h +++ b/Scan/matrix/scan_loop.h @@ -45,8 +45,8 @@ // NOTE: Highest Bit: Valid keypress (0x80 is valid keypress) // Other Bits: Pressed state sample counter -extern uint8_t KeyIndex_Array [KEYBOARD_SIZE + 1]; - static const uint8_t KeyIndex_Size = KEYBOARD_SIZE; +extern uint8_t KeyIndex_Array [KEYBOARD_KEYS + 1]; + static const uint8_t KeyIndex_Size = KEYBOARD_KEYS; extern volatile uint8_t KeyIndex_Buffer[KEYBOARD_BUFFER]; extern volatile uint8_t KeyIndex_BufferUsed; diff --git a/USB/pjrc/setup.cmake b/USB/pjrc/setup.cmake index 90b23a1..171615e 100644 --- a/USB/pjrc/setup.cmake +++ b/USB/pjrc/setup.cmake @@ -29,6 +29,7 @@ elseif ( ${COMPILER_FAMILY} MATCHES "arm" ) arm/usb_dev.c arm/usb_keyboard.c arm/usb_mem.c + arm/usb_serial.c ) endif ( ${COMPILER_FAMILY} MATCHES "avr" ) diff --git a/USB/pjrc/usb_com.c b/USB/pjrc/usb_com.c index f9ed08f..91f18c9 100644 --- a/USB/pjrc/usb_com.c +++ b/USB/pjrc/usb_com.c @@ -32,6 +32,7 @@ #include "avr/usb_keyboard_debug.h" #elif defined(_mk20dx128_) #include "arm/usb_keyboard.h" +#include "arm/usb_dev.h" #endif // Local Includes diff --git a/USB/pjrc/usb_com.h b/USB/pjrc/usb_com.h index db47095..f0589b0 100644 --- a/USB/pjrc/usb_com.h +++ b/USB/pjrc/usb_com.h @@ -38,6 +38,7 @@ // You can change these to give your code its own name. +// TODO Add to Teensy 3 #define STR_MANUFACTURER L"MfgName" #define STR_PRODUCT L"Keyboard" @@ -47,7 +48,8 @@ // INF file is needed to load the driver. These numbers need to // match the INF file. #define VENDOR_ID 0x16C0 -#define PRODUCT_ID 0x047D +#define PRODUCT_ID 0x0487 // New ID for Teensy 3 +//#define PRODUCT_ID 0x047D // Old ID for Teensy 2 diff --git a/arm.cmake b/arm.cmake index 176d906..518283b 100644 --- a/arm.cmake +++ b/arm.cmake @@ -55,6 +55,7 @@ message( "${CPU}" ) #| Mostly for convenience functions like interrupt handlers set( COMPILER_SRCS Lib/${CHIP}.c + Lib/delay.c )