di0ib/controller
Archived
1
0
Fork 0
Code Releases Activity

Code cleanup

Browse Source 
- Changing header file ifndef define to pragma once's
- Removed duplicate output_com.h's
This commit is contained in:
Jacob Alexander 2015-06-14 13:56:56 -07:00
parent 03f60df94d
commit 5f262ea4b6
75 changed files with 158 additions and 650 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Bootloader/_buildvars.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2013-2014 by Jacob Alexander
/* Copyright (C) 2013-2015 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
@ -19,8 +19,7 @@
* THE SOFTWARE.
*/
#ifndef __buildvars_h
#define __buildvars_h
#pragma once
// ----- Includes -----
@ -42,5 +41,3 @@
#define VENDOR_ID @BOOT_VENDOR_ID@
#define PRODUCT_ID @BOOT_PRODUCT_ID@
#endif

5
Bootloader/debug.h
View File

@ -19,8 +19,7 @@
* THE SOFTWARE.
*/
#ifndef debug_h__
#define debug_h__
#pragma once
// ----- Includes -----
@ -64,5 +63,3 @@ void printHex_op( uint32_t in, uint8_t op );
#define printHex_op(in,op)
#endif
#endif

7
Bootloader/dfu.desc.h
View File

@ -1,5 +1,5 @@
// Originally Generated from MCHCK Toolkit
/* Copyright (c) Jacob Alexander 2014 <haata@kiibohd.com>
/* Copyright (c) Jacob Alexander 2014-2015 <haata@kiibohd.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __DFU_DESC_H
#define __DFU_DESC_H
#pragma once
// ----- Local Includes -----
@ -39,5 +38,3 @@ struct usb_config_1 {
struct dfu_function_desc usb_function_0;
};
#endif

4
Bootloader/dfu.h
View File

@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _USB_DFU_H
#define _USB_DFU_H
#pragma once
// ----- Compiler Includes -----
@ -171,4 +170,3 @@ void dfu_write_done( enum dfu_status, struct dfu_ctx *ctx );
void dfu_init( dfu_setup_read_t setup_read, dfu_setup_write_t setup_write, dfu_finish_write_t finish_write, struct dfu_ctx *ctx );
void dfu_app_init( dfu_detach_t detachcb );
#endif

6
Bootloader/flash.h
View File

@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __FLASH_H
#define __FLASH_H
#pragma once
// ----- Defines -----
@ -34,10 +33,7 @@ __attribute__((section(".ramtext.ftfl_submit_cmd"), long_call))
int ftfl_submit_cmd(void);
int flash_prepare_flashing(void);
int flash_erase_sector(uintptr_t);
//int flash_program_section(uintptr_t, size_t);
int flash_program_sector(uintptr_t, size_t);
int flash_program_longword(uintptr_t, uint8_t*);
void *flash_get_staging_area(uintptr_t, size_t);
#endif

7
Bootloader/ftfl.h
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2011,2012 Simon Schubert <2@0x2c.org>.
* Modifications by Jacob Alexander 2014 <haata@kiibohd.com>
* Modifications by Jacob Alexander 2014-2015 <haata@kiibohd.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __FTFL_H
#define __FTFL_H
#pragma once
// ----- Local Includes -----
@ -242,5 +241,3 @@ extern volatile struct FTFL_t FTFL;
extern char FlexRAM[];
extern struct FTFL_CONFIG_t FTFL_CONFIG;
#endif

7
Bootloader/mchck-cdefs.h
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2011,2012 Simon Schubert <2@0x2c.org>.
* Modifications by Jacob Alexander 2014 <haata@kiibohd.com>
* Modifications by Jacob Alexander 2014-2015 <haata@kiibohd.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _MCHCK_CDEFS_H
#define _MCHCK_CDEFS_H
#pragma once
// ----- Compiler Includes -----
@ -134,5 +133,3 @@ typedef __CHAR16_TYPE__ char16_t;
) \
)
#endif

7
Bootloader/mchck.h
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2011,2012 Simon Schubert <2@0x2c.org>.
* Modifications by Jacob Alexander 2014=2015 <haata@kiibohd.com>
* Modifications by Jacob Alexander 2014-2015 <haata@kiibohd.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __MCHCK_H
#define __MCHCK_H
#pragma once
// ----- Compiler Includes -----
@ -45,5 +44,3 @@ extern uint32_t _sidata, _sdata, _edata, _sbss, _ebss, _app_rom, _app_rom_end, _
#include "flash.h"
#include "usb.h"
#endif

7
Bootloader/sim.h
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2011,2012 Simon Schubert <2@0x2c.org>.
* Modifications by Jacob Alexander 2014 <haata@kiibohd.com>
* Modifications by Jacob Alexander 2014-2015 <haata@kiibohd.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __SIM_H
#define __SIM_H
#pragma once
// ----- Local Includes -----
@ -328,5 +327,3 @@ CTASSERT_SIZE_BYTE(struct SIM_t, 0x1064);
extern volatile struct SIM_t SIM;
#endif

7
Bootloader/usb-common.h
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2011,2012 Simon Schubert <2@0x2c.org>.
* Modifications by Jacob Alexander 2014 <haata@kiibohd.com>
* Modifications by Jacob Alexander 2014-2015 <haata@kiibohd.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _USB_COMMON_H
#define _USB_COMMON_H
#pragma once
// ----- Enumerations -----
@ -56,5 +55,3 @@ enum {
EP0_BUFSIZE = 64
};
#endif

7
Bootloader/usb-internal.h
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2011,2012 Simon Schubert <2@0x2c.org>.
* Modifications by Jacob Alexander 2014 <haata@kiibohd.com>
* Modifications by Jacob Alexander 2014-2015 <haata@kiibohd.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __USB_INTERNAL_H
#define __USB_INTERNAL_H
#pragma once
/**
* Internal driver structures
@ -100,5 +99,3 @@ void usb_restart(void);
void usb_enable(void);
const struct usbd_config *usb_get_config_data(int config);
#endif

7
Bootloader/usb.h
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2011,2012 Simon Schubert <2@0x2c.org>.
* Modifications by Jacob Alexander 2014 <haata@kiibohd.com>
* Modifications by Jacob Alexander 2014-2015 <haata@kiibohd.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __USB_H
#define __USB_H
#pragma once
// ----- Compiler Includes -----
@ -509,5 +508,3 @@ int usb_ep0_tx_cp(const void *, size_t, size_t, ep_callback_t, void *);
#include "dfu.h"
#endif

4
Bootloader/usbotg.h
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2011,2012 Simon Schubert <2@0x2c.org>.
* Modifications by Jacob Alexander 2014 <haata@kiibohd.com>
* Modifications by Jacob Alexander 2014-2015 <haata@kiibohd.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
// ----- Local Includes -----
#include "mchck.h"

6
Debug/cli/cli.h
View File

@ -19,8 +19,7 @@
* THE SOFTWARE.
*/
#ifndef cli_h__
#define cli_h__
#pragma once
// ----- Includes -----
@ -130,6 +129,3 @@ void cliFunc_reset ( char* args );
void cliFunc_restart ( char* args );
void cliFunc_version ( char* args );
#endif

13
Debug/led/led.h
View File

@ -1,15 +1,15 @@
/* Copyright (C) 2011-2013 by Jacob Alexander
*
/* Copyright (C) 2011-2013,2015 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
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@ -19,8 +19,7 @@
* THE SOFTWARE.
*/
#ifndef __led_h
#define __led_h
#pragma once
// ----- Includes -----
@ -31,5 +30,3 @@
void init_errorLED( void );
void errorLED( uint8_t on );
#endif

7
Debug/print/print.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2011-2014 by Jacob Alexander
/* Copyright (C) 2011-2015 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
@ -19,8 +19,7 @@
* THE SOFTWARE.
*/
#ifndef print_h__
#define print_h__
#pragma once
// ----- Includes -----
@ -116,5 +115,3 @@ uint16_t lenStr ( char* in );
int16_t eqStr ( char* str1, char* str2 ); // Returns -1 if identical, last character of str1 comparison (0 if str1 is like str2)
int numToInt ( char* in ); // Returns the int representation of a string
#endif

8
Lib/Interrupts.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2013-2014 by Jacob Alexander
/* Copyright (C) 2013-2015 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
@ -25,8 +25,7 @@
// ----- Includes -----
#ifndef __INTERRUPTS_H
#define __INTERRUPTS_H
#pragma once
// ARM
#if defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) || defined(_mk20dx256vlh7_)
@ -58,6 +57,3 @@
#endif
#endif

9
Lib/MacroLib.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2013-2014 by Jacob Alexander
/* Copyright (C) 2013-2015 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
@ -23,9 +23,7 @@
// This include file decides which set of compiler family include files to use on typical Macro modules.
// Additional includes should only be added to this file if they should be added to *all* Macro modules.
#ifndef __MACROLIB_H
#define __MACROLIB_H
#pragma once
// ----- Includes -----
@ -50,6 +48,3 @@
#endif
#endif

9
Lib/MainLib.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2013-2014 by Jacob Alexander
/* Copyright (C) 2013-2015 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
@ -23,9 +23,7 @@
// This include file decides which set of compiler family include files to use on typical 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
#pragma once
// ----- Includes -----
@ -49,6 +47,3 @@
#endif
#endif

9
Lib/OutputLib.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2013-2014 by Jacob Alexander
/* Copyright (C) 2013-2015 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
@ -23,9 +23,7 @@
// This include file decides which set of compiler family include files to use on typical Scan modules.
// Additional includes should only be added to this file if they should be added to *all* Scan modules.
#ifndef __OUTPUTLIB_H
#define __OUTPUTLIB_H
#pragma once
// ----- Includes -----
@ -46,6 +44,3 @@
#endif
#endif

9
Lib/ScanLib.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2013-2014 by Jacob Alexander
/* Copyright (C) 2013-2015 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
@ -23,9 +23,7 @@
// This include file decides which set of compiler family include files to use on typical Scan modules.
// Additional includes should only be added to this file if they should be added to *all* Scan modules.
#ifndef __SCANLIB_H
#define __SCANLIB_H
#pragma once
// ----- Includes -----
@ -51,6 +49,3 @@
#endif
#endif

5
Lib/_buildvars.h
View File

@ -19,8 +19,7 @@
* THE SOFTWARE.
*/
#ifndef __buildvars_h
#define __buildvars_h
#pragma once
// ----- Includes -----
@ -58,5 +57,3 @@
#define VENDOR_ID @VENDOR_ID@
#define PRODUCT_ID @PRODUCT_ID@
#endif

7
Lib/delay.h
View File

@ -1,7 +1,7 @@
/* Teensyduino Core Library
* http://www.pjrc.com/teensy/
* Copyright (c) 2013 PJRC.COM, LLC.
* Modifications by Jacob Alexander 2013-2014
* Modifications by Jacob Alexander 2013-2015
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -29,8 +29,7 @@
* SOFTWARE.
*/
#ifndef __DELAY_H
#define __DELAY_H
#pragma once
// ----- System Includes -----
@ -85,5 +84,3 @@ uint32_t micros(void);
void delay(uint32_t ms);
#endif

5
Lib/mk20dx.h
View File

@ -29,8 +29,7 @@
* SOFTWARE.
*/
#ifndef _mk20dx_h_
#define _mk20dx_h_
#pragma once
// ----- Defines -----
@ -2090,5 +2089,3 @@ extern void portd_isr(void);
extern void porte_isr(void);
extern void software_isr(void);
#endif

9
Macro/PartialMap/kll.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 by Jacob Alexander
/* Copyright (C) 2014-2015 by Jacob Alexander
*
* This file is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -14,8 +14,7 @@
* along with this file. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __kll_h
#define __kll_h
#pragma once
// ----- Includes -----
@ -252,7 +251,3 @@ typedef struct Layer {
// Total number of layers
#define LayerNum sizeof( LayerIndex ) / sizeof( Layer )
#endif // __kll_h

7
Macro/PartialMap/macro.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 by Jacob Alexander
/* Copyright (C) 2014-2015 by Jacob Alexander
*
* This file is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -14,8 +14,7 @@
* along with this file. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __macro_h
#define __macro_h
#pragma once
// ----- Includes -----
@ -42,5 +41,3 @@ void Macro_triggerState( void *triggers, uint8_t num ); // triggers is of type T
void Macro_process();
void Macro_setup();
#endif

7
Macro/PartialMap/usb_hid.h
View File

@ -19,8 +19,7 @@
* THE SOFTWARE.
*/
#ifndef __usb_hid_h
#define __usb_hid_h
#pragma once
// ----- Defines -----
@ -773,7 +772,3 @@
#define AC_DISTRIBUTE_VERTICALLY 0x29C
// 0x29D-0xFFFF Reserved
#endif

13
Macro/basic/macro.h
View File

@ -1,15 +1,15 @@
/* Copyright (C) 2011 by Jacob Alexander
*
/* Copyright (C) 2011,2015 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
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@ -19,8 +19,7 @@
* THE SOFTWARE.
*/
#ifndef __macro_h
#define __macro_h
#pragma once
// ----- Includes -----
@ -34,5 +33,3 @@
void keyPressDetection( uint8_t *keys, uint8_t numberOfKeys, uint8_t *modifiers, uint8_t numberOfModifiers, uint8_t *map );
void process_macros(void);
#endif

13
Macro/buffer/macro.h
View File

@ -1,15 +1,15 @@
/* Copyright (C) 2011 by Jacob Alexander
*
/* Copyright (C) 2011,2015 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
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@ -19,8 +19,7 @@
* THE SOFTWARE.
*/
#ifndef __macro_h
#define __macro_h
#pragma once
// ----- Includes -----
@ -34,5 +33,3 @@
void keyPressDetection( uint8_t *keys, uint8_t numberOfKeys, uint8_t *modifiers, uint8_t numberOfModifiers, uint8_t *map );
void process_macros(void);
#endif

8
Output/pjrcUSB/arm/usb_desc.h
View File

@ -1,7 +1,7 @@
/* Teensyduino Core Library
* http://www.pjrc.com/teensy/
* Copyright (c) 2013 PJRC.COM, LLC.
* Modified by Jacob Alexander (2013-2014)
* Modified by Jacob Alexander (2013-2015)
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -29,8 +29,7 @@
* SOFTWARE.
*/
#ifndef _usb_desc_h_
#define _usb_desc_h_
#pragma once
// ----- Includes -----
@ -126,6 +125,3 @@ extern const uint8_t usb_endpoint_config_table[NUM_ENDPOINTS];
extern const usb_descriptor_list_t usb_descriptor_list[];
#endif

9
Output/pjrcUSB/arm/usb_dev.h
View File

@ -1,7 +1,7 @@
/* Teensyduino Core Library
* http://www.pjrc.com/teensy/
* Copyright (c) 2013 PJRC.COM, LLC.
* Modifications by Jacob Alexander 2014
* Modifications by Jacob Alexander 2014-2015
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -29,8 +29,7 @@
* SOFTWARE.
*/
#ifndef _usb_dev_h_
#define _usb_dev_h_
#pragma once
// ----- Includes -----
@ -87,7 +86,3 @@ void usb_device_reload();
extern void usb_serial_flush_callback();
#endif

9
Output/pjrcUSB/arm/usb_keyboard.h
View File

@ -1,7 +1,7 @@
/* Teensyduino Core Library
* http://www.pjrc.com/teensy/
* Copyright (c) 2013 PJRC.COM, LLC.
* Modifications by Jacob Alexander 2013-2014
* Modifications by Jacob Alexander 2013-2015
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -29,8 +29,7 @@
* SOFTWARE.
*/
#ifndef USBkeyboard_h_
#define USBkeyboard_h_
#pragma once
// ----- Includes -----
@ -46,7 +45,3 @@
void usb_keyboard_send();
#endif // USBkeyboard_h_

9
Output/pjrcUSB/arm/usb_mem.h
View File

@ -1,7 +1,7 @@
/* Teensyduino Core Library
* http://www.pjrc.com/teensy/
* Copyright (c) 2013 PJRC.COM, LLC.
* Modifications by Jacob Alexander (2013-2014)
* Modifications by Jacob Alexander (2013-2015)
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -29,8 +29,7 @@
* SOFTWARE.
*/
#ifndef _usb_mem_h_
#define _usb_mem_h_
#pragma once
// ----- Includes -----
@ -55,7 +54,3 @@ typedef struct usb_packet_struct {
usb_packet_t *usb_malloc();
void usb_free( usb_packet_t *p );
#endif

9
Output/pjrcUSB/arm/usb_serial.h
View File

@ -1,7 +1,7 @@
/* Teensyduino Core Library
* http://www.pjrc.com/teensy/
* Copyright (c) 2013 PJRC.COM, LLC.
* Modifications by Jacob Alexander (2013-2014)
* Modifications by Jacob Alexander (2013-2015)
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -29,8 +29,7 @@
* SOFTWARE.
*/
#ifndef USBserial_h_
#define USBserial_h_
#pragma once
// ----- Includes -----
@ -73,7 +72,3 @@ int usb_serial_write( const void *buffer, uint32_t size );
void usb_serial_flush_input();
void usb_serial_flush_output();
#endif // USBserial_h_

9
Output/pjrcUSB/avr/usb_keyboard_serial.h
View File

@ -1,6 +1,6 @@
/* USB Keyboard and CDC Serial Device for Teensy USB Development Board
* Copyright (c) 2009 PJRC.COM, LLC
* Modifications by Jacob Alexander (2011-2014)
* Modifications by Jacob Alexander (2011-2015)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@ -21,8 +21,7 @@
* THE SOFTWARE.
*/
#ifndef usb_keyboard_serial_h__
#define usb_keyboard_serial_h__
#pragma once
// ----- Includes -----
@ -701,7 +700,3 @@ static const struct descriptor_list_struct {
};
#define NUM_DESC_LIST (sizeof(descriptor_list)/sizeof(struct descriptor_list_struct))
#endif // usb_keyboard_serial_h__

5
Output/pjrcUSB/output_com.h
View File

@ -19,8 +19,7 @@
* THE SOFTWARE.
*/
#ifndef __output_com_h
#define __output_com_h
#pragma once
// ----- Includes -----
@ -116,5 +115,3 @@ int Output_getchar();
int Output_putchar( char c );
int Output_putstr( char* str );
#endif

7
Output/uartOut/arm/uart_serial.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 by Jacob Alexander
/* Copyright (C) 2014-2015 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
@ -19,8 +19,7 @@
* THE SOFTWARE.
*/
#ifndef __uart_serial_h_
#define __uart_serial_h_
#pragma once
#include <inttypes.h>
@ -36,5 +35,3 @@ void uart_serial_setup();
void uart_device_reload();
#endif // __uart_serial_h_

105
Output/uartOut/output_com.h
View File

@ -1,105 +0,0 @@
/* Copyright (C) 2013-2015 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
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef __output_com_h
#define __output_com_h
// ----- Includes -----
// Compiler Includes
#include <stdint.h>
// Local Includes
#include <buildvars.h> // Defines USB Parameters, partially generated by CMake
// ----- Defines -----
// Max size of key buffer needed for NKRO
// Boot mode uses only the first 6 bytes
#define USB_NKRO_BITFIELD_SIZE_KEYS 26
#define USB_BOOT_MAX_KEYS 6
// ----- Enumerations -----
// USB NKRO state transitions (indicates which Report ID's need refreshing)
// Boot mode just checks if any keys were changed (as everything is sent every time)
typedef enum USBKeyChangeState {
USBKeyChangeState_None = 0x00,
USBKeyChangeState_Modifiers = 0x01,
USBKeyChangeState_MainKeys = 0x02,
USBKeyChangeState_SecondaryKeys = 0x04,
USBKeyChangeState_System = 0x08,
USBKeyChangeState_Consumer = 0x10,
} USBKeyChangeState;
// ----- Variables -----
// Variables used to communciate to the output module
// XXX Even if the output module is not USB, this is internally understood keymapping scheme
extern uint8_t USBKeys_Modifiers;
extern uint8_t USBKeys_Keys[USB_NKRO_BITFIELD_SIZE_KEYS];
extern uint8_t USBKeys_Sent;
extern volatile uint8_t USBKeys_LEDs;
extern uint8_t USBKeys_SysCtrl; // 1KRO container for System Control HID table
extern uint16_t USBKeys_ConsCtrl; // 1KRO container for Consumer Control HID table
extern volatile uint8_t USBKeys_Protocol; // 0 - Boot Mode, 1 - NKRO Mode
// Misc variables (XXX Some are only properly utilized using AVR)
extern uint8_t USBKeys_Idle_Config;
extern uint8_t USBKeys_Idle_Count;
extern USBKeyChangeState USBKeys_Changed;
extern uint8_t Output_Available; // 0 - Output module not fully functional, 1 - Output module working
// ----- Capabilities -----
void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *args );
// ----- Functions -----
void Output_setup();
void Output_send();
void Output_firmwareReload();
void Output_softReset();
// Relies on USB serial module
unsigned int Output_availablechar();
int Output_getchar();
int Output_putchar( char c );
int Output_putstr( char* str );
#endif

10
Output/uartOut/setup.cmake
View File

@ -30,6 +30,16 @@ elseif ( ${COMPILER_FAMILY} MATCHES "arm" )
endif ()
###
# Includes
#
# Use pjrcUSB output_com.h
include_directories (
${CMAKE_CURRENT_LIST_DIR}/../pjrcUSB
)
###
# Compiler Family Compatibility
#

119
Output/usbMuxUart/output_com.h
View File

@ -1,119 +0,0 @@
/* Copyright (C) 2013-2015 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
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef __output_com_h
#define __output_com_h
// ----- Includes -----
// Compiler Includes
#include <stdint.h>
// Local Includes
#include <buildvars.h> // Defines USB Parameters, partially generated by CMake
// ----- Defines -----
// Max size of key buffer needed for NKRO
// Boot mode uses only the first 6 bytes
#define USB_NKRO_BITFIELD_SIZE_KEYS 27
#define USB_BOOT_MAX_KEYS 6
// ----- Enumerations -----
// USB NKRO state transitions (indicates which Report ID's need refreshing)
// Boot mode just checks if any keys were changed (as everything is sent every time)
typedef enum USBKeyChangeState {
USBKeyChangeState_None = 0x00,
USBKeyChangeState_Modifiers = 0x01,
USBKeyChangeState_MainKeys = 0x02,
USBKeyChangeState_SecondaryKeys = 0x04,
USBKeyChangeState_TertiaryKeys = 0x08,
USBKeyChangeState_QuartiaryKeys = 0x10,
USBKeyChangeState_System = 0x20,
USBKeyChangeState_Consumer = 0x40,
USBKeyChangeState_All = 0x7F,
} USBKeyChangeState;
// ----- Variables -----
// Variables used to communciate to the output module
// XXX Even if the output module is not USB, this is internally understood keymapping scheme
extern uint8_t USBKeys_Modifiers;
extern uint8_t USBKeys_Keys[USB_NKRO_BITFIELD_SIZE_KEYS];
extern uint8_t USBKeys_Sent;
extern volatile uint8_t USBKeys_LEDs;
extern uint8_t USBKeys_SysCtrl; // 1KRO container for System Control HID table
extern uint16_t USBKeys_ConsCtrl; // 1KRO container for Consumer Control HID table
extern volatile uint8_t USBKeys_Protocol; // 0 - Boot Mode, 1 - NKRO Mode
// Misc variables (XXX Some are only properly utilized using AVR)
extern uint8_t USBKeys_Idle_Config;
extern uint8_t USBKeys_Idle_Count;
extern USBKeyChangeState USBKeys_Changed;
extern uint8_t Output_Available; // 0 - Output module not fully functional, 1 - Output module working
extern uint8_t Output_DebugMode; // 0 - Debug disabled, 1 - Debug enabled
// ----- Capabilities -----
void Output_consCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *args );
void Output_noneSend_capability( uint8_t state, uint8_t stateType, uint8_t *args );
void Output_sysCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *args );
void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *args );
// Configuration capabilities
void Output_kbdProtocolBoot_capability( uint8_t state, uint8_t stateType, uint8_t *args );
void Output_kbdProtocolNKRO_capability( uint8_t state, uint8_t stateType, uint8_t *args );
// ----- Functions -----
void Output_setup();
void Output_send();
void Output_flushBuffers();
void Output_firmwareReload();
void Output_softReset();
// Relies on USB serial module
unsigned int Output_availablechar();
int Output_getchar();
int Output_putchar( char c );
int Output_putstr( char* str );
#endif

8
Scan/ADCTest/defaultMap.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 by Jacob Alexander
/* Copyright (C) 2014-2015 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
@ -19,8 +19,7 @@
* THE SOFTWARE.
*/
#ifndef __KEYMAP_H
#define __KEYMAP_H
#pragma once
// ----- Variables -----
@ -34,6 +33,3 @@ static uint8_t DefaultMap_Lookup[] = {
0, // 0x04
};
#endif

7
Scan/ADCTest/scan_loop.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 by Jacob Alexander
/* Copyright (C) 2014-2015 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
@ -19,8 +19,7 @@
* THE SOFTWARE.
*/
#ifndef __SCAN_LOOP_H
#define __SCAN_LOOP_H
#pragma once
// ----- Includes -----
@ -61,5 +60,3 @@ void Scan_finishedWithUSBBuffer( uint8_t sentKeys );
void Scan_resetKeyboard();
#endif // __SCAN_LOOP_H

8
Scan/BETKB/scan_loop.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2012,2014 by Jacob Alexander
/* Copyright (C) 2012,2014-2015 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
@ -19,8 +19,7 @@
* THE SOFTWARE.
*/
#ifndef __SCAN_LOOP_H
#define __SCAN_LOOP_H
#pragma once
// ----- Includes -----
@ -62,6 +61,3 @@ void Scan_lockKeyboard( void );
void Scan_unlockKeyboard( void );
void Scan_resetKeyboard( void );
#endif // __SCAN_LOOP_H

9
Scan/BudKeypad/matrix.h
View File