muflax
/
ergodox-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some cleanup

master
Stefan Dorn 2016-06-12 03:08:50 +01:00
parent 238a98d6b6
commit f5641c807e
2 changed files with 673 additions and 739 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1283
src/keyboard/controller.c
View File

File diff suppressed because it is too large Load Diff

129
src/keyboard/controller.h
View File

@ -38,14 +38,13 @@
* #define TEENSY__DRIVE_ROWS 1 * #define TEENSY__DRIVE_ROWS 1
* #define MCP23018__DRIVE_ROWS 1 * #define MCP23018__DRIVE_ROWS 1
*/ */
#define TEENSY__DRIVE_ROWS 0 #define TEENSY__DRIVE_ROWS 0
#define MCP23018__DRIVE_ROWS 0 #define MCP23018__DRIVE_ROWS 0
#define TEENSY__DRIVE_COLUMNS 1 #define TEENSY__DRIVE_COLUMNS 1
#define MCP23018__DRIVE_COLUMNS 1 #define MCP23018__DRIVE_COLUMNS 1
#define KB_ROWS 6 // must match real life
#define KB_COLUMNS 14 // must match real life
#define KB_ROWS 6 // must match real life
#define KB_COLUMNS 14 // must match real life
// -------------------------------------------------------------------- // --------------------------------------------------------------------
@ -66,48 +65,6 @@ uint8_t teensy_update_matrix( bool matrix[KB_ROWS][KB_COLUMNS] );
// -------------------------------------------------------------------- // --------------------------------------------------------------------
#define _kb_led_1_on() (DDRB |= (1<<5))
#define _kb_led_1_off() (DDRB &= ~(1<<5))
#define _kb_led_1_set(n) (OCR1A = (uint8_t)(n))
#define _kb_led_1_set_percent(n) (OCR1A = (uint8_t)((n) * 0xFF))
#define _kb_led_2_on() (DDRB |= (1<<6))
#define _kb_led_2_off() (DDRB &= ~(1<<6))
#define _kb_led_2_set(n) (OCR1B = (uint8_t)(n))
#define _kb_led_2_set_percent(n) (OCR1B = (uint8_t)((n) * 0xFF))
#define _kb_led_3_on() (DDRB |= (1<<7))
#define _kb_led_3_off() (DDRB &= ~(1<<7))
#define _kb_led_3_set(n) (OCR1C = (uint8_t)(n))
#define _kb_led_3_set_percent(n) (OCR1C = (uint8_t)((n) * 0xFF))
#define _kb_led_all_on() do { \
_kb_led_1_on(); \
_kb_led_2_on(); \
_kb_led_3_on(); \
} while(0)
#define _kb_led_all_off() do { \
_kb_led_1_off(); \
_kb_led_2_off(); \
_kb_led_3_off(); \
} while(0)
#define _kb_led_all_set(n) do { \
_kb_led_1_set(n); \
_kb_led_2_set(n); \
_kb_led_3_set(n); \
} while(0)
#define _kb_led_all_set_percent(n) do { \
_kb_led_1_set_percent(n); \
_kb_led_2_set_percent(n); \
_kb_led_3_set_percent(n); \
} while(0)
// --------------------------------------------------------------------
#define TWI_FREQ 400000 #define TWI_FREQ 400000
void twi_init (void); void twi_init (void);
@ -118,8 +75,8 @@ uint8_t twi_read (uint8_t * data);
// -------------------------------------------------------------------- // --------------------------------------------------------------------
void usb_init(void); // initialize everything void usb_init(void); // initialize everything
uint8_t usb_configured(void); // is the USB port configured uint8_t usb_configured(void); // is the USB port configured
int8_t usb_keyboard_press(uint8_t key, uint8_t modifier); int8_t usb_keyboard_press(uint8_t key, uint8_t modifier);
int8_t usb_keyboard_send(void); int8_t usb_keyboard_send(void);
@ -137,52 +94,52 @@ extern uint16_t consumer_key;
// Everything below this point is only intended for usb_serial.c // Everything below this point is only intended for usb_serial.c
#define EP_TYPE_CONTROL 0x00 #define EP_TYPE_CONTROL 0x00
#define EP_TYPE_BULK_IN 0x81 #define EP_TYPE_BULK_IN 0x81
#define EP_TYPE_BULK_OUT 0x80 #define EP_TYPE_BULK_OUT 0x80
#define EP_TYPE_INTERRUPT_IN 0xC1 #define EP_TYPE_INTERRUPT_IN 0xC1
#define EP_TYPE_INTERRUPT_OUT 0xC0 #define EP_TYPE_INTERRUPT_OUT 0xC0
#define EP_TYPE_ISOCHRONOUS_IN 0x41 #define EP_TYPE_ISOCHRONOUS_IN 0x41
#define EP_TYPE_ISOCHRONOUS_OUT 0x40 #define EP_TYPE_ISOCHRONOUS_OUT 0x40
#define EP_SINGLE_BUFFER 0x02 #define EP_SINGLE_BUFFER 0x02
#define EP_DOUBLE_BUFFER 0x06 #define EP_DOUBLE_BUFFER 0x06
#define EP_SIZE(s) ((s) == 64 ? 0x30 : \ #define EP_SIZE(s) ((s) == 64 ? 0x30 : \
((s) == 32 ? 0x20 : \ ((s) == 32 ? 0x20 : \
((s) == 16 ? 0x10 : \ ((s) == 16 ? 0x10 : \
0x00))) 0x00)))
#define MAX_ENDPOINT 4 #define MAX_ENDPOINT 4
#define LSB(n) (n & 255) #define LSB(n) (n & 255)
#define MSB(n) ((n >> 8) & 255) #define MSB(n) ((n >> 8) & 255)
#define HW_CONFIG() (UHWCON = 0x01) #define HW_CONFIG() (UHWCON = 0x01)
#define PLL_CONFIG() (PLLCSR = 0x12) #define PLL_CONFIG() (PLLCSR = 0x12)
#define USB_CONFIG() (USBCON = ((1<<USBE)|(1<<OTGPADE))) #define USB_CONFIG() (USBCON = ((1<<USBE)|(1<<OTGPADE)))
#define USB_FREEZE() (USBCON = ((1<<USBE)|(1<<FRZCLK))) #define USB_FREEZE() (USBCON = ((1<<USBE)|(1<<FRZCLK)))
// standard control endpoint request types // standard control endpoint request types
#define GET_STATUS 0 #define GET_STATUS 0
#define CLEAR_FEATURE 1 #define CLEAR_FEATURE 1
#define SET_FEATURE 3 #define SET_FEATURE 3
#define SET_ADDRESS 5 #define SET_ADDRESS 5
#define GET_DESCRIPTOR 6 #define GET_DESCRIPTOR 6
#define GET_CONFIGURATION 8 #define GET_CONFIGURATION 8
#define SET_CONFIGURATION 9 #define SET_CONFIGURATION 9
#define GET_INTERFACE 10 #define GET_INTERFACE 10
#define SET_INTERFACE 11 #define SET_INTERFACE 11
// HID (human interface device) // HID (human interface device)
#define HID_GET_REPORT 1 #define HID_GET_REPORT 1
#define HID_GET_IDLE 2 #define HID_GET_IDLE 2
#define HID_GET_PROTOCOL 3 #define HID_GET_PROTOCOL 3
#define HID_SET_REPORT 9 #define HID_SET_REPORT 9
#define HID_SET_IDLE 10 #define HID_SET_IDLE 10
#define HID_SET_PROTOCOL 11 #define HID_SET_PROTOCOL 11
// CDC (communication class device) // CDC (communication class device)
#define CDC_SET_LINE_CODING 0x20 #define CDC_SET_LINE_CODING 0x20
#define CDC_GET_LINE_CODING 0x21 #define CDC_GET_LINE_CODING 0x21
#define CDC_SET_CONTROL_LINE_STATE 0x22 #define CDC_SET_CONTROL_LINE_STATE 0x22
// -------------------------------------------------------------------- // --------------------------------------------------------------------