di0ib/controller
Archived
1
0
Fork 0
Code Releases Activity

Updating AVR abstraction to be compatible with ARM, nearly ready for ARM files

Browse Source 
- Very small updates to files, mostly modifying to remove name duplications
This commit is contained in:
Jacob Alexander 2013-01-26 22:30:36 -05:00
parent a31f0e064a
commit 6da1558b78
29 changed files with 64 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Debug/print/print.c
View File

@ -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 * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
@ -34,8 +34,17 @@
// USB HID String Output // USB HID String Output
void usb_debug_putstr( char* s ) void usb_debug_putstr( char* s )
{ {
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
while ( *s != '\0' ) while ( *s != '\0' )
usb_debug_putchar( *s++ ); 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 // Multiple string Output
@ -64,6 +73,7 @@ void usb_debug_putstrs( char* first, ... )
// Print a constant string // Print a constant string
void _print(const char *s) void _print(const char *s)
{ {
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
char c; char c;
// Acquire the character from flash, and print it, as long as it's not NULL // 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('\r');
usb_debug_putchar(c); usb_debug_putchar(c);
} }
#elif defined(_mk20dx128_) // ARM
usb_debug_putstr( (char*)s );
#endif
} }

2
Debug/print/print.h
View File

@ -32,7 +32,7 @@
#elif defined(_mk20dx128_) #elif defined(_mk20dx128_)
#include "arm/usb_keyboard.h" #include "arm/usb_serial.h"
#endif #endif

9
Lib/MacroLib.h
View File

@ -24,11 +24,15 @@
// Additional includes should only be added to this file if they should be added to *all* Macro modules. // Additional includes should only be added to this file if they should be added to *all* Macro modules.
// ----- Includes -----
#ifndef __MACROLIB_H #ifndef __MACROLIB_H
#define __MACROLIB_H #define __MACROLIB_H
// ----- Includes -----
#include <Lib/Interrupts.h>
// ARM // ARM
#if defined(_mk20dx128_) #if defined(_mk20dx128_)
@ -43,7 +47,6 @@
// AVR // AVR
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
#include <avr/interrupt.h>
#include <util/delay.h> #include <util/delay.h>
#endif #endif

9
Lib/MainLib.h
View File

@ -24,10 +24,14 @@
// Additional includes should only be added to this file if they should be added to *all* Scan modules. // 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 ----- // ----- Includes -----
#ifndef __MACROLIB_H #include <Lib/Interrupts.h>
#define __MACROLIB_H
// ARM // ARM
#if defined(_mk20dx128_) #if defined(_mk20dx128_)
@ -43,7 +47,6 @@
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
#include <avr/io.h> #include <avr/io.h>
#include <avr/interrupt.h>
#endif #endif

9
Lib/ScanLib.h
View File

@ -24,11 +24,15 @@
// Additional includes should only be added to this file if they should be added to *all* Scan modules. // Additional includes should only be added to this file if they should be added to *all* Scan modules.
// ----- Includes -----
#ifndef __SCANLIB_H #ifndef __SCANLIB_H
#define __SCANLIB_H #define __SCANLIB_H
// ----- Includes -----
#include <Lib/Interrupts.h>
// ARM // ARM
#if defined(_mk20dx128_) #if defined(_mk20dx128_)
@ -43,7 +47,6 @@
// AVR // AVR
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
#include <avr/interrupt.h>
#include <avr/io.h> #include <avr/io.h>
#include <util/delay.h> #include <util/delay.h>

6
Lib/USBLib.h
View File

@ -24,10 +24,10 @@
// Additional includes should only be added to this file if they should be added to *all* Scan modules. // 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 // ----- Includes -----
#define __MACROLIB_H
// ARM // ARM
#if defined(_mk20dx128_) #if defined(_mk20dx128_)

2
Macro/buffer/macro.c
View File

@ -77,6 +77,7 @@ inline void macro_finishedWithBuffer( uint8_t sentKeys )
void jumpToBootloader(void) void jumpToBootloader(void)
{ {
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
cli(); cli();
// disable watchdog, if enabled // disable watchdog, if enabled
// disable all peripherals // disable all peripherals
@ -110,6 +111,7 @@ void jumpToBootloader(void)
PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0; PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
asm volatile("jmp 0x1FC00"); asm volatile("jmp 0x1FC00");
#endif #endif
#endif
} }
// Given a sampling array, and the current number of detected keypress // Given a sampling array, and the current number of detected keypress

2
Scan/BETKB/scan_loop.h
View File

@ -33,7 +33,7 @@
// ----- Defines ----- // ----- 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 #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer

2
Scan/BudKeypad/matrix.h
View File

@ -36,7 +36,7 @@
// ----- Key Settings ----- // ----- 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_ROW_SIZE 16 // # of keys in the largest row
#define MAX_COL_SIZE 1 // # of keys in the largest column #define MAX_COL_SIZE 1 // # of keys in the largest column

2
Scan/EpsonQX-10/scan_loop.h
View File

@ -33,7 +33,7 @@
// ----- Defines ----- // ----- 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 #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer

1
Scan/FACOM6684/scan_loop.c
View File

@ -108,7 +108,6 @@ ISR(USART1_RX_vect)
inline void scan_setup() inline void scan_setup()
{ {
// Setup the the USART interface for keyboard data input // 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 // Setup baud rate
// 16 MHz / ( 16 * Baud ) = UBRR // 16 MHz / ( 16 * Baud ) = UBRR

2
Scan/FACOM6684/scan_loop.h
View File

@ -33,7 +33,7 @@
// ----- Defines ----- // ----- 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 #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer

2
Scan/HP150/scan_loop.h
View File

@ -33,7 +33,7 @@
// ----- Defines ----- // ----- 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 #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer

2
Scan/HeathZenith/matrix.h
View File

@ -36,7 +36,7 @@
// ----- Key Settings ----- // ----- 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_ROW_SIZE 12 // # of keys in the largest row
#define MAX_COL_SIZE 9 // # of keys in the largest column #define MAX_COL_SIZE 9 // # of keys in the largest column

2
Scan/IBMConvertible/matrix.h
View File

@ -36,7 +36,7 @@
// ----- Key Settings ----- // ----- 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_ROW_SIZE 6 // # of rows
#define MAX_COL_SIZE 15 // # of columns #define MAX_COL_SIZE 15 // # of columns

2
Scan/Kaypro1/scan_loop.h
View File

@ -33,7 +33,7 @@
// ----- Defines ----- // ----- 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 #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer

2
Scan/MicroSwitch8304/scan_loop.h
View File

@ -33,7 +33,7 @@
// ----- Defines ----- // ----- 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 #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer

2
Scan/SKM67001/matrix.h
View File

@ -36,7 +36,7 @@
// ----- Key Settings ----- // ----- 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_ROW_SIZE 9 // # of keys in the largest row
#define MAX_COL_SIZE 9 // # of keys in the largest column #define MAX_COL_SIZE 9 // # of keys in the largest column

2
Scan/SonyNEWS/scan_loop.h
View File

@ -33,7 +33,7 @@
// ----- Defines ----- // ----- 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 #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer

2
Scan/SonyOA-S3400/scan_loop.h
View File

@ -33,7 +33,7 @@
// ----- Defines ----- // ----- 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 #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer

2
Scan/Tandy1000/scan_loop.h
View File

@ -33,7 +33,7 @@
// ----- Defines ----- // ----- 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 #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer

2
Scan/UnivacF3W9/scan_loop.h
View File

@ -33,7 +33,7 @@
// ----- Defines ----- // ----- 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 #define KEYBOARD_BUFFER 24 // Max number of key signals to buffer

6
Scan/matrix/matrix_template.h
View File

@ -38,7 +38,7 @@
// -- Example for scanCol -- // -- 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_ROW_SIZE 16 // # of keys in the largest row
#define MAX_COL_SIZE 1 // # of keys in the largest column #define MAX_COL_SIZE 1 // # of keys in the largest column
*/ */
@ -46,7 +46,7 @@
// -- Example for scanRow -- // -- 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_ROW_SIZE 1 // # of keys in the largest row
#define MAX_COL_SIZE 16 // # of keys in the largest column #define MAX_COL_SIZE 16 // # of keys in the largest column
*/ */
@ -54,7 +54,7 @@
// -- Example for scanRow_powrCol, scanCol_powrRow, and scanDual -- // -- 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_ROW_SIZE 8 // # of keys in the largest row
#define MAX_COL_SIZE 9 // # of keys in the largest column #define MAX_COL_SIZE 9 // # of keys in the largest column
*/ */

2
Scan/matrix/scan_loop.c
View File

@ -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 // 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 // by the macro module
uint8_t KeyIndex_Array[KEYBOARD_SIZE + 1]; uint8_t KeyIndex_Array[KEYBOARD_KEYS + 1];

4
Scan/matrix/scan_loop.h
View File

@ -45,8 +45,8 @@
// NOTE: Highest Bit: Valid keypress (0x80 is valid keypress) // NOTE: Highest Bit: Valid keypress (0x80 is valid keypress)
// Other Bits: Pressed state sample counter // Other Bits: Pressed state sample counter
extern uint8_t KeyIndex_Array [KEYBOARD_SIZE + 1]; extern uint8_t KeyIndex_Array [KEYBOARD_KEYS + 1];
static const uint8_t KeyIndex_Size = KEYBOARD_SIZE; static const uint8_t KeyIndex_Size = KEYBOARD_KEYS;
extern volatile uint8_t KeyIndex_Buffer[KEYBOARD_BUFFER]; extern volatile uint8_t KeyIndex_Buffer[KEYBOARD_BUFFER];
extern volatile uint8_t KeyIndex_BufferUsed; extern volatile uint8_t KeyIndex_BufferUsed;

1
USB/pjrc/setup.cmake
View File

@ -29,6 +29,7 @@ elseif ( ${COMPILER_FAMILY} MATCHES "arm" )
arm/usb_dev.c arm/usb_dev.c
arm/usb_keyboard.c arm/usb_keyboard.c
arm/usb_mem.c arm/usb_mem.c
arm/usb_serial.c
) )
endif ( ${COMPILER_FAMILY} MATCHES "avr" ) endif ( ${COMPILER_FAMILY} MATCHES "avr" )

1
USB/pjrc/usb_com.c
View File

@ -32,6 +32,7 @@
#include "avr/usb_keyboard_debug.h" #include "avr/usb_keyboard_debug.h"
#elif defined(_mk20dx128_) #elif defined(_mk20dx128_)
#include "arm/usb_keyboard.h" #include "arm/usb_keyboard.h"
#include "arm/usb_dev.h"
#endif #endif
// Local Includes // Local Includes

4
USB/pjrc/usb_com.h
View File

@ -38,6 +38,7 @@
// You can change these to give your code its own name. // You can change these to give your code its own name.
// TODO Add to Teensy 3
#define STR_MANUFACTURER L"MfgName" #define STR_MANUFACTURER L"MfgName"
#define STR_PRODUCT L"Keyboard" #define STR_PRODUCT L"Keyboard"
@ -47,7 +48,8 @@
// INF file is needed to load the driver. These numbers need to // INF file is needed to load the driver. These numbers need to
// match the INF file. // match the INF file.
#define VENDOR_ID 0x16C0 #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

1
arm.cmake
View File

@ -55,6 +55,7 @@ message( "${CPU}" )
#| Mostly for convenience functions like interrupt handlers #| Mostly for convenience functions like interrupt handlers
set( COMPILER_SRCS set( COMPILER_SRCS
Lib/${CHIP}.c Lib/${CHIP}.c
Lib/delay.c
) )