Mercurial > louis > kiibohd-controller
changeset 341:66eccdd9ced5
Code cleanup
- Changing header file ifndef define to pragma once's
- Removed duplicate output_com.h's
line wrap: on
line diff
--- a/Bootloader/_buildvars.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Bootloader/_buildvars.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 -
--- a/Bootloader/debug.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Bootloader/debug.h Sun Jun 14 13:56:56 2015 -0700 @@ -19,8 +19,7 @@ * THE SOFTWARE. */ -#ifndef debug_h__ -#define debug_h__ +#pragma once // ----- Includes ----- @@ -64,5 +63,3 @@ #define printHex_op(in,op) #endif -#endif -
--- a/Bootloader/dfu.desc.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Bootloader/dfu.desc.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 dfu_function_desc usb_function_0; }; -#endif -
--- a/Bootloader/dfu.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Bootloader/dfu.h Sun Jun 14 13:56:56 2015 -0700 @@ -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_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
--- a/Bootloader/flash.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Bootloader/flash.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 @@ 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 -
--- a/Bootloader/ftfl.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Bootloader/ftfl.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 char FlexRAM[]; extern struct FTFL_CONFIG_t FTFL_CONFIG; -#endif -
--- a/Bootloader/mchck-cdefs.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Bootloader/mchck-cdefs.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 @@ ) \ ) -#endif -
--- a/Bootloader/mchck.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Bootloader/mchck.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 @@ #include "flash.h" #include "usb.h" -#endif -
--- a/Bootloader/sim.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Bootloader/sim.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 @@ extern volatile struct SIM_t SIM; -#endif -
--- a/Bootloader/usb-common.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Bootloader/usb-common.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 @@ EP0_BUFSIZE = 64 }; -#endif -
--- a/Bootloader/usb-internal.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Bootloader/usb-internal.h Sun Jun 14 13:56:56 2015 -0700 @@ -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_enable(void); const struct usbd_config *usb_get_config_data(int config); -#endif -
--- a/Bootloader/usb.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Bootloader/usb.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 @@ #include "dfu.h" -#endif -
--- a/Bootloader/usbotg.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Bootloader/usbotg.h Sun Jun 14 13:56:56 2015 -0700 @@ -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"
--- a/Debug/cli/cli.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Debug/cli/cli.h Sun Jun 14 13:56:56 2015 -0700 @@ -19,8 +19,7 @@ * THE SOFTWARE. */ -#ifndef cli_h__ -#define cli_h__ +#pragma once // ----- Includes ----- @@ -130,6 +129,3 @@ void cliFunc_restart ( char* args ); void cliFunc_version ( char* args ); - -#endif -
--- a/Debug/led/led.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Debug/led/led.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 -
--- a/Debug/print/print.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Debug/print/print.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 @@ 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 -
--- a/Lib/Interrupts.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Lib/Interrupts.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 -
--- a/Lib/MacroLib.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Lib/MacroLib.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 -
--- a/Lib/MainLib.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Lib/MainLib.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 -
--- a/Lib/OutputLib.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Lib/OutputLib.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 -
--- a/Lib/ScanLib.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Lib/ScanLib.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 -
--- a/Lib/_buildvars.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Lib/_buildvars.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 -
--- a/Lib/delay.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Lib/delay.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 @@ void delay(uint32_t ms); -#endif -
--- a/Lib/mk20dx.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Lib/mk20dx.h Sun Jun 14 13:56:56 2015 -0700 @@ -29,8 +29,7 @@ * SOFTWARE. */ -#ifndef _mk20dx_h_ -#define _mk20dx_h_ +#pragma once // ----- Defines ----- @@ -2090,5 +2089,3 @@ extern void porte_isr(void); extern void software_isr(void); -#endif -
--- a/Macro/PartialMap/kll.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Macro/PartialMap/kll.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 @@ // Total number of layers #define LayerNum sizeof( LayerIndex ) / sizeof( Layer ) - - -#endif // __kll_h -
--- a/Macro/PartialMap/macro.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Macro/PartialMap/macro.h Sun Jun 14 13:56:56 2015 -0700 @@ -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_process(); void Macro_setup(); -#endif -
--- a/Macro/PartialMap/usb_hid.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Macro/PartialMap/usb_hid.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 -
--- a/Macro/basic/macro.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Macro/basic/macro.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 -
--- a/Macro/buffer/macro.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Macro/buffer/macro.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 -
--- a/Output/pjrcUSB/arm/usb_desc.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Output/pjrcUSB/arm/usb_desc.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 usb_descriptor_list_t usb_descriptor_list[]; - -#endif -
--- a/Output/pjrcUSB/arm/usb_dev.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Output/pjrcUSB/arm/usb_dev.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 @@ extern void usb_serial_flush_callback(); - - -#endif -
--- a/Output/pjrcUSB/arm/usb_keyboard.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Output/pjrcUSB/arm/usb_keyboard.h Sun Jun 14 13:56:56 2015 -0700 @@ -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_ -
--- a/Output/pjrcUSB/arm/usb_mem.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Output/pjrcUSB/arm/usb_mem.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 @@ usb_packet_t *usb_malloc(); void usb_free( usb_packet_t *p ); - - -#endif -
--- a/Output/pjrcUSB/arm/usb_serial.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Output/pjrcUSB/arm/usb_serial.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 @@ void usb_serial_flush_input(); void usb_serial_flush_output(); - - -#endif // USBserial_h_ -
--- a/Output/pjrcUSB/avr/usb_keyboard_serial.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Output/pjrcUSB/avr/usb_keyboard_serial.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 @@ }; #define NUM_DESC_LIST (sizeof(descriptor_list)/sizeof(struct descriptor_list_struct)) - - -#endif // usb_keyboard_serial_h__ -
--- a/Output/pjrcUSB/output_com.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Output/pjrcUSB/output_com.h Sun Jun 14 13:56:56 2015 -0700 @@ -19,8 +19,7 @@ * THE SOFTWARE. */ -#ifndef __output_com_h -#define __output_com_h +#pragma once // ----- Includes ----- @@ -116,5 +115,3 @@ int Output_putchar( char c ); int Output_putstr( char* str ); -#endif -
--- a/Output/uartOut/arm/uart_serial.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Output/uartOut/arm/uart_serial.h Sun Jun 14 13:56:56 2015 -0700 @@ -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_device_reload(); -#endif // __uart_serial_h_ -
--- a/Output/uartOut/output_com.h Sat Jun 13 20:42:12 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -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 -
--- a/Output/uartOut/setup.cmake Sat Jun 13 20:42:12 2015 -0700 +++ b/Output/uartOut/setup.cmake Sun Jun 14 13:56:56 2015 -0700 @@ -31,6 +31,16 @@ ### +# Includes +# + +# Use pjrcUSB output_com.h +include_directories ( + ${CMAKE_CURRENT_LIST_DIR}/../pjrcUSB +) + + +### # Compiler Family Compatibility # set( ModuleCompatibility
--- a/Output/usbMuxUart/output_com.h Sat Jun 13 20:42:12 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -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 -
--- a/Scan/ADCTest/defaultMap.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/ADCTest/defaultMap.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 @@ 0, // 0x04 }; - -#endif -
--- a/Scan/ADCTest/scan_loop.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/ADCTest/scan_loop.h Sun Jun 14 13:56:56 2015 -0700 @@ -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_resetKeyboard(); -#endif // __SCAN_LOOP_H -
--- a/Scan/BETKB/scan_loop.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/BETKB/scan_loop.h Sun Jun 14 13:56:56 2015 -0700 @@ -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_unlockKeyboard( void ); void Scan_resetKeyboard( void ); - -#endif // __SCAN_LOOP_H -
--- a/Scan/BudKeypad/matrix.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/BudKeypad/matrix.h Sun Jun 14 13:56:56 2015 -0700 @@ -1,4 +1,4 @@ -/* 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 @@ -19,8 +19,7 @@ * THE SOFTWARE. */ -#ifndef __MATRIX_H -#define __MATRIX_H +#pragma once // ----- Includes ----- @@ -74,7 +73,3 @@ }; - - -#endif // __MATRIX_H -
--- a/Scan/DPH/scan_loop.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/DPH/scan_loop.h Sun Jun 14 13:56:56 2015 -0700 @@ -1,4 +1,4 @@ -/* Copyright (C) 2013-2014 by Jacob Alexander +/* Copyright (C) 2013-2015 by Jacob Alexander * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -14,8 +14,7 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SCAN_LOOP_H -#define __SCAN_LOOP_H +#pragma once // ----- Includes ----- @@ -56,6 +55,3 @@ void Scan_finishedWithMacro( uint8_t sentKeys ); void Scan_finishedWithOutput( uint8_t sentKeys ); - -#endif // __SCAN_LOOP_H -
--- a/Scan/EpsonQX-10/scan_loop.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/EpsonQX-10/scan_loop.h Sun Jun 14 13:56:56 2015 -0700 @@ -1,4 +1,4 @@ -/* Copyright (C) 2011,2014 by Jacob Alexander +/* Copyright (C) 2011,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,6 +60,3 @@ void Scan_unlockKeyboard( void ); void Scan_resetKeyboard( void ); - -#endif // __SCAN_LOOP_H -
--- a/Scan/FACOM6684/scan_loop.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/FACOM6684/scan_loop.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 __SCAN_LOOP_H -#define __SCAN_LOOP_H +#pragma once // ----- Includes ----- @@ -62,6 +61,3 @@ void Scan_unlockKeyboard( void ); void Scan_resetKeyboard( void ); - -#endif // __SCAN_LOOP_H -
--- a/Scan/HP150/scan_loop.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/HP150/scan_loop.h Sun Jun 14 13:56:56 2015 -0700 @@ -1,4 +1,4 @@ -/* Copyright (C) 2012,2014 by Jacob Alexander +/* Copyright (C) 2012,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_unlockKeyboard( void ); void Scan_resetKeyboard( void ); - -#endif // __SCAN_LOOP_H -
--- a/Scan/HeathZenith/matrix.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/HeathZenith/matrix.h Sun Jun 14 13:56:56 2015 -0700 @@ -1,4 +1,4 @@ -/* 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 @@ -19,8 +19,7 @@ * THE SOFTWARE. */ -#ifndef __MATRIX_H -#define __MATRIX_H +#pragma once // ----- Includes ----- @@ -63,7 +62,3 @@ }; - - -#endif // __MATRIX_H -
--- a/Scan/IBMConvertible/matrix.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/IBMConvertible/matrix.h Sun Jun 14 13:56:56 2015 -0700 @@ -1,4 +1,4 @@ -/* Copyright (C) 2012 by Jacob Alexander +/* Copyright (C) 2012,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 __MATRIX_H -#define __MATRIX_H +#pragma once // ----- Includes ----- @@ -67,7 +66,3 @@ }; - - -#endif // __MATRIX_H -
--- a/Scan/ISSILed/led_scan.c Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/ISSILed/led_scan.c Sun Jun 14 13:56:56 2015 -0700 @@ -23,6 +23,7 @@ #include <cli.h> #include <led.h> #include <print.h> +#include <led_conf.h> // Located with scan_loop.c // Local Includes #include "led_scan.h" @@ -139,6 +140,8 @@ 0x43, 0x43, // C9-1 -> C9-16 }; */ + +/* const uint8_t LED_ledEnableMask[] = { 0xE8, // I2C address 0x00, // Starting register address @@ -153,8 +156,10 @@ 0x00, 0x00, // C8-1 -> C8-16 0x00, 0x00, // C9-1 -> C9-16 }; +*/ +/* // XXX Pre-fill example of buffers const uint8_t examplePage[] = { 0xE8, // I2C address @@ -169,8 +174,8 @@ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // C8-1 -> C8-16 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // C9-1 -> C9-16 }; +*/ -/* // XXX Pre-fill example of buffers const uint8_t examplePage[] = { 0xE8, // I2C address @@ -185,7 +190,6 @@ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, // C8-1 -> C8-16 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, // C9-1 -> C9-16 }; -*/ @@ -429,15 +433,14 @@ // Initialize I2C I2C_setup(); - /* TODO Make work // Zero out Frame Registers // This needs to be done before disabling the hardware shutdown (or the leds will do undefined things) LED_zeroPages( 0x0B, 1, 0x00, 0x0C ); // Control Registers // Disable Hardware shutdown of ISSI chip (pull high) - GPIOD_PDDR |= (1<<1); - PORTD_PCR1 = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(1); - GPIOD_PSOR |= (1<<1); + GPIOB_PDDR |= (1<<16); + PORTB_PCR16 = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(1); + GPIOB_PSOR |= (1<<16); // Clear LED Pages LED_zeroPages( 0x00, 8, 0x00, 0xB4 ); // LED Registers @@ -447,7 +450,6 @@ // Disable Software shutdown of ISSI chip LED_writeReg( 0x0A, 0x01, 0x0B ); - */ }
--- a/Scan/ISSILed/led_scan.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/ISSILed/led_scan.h Sun Jun 14 13:56:56 2015 -0700 @@ -14,8 +14,7 @@ * along with this file. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __LED_SCAN_H -#define __LED_SCAN_H +#pragma once // ----- Includes ----- @@ -29,6 +28,3 @@ void LED_setup(); uint8_t LED_scan(); - -#endif // __LED_SCAN_H -
--- a/Scan/Kaypro1/scan_loop.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/Kaypro1/scan_loop.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 __SCAN_LOOP_H -#define __SCAN_LOOP_H +#pragma once // ----- Includes ----- @@ -62,6 +61,3 @@ void Scan_unlockKeyboard( void ); void Scan_resetKeyboard( void ); - -#endif // __SCAN_LOOP_H -
--- a/Scan/MBC-55X/defaultMap.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/MBC-55X/defaultMap.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 __KEYMAP_H -#define __KEYMAP_H +#pragma once // This file contains various key layouts for the Sanyo MBC-55X Computer Keyboard @@ -287,5 +286,3 @@ 0, // 0xFF }; -#endif -
--- a/Scan/MBC-55X/scan_loop.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/MBC-55X/scan_loop.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 __SCAN_LOOP_H -#define __SCAN_LOOP_H +#pragma once // ----- Includes ----- @@ -62,6 +61,3 @@ void Scan_unlockKeyboard( void ); void Scan_resetKeyboard( void ); - -#endif // __SCAN_LOOP_H -
--- a/Scan/MD1/matrix.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/MD1/matrix.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 __MATRIX_H -#define __MATRIX_H +#pragma once // ----- Includes ----- @@ -55,6 +54,3 @@ // Define type of scan matrix Config Matrix_type = Config_Pulldown; - -#endif // __MATRIX_H -
--- a/Scan/MD1/scan_loop.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/MD1/scan_loop.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 ----- @@ -39,6 +38,3 @@ void Scan_finishedWithMacro( uint8_t sentKeys ); // Called by Macro Module void Scan_finishedWithOutput( uint8_t sentKeys ); // Called by Output Module - -#endif // __SCAN_LOOP_H -
--- a/Scan/MD2/matrix.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/MD2/matrix.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 __MATRIX_H -#define __MATRIX_H +#pragma once // ----- Macros ----- @@ -58,6 +57,3 @@ // Define type of scan matrix Config Matrix_type = Config_Pulldown; - -#endif // __MATRIX_H -
--- a/Scan/MD2/scan_loop.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/MD2/scan_loop.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 ----- @@ -39,6 +38,3 @@ void Scan_finishedWithMacro( uint8_t sentKeys ); // Called by Macro Module void Scan_finishedWithOutput( uint8_t sentKeys ); // Called by Output Module - -#endif // __SCAN_LOOP_H -
--- a/Scan/MatrixARM/matrix_scan.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/MatrixARM/matrix_scan.h Sun Jun 14 13:56:56 2015 -0700 @@ -19,8 +19,7 @@ * THE SOFTWARE. */ -#ifndef __MATRIX_SCAN_H -#define __MATRIX_SCAN_H +#pragma once // ----- Includes ----- @@ -140,6 +139,3 @@ void Matrix_setup(); void Matrix_scan( uint16_t scanNum ); - -#endif // __MATRIX_SCAN_H -
--- a/Scan/MatrixARM/matrix_setup.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/MatrixARM/matrix_setup.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 __MATRIX_SETUP_H -#define __MATRIX_SETUP_H +#pragma once // ----- Macros ----- @@ -30,6 +29,3 @@ #define Matrix_rowsNum sizeof( Matrix_rows ) / sizeof( GPIO_Pin ) #define Matrix_maxKeys sizeof( Matrix_scanArray ) / sizeof( KeyState ) - -#endif // __MATRIX_SETUP_H -
--- a/Scan/MicroSwitch8304/scan_loop.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/MicroSwitch8304/scan_loop.h Sun Jun 14 13:56:56 2015 -0700 @@ -1,4 +1,4 @@ -/* Copyright (C) 2011,2014 by Jacob Alexander +/* Copyright (C) 2011,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_unlockKeyboard( void ); void Scan_resetKeyboard( void ); - -#endif // __SCAN_LOOP_H -
--- a/Scan/SKM67001/customSKM.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/SKM67001/customSKM.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 __KEYMAP_H -#define __KEYMAP_H +#pragma once // ----- Variables ----- @@ -114,6 +113,3 @@ 0, // 0x55 }; - -#endif -
--- a/Scan/SKM67001/defaultMap.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/SKM67001/defaultMap.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 __KEYMAP_H -#define __KEYMAP_H +#pragma once // This file contains various key layouts for the SKM 67001 Keyboard from the Olympia Professional ES 105 Typewriter @@ -116,6 +115,3 @@ 0, // 0x55 }; - -#endif -
--- a/Scan/SKM67001/matrix.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/SKM67001/matrix.h Sun Jun 14 13:56:56 2015 -0700 @@ -1,15 +1,15 @@ -/* Copyright (C) 2012 by Jacob Alexander - * +/* Copyright (C) 2012,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 __MATRIX_H -#define __MATRIX_H +#pragma once // ----- Includes ----- @@ -73,7 +72,3 @@ }; - - -#endif // __MATRIX_H -
--- a/Scan/STLcd/lcd_scan.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/STLcd/lcd_scan.h Sun Jun 14 13:56:56 2015 -0700 @@ -14,8 +14,7 @@ * along with this file. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __LCD_SCAN_H -#define __LCD_SCAN_H +#pragma once // ----- Includes ----- @@ -29,6 +28,3 @@ void LCD_setup(); uint8_t LCD_scan(); - -#endif // __LCD_SCAN_H -
--- a/Scan/SonyNEWS/scan_loop.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/SonyNEWS/scan_loop.h Sun Jun 14 13:56:56 2015 -0700 @@ -1,4 +1,4 @@ -/* Copyright (C) 2011,2014 by Jacob Alexander +/* Copyright (C) 2011,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,9 +19,6 @@ * THE SOFTWARE. */ -#ifndef __SCAN_LOOP_H -#define __SCAN_LOOP_H - // ----- Includes ----- // Compiler Includes @@ -61,6 +58,3 @@ void Scan_unlockKeyboard( void ); void Scan_resetKeyboard( void ); - -#endif // __SCAN_LOOP_H -
--- a/Scan/SonyOA-S3400/scan_loop.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/SonyOA-S3400/scan_loop.h Sun Jun 14 13:56:56 2015 -0700 @@ -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,9 +19,6 @@ * THE SOFTWARE. */ -#ifndef __SCAN_LOOP_H -#define __SCAN_LOOP_H - // ----- Includes ----- // Compiler Includes @@ -62,6 +59,3 @@ void Scan_unlockKeyboard( void ); void Scan_resetKeyboard( void ); - -#endif // __SCAN_LOOP_H -
--- a/Scan/Tandy1000/scan_loop.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/Tandy1000/scan_loop.h Sun Jun 14 13:56:56 2015 -0700 @@ -1,4 +1,4 @@ -/* Copyright (C) 2011,2014 by Jacob Alexander +/* Copyright (C) 2011,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_unlockKeyboard( void ); void Scan_resetKeyboard( void ); - -#endif // __SCAN_LOOP_H -
--- a/Scan/UARTConnect/connect_scan.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/UARTConnect/connect_scan.h Sun Jun 14 13:56:56 2015 -0700 @@ -14,8 +14,7 @@ * along with this file. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __CONNECT_SCAN_H -#define __CONNECT_SCAN_H +#pragma once // ----- Includes ----- @@ -117,6 +116,3 @@ void Connect_setup( uint8_t master ); void Connect_scan(); - -#endif // __CONNECT_SCAN_H -
--- a/Scan/UnivacF3W9/scan_loop.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/UnivacF3W9/scan_loop.h Sun Jun 14 13:56:56 2015 -0700 @@ -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 ----- @@ -61,6 +60,3 @@ void Scan_unlockKeyboard( void ); void Scan_resetKeyboard( void ); - -#endif // __SCAN_LOOP_H -
--- a/Scan/matrix/matrix_scan.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/matrix/matrix_scan.h Sun Jun 14 13:56:56 2015 -0700 @@ -1,4 +1,4 @@ -/* Copyright (C) 2011,2014 by Jacob Alexander +/* Copyright (C) 2011,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 __MATRIX_SCAN_H -#define __MATRIX_SCAN_H +#pragma once // ----- Includes ----- @@ -119,5 +118,3 @@ void matrix_pinSetup( uint8_t *matrix, uint8_t scanType ); void matrix_scan( uint8_t *matrix, uint8_t *detectArray ); -#endif // __MATRIX_SCAN_H -
--- a/Scan/matrix/matrix_template.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/matrix/matrix_template.h Sun Jun 14 13:56:56 2015 -0700 @@ -1,4 +1,4 @@ -/* Copyright (C) 2011,2014 by Jacob Alexander +/* Copyright (C) 2011,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 __MATRIX_H -#define __MATRIX_H +#pragma once // ----- Includes ----- @@ -147,7 +146,3 @@ }; - - -#endif // __MATRIX_H -
--- a/Scan/matrix/scan_loop.h Sat Jun 13 20:42:12 2015 -0700 +++ b/Scan/matrix/scan_loop.h Sun Jun 14 13:56:56 2015 -0700 @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2012,2014 by Jacob Alexander +/* Copyright (C) 2011-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 ----- @@ -63,6 +62,3 @@ void Scan_finishedWithBuffer( uint8_t sentKeys ); void Scan_finishedWithUSBBuffer( uint8_t sentKeys ); - -#endif // __SCAN_LOOP_H -
--- a/main.c Sat Jun 13 20:42:12 2015 -0700 +++ b/main.c Sun Jun 14 13:56:56 2015 -0700 @@ -40,17 +40,6 @@ int main() { - /* - GPIOA_PDDR |= (1<<5); - // Setup pin - A5 - See Lib/pin_map.mchck for more details on pins - PORTA_PCR5 = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(1); - while( 1 ) - { - GPIOA_PTOR |= (1<<5); - for (uint32_t d = 0; d < 720000; d++ ); - } - */ - // AVR - Teensy Set Clock speed to 16 MHz #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) CLKPR = 0x80;