di0ib
/
controller
Watch 1
Star 0
Fork 0
Code Releases 0 Activity
Browse Source

Moving USB to Output in preparation for additional Output types. 

* Initial cli code
simple
Jacob Alexander 10 years ago
parent
e9aa3880a6
commit
59f13f8f4f
23 changed files with 164 additions and 33 deletions
Split View Show Diff Stats
  1. 5
    5
      CMakeLists.txt
  2. 37
    0
      Debug/cli/cli.c
  3. 49
    0
      Debug/cli/cli.h
  4. 42
    0
      Debug/cli/setup.cmake
  5. 4
    2
      Debug/full/setup.cmake
  6. 3
    3
      Debug/print/print.c
  7. 3
    3
      Debug/print/print.h
  8. 0
    0
      Output/pjrcUSB/arm/usb_desc.c
  9. 0
    0
      Output/pjrcUSB/arm/usb_desc.h
  10. 0
    0
      Output/pjrcUSB/arm/usb_dev.c
  11. 0
    0
      Output/pjrcUSB/arm/usb_dev.h
  12. 0
    0
      Output/pjrcUSB/arm/usb_keyboard.c
  13. 0
    0
      Output/pjrcUSB/arm/usb_keyboard.h
  14. 0
    0
      Output/pjrcUSB/arm/usb_mem.c
  15. 0
    0
      Output/pjrcUSB/arm/usb_mem.h
  16. 0
    0
      Output/pjrcUSB/arm/usb_serial.c
  17. 0
    0
      Output/pjrcUSB/arm/usb_serial.h
  18. 0
    0
      Output/pjrcUSB/avr/usb_keyboard_debug.c
  19. 0
    0
      Output/pjrcUSB/avr/usb_keyboard_debug.h
  20. 1
    1
      Output/pjrcUSB/output_com.c
  21. 2
    2
      Output/pjrcUSB/output_com.h
  22. 5
    5
      Output/pjrcUSB/setup.cmake
  23. 13
    12
      setup.cmake

+ 5
- 5
CMakeLists.txt View File

@@ -70,7 +70,7 @@ set( SRCS
${COMPILER_SRCS}
${SCAN_SRCS}
${MACRO_SRCS}
${USB_SRCS}
${OUTPUT_SRCS}
${DEBUG_SRCS}
)

@@ -84,10 +84,10 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
#

#| Check for whether the set modules are compatible with the specified compiler family
ModuleCompatibility( ${ScanModulePath} ${ScanModuleCompatibility} )
ModuleCompatibility( ${MacroModulePath} ${MacroModuleCompatibility} )
ModuleCompatibility( ${USBModulePath} ${USBModuleCompatibility} )
ModuleCompatibility( ${DebugModulePath} ${DebugModuleCompatibility} )
ModuleCompatibility( ${ScanModulePath} ${ScanModuleCompatibility} )
ModuleCompatibility( ${MacroModulePath} ${MacroModuleCompatibility} )
ModuleCompatibility( ${OutputModulePath} ${OutputModuleCompatibility} )
ModuleCompatibility( ${DebugModulePath} ${DebugModuleCompatibility} )




+ 37
- 0
Debug/cli/cli.c View File

@@ -0,0 +1,37 @@
/* Copyright (C) 2014 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.
*/

// ----- Includes -----

// Compiler Includes
//#include <stdarg.h>

// Project Includes
#include "cli.h"



// ----- Functions -----

void initCLI()
{
}


+ 49
- 0
Debug/cli/cli.h View File

@@ -0,0 +1,49 @@
/* Copyright (C) 2014 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 cli_h__
#define cli_h__

// ----- Includes -----

// Compiler Includes
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)

#elif defined(_mk20dx128_)

#include "arm/usb_serial.h"

#endif



// ----- Defines -----



// ----- Functions and Corresponding Function Aliases -----

void initCLI();



#endif


+ 42
- 0
Debug/cli/setup.cmake View File

@@ -0,0 +1,42 @@
###| CMake Kiibohd Controller Debug Module |###
#
# Written by Jacob Alexander in 2014 for the Kiibohd Controller
#
# Released into the Public Domain
#
###


###
# Module C files
#

set( DEBUG_SRCS
cli.c
)


###
# Setup File Dependencies
#


###
# Module Specific Options
#


###
# Just in case, you only want this module and are using others as well
#
add_definitions( -I${HEAD_DIR}/Debug/off )


###
# Compiler Family Compatibility
#
set( DebugModuleCompatibility
arm
avr
)


+ 4
- 2
Debug/full/setup.cmake View File

@@ -1,6 +1,6 @@
###| CMake Kiibohd Controller Debug Module |###
#
# Written by Jacob Alexander in 2011 for the Kiibohd Controller
# Written by Jacob Alexander in 2011-2014 for the Kiibohd Controller
#
# Released into the Public Domain
#
@@ -13,6 +13,7 @@

#| XXX Requires the ../ due to how the paths are constructed
set( DEBUG_SRCS
../cli/cli.c
../led/led.c
../print/print.c
)
@@ -22,13 +23,14 @@ set( DEBUG_SRCS
# Setup File Dependencies
#
add_file_dependencies( ../led/led.c ../led/led.h )
add_file_dependencies( ../led/print.c ../led/print.h )
add_file_dependencies( ../print/print.c ../print/print.h )


###
# Module Specific Options
#
add_definitions(
-I${HEAD_DIR}/Debug/cli
-I${HEAD_DIR}/Debug/led
-I${HEAD_DIR}/Debug/print
)

+ 3
- 3
Debug/print/print.c View File

@@ -1,15 +1,15 @@
/* Copyright (C) 2011-2013 by Jacob Alexander
*
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* 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

+ 3
- 3
Debug/print/print.h View File

@@ -1,15 +1,15 @@
/* Copyright (C) 2011-2013 by Jacob Alexander
*
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* 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

USB/pjrc/arm/usb_desc.c → Output/pjrcUSB/arm/usb_desc.c View File


USB/pjrc/arm/usb_desc.h → Output/pjrcUSB/arm/usb_desc.h View File


USB/pjrc/arm/usb_dev.c → Output/pjrcUSB/arm/usb_dev.c View File


USB/pjrc/arm/usb_dev.h → Output/pjrcUSB/arm/usb_dev.h View File


USB/pjrc/arm/usb_keyboard.c → Output/pjrcUSB/arm/usb_keyboard.c View File


USB/pjrc/arm/usb_keyboard.h → Output/pjrcUSB/arm/usb_keyboard.h View File


USB/pjrc/arm/usb_mem.c → Output/pjrcUSB/arm/usb_mem.c View File


USB/pjrc/arm/usb_mem.h → Output/pjrcUSB/arm/usb_mem.h View File


USB/pjrc/arm/usb_serial.c → Output/pjrcUSB/arm/usb_serial.c View File


USB/pjrc/arm/usb_serial.h → Output/pjrcUSB/arm/usb_serial.h View File


USB/pjrc/avr/usb_keyboard_debug.c → Output/pjrcUSB/avr/usb_keyboard_debug.c View File


USB/pjrc/avr/usb_keyboard_debug.h → Output/pjrcUSB/avr/usb_keyboard_debug.h View File


USB/pjrc/usb_com.c → Output/pjrcUSB/output_com.c View File

@@ -36,7 +36,7 @@
#endif

// Local Includes
#include "usb_com.h"
#include "output_com.h"




USB/pjrc/usb_com.h → Output/pjrcUSB/output_com.h View File

@@ -19,8 +19,8 @@
* THE SOFTWARE.
*/

#ifndef __usb_com_h
#define __usb_com_h
#ifndef __output_com_h
#define __output_com_h

// ----- Includes -----


USB/pjrc/setup.cmake → Output/pjrcUSB/setup.cmake View File

@@ -15,16 +15,16 @@
#| AVR Compiler
if ( ${COMPILER_FAMILY} MATCHES "avr" )

set( USB_SRCS
usb_com.c
set( OUTPUT_SRCS
output_com.c
avr/usb_keyboard_debug.c
)

#| ARM Compiler
elseif ( ${COMPILER_FAMILY} MATCHES "arm" )

set( USB_SRCS
usb_com.c
set( OUTPUT_SRCS
output_com.c
arm/usb_desc.c
arm/usb_dev.c
arm/usb_keyboard.c
@@ -42,7 +42,7 @@ endif ( ${COMPILER_FAMILY} MATCHES "avr" )
###
# Compiler Family Compatibility
#
set( USBModuleCompatibility
set( OutputModuleCompatibility
arm
avr
)

+ 13
- 12
setup.cmake View File

@@ -26,10 +26,10 @@ set( ScanModule "MBC-55X" )
set( MacroModule "buffer" )

##| Sends the current list of usb key codes through USB HID
set( USBModule "pjrc" )
set( OutputModule "pjrcUSB" )

##| Debugging source to use, each module has it's own set of defines that it sets
set( DebugModule "full" )
set( DebugModule "full" )



@@ -45,11 +45,12 @@ endif ()

###
# Path Setup
#
set( ScanModulePath "Scan/${ScanModule}" )
set( MacroModulePath "Macro/${MacroModule}" )
set( USBModulePath "USB/${USBModule}" )
set( DebugModulePath "Debug/${DebugModule}" )
#
set( ScanModulePath "Scan/${ScanModule}" )
set( MacroModulePath "Macro/${MacroModule}" )
set( OutputModulePath "Output/${OutputModule}" )
set( USBModulePath "USB/${USBModule}" )
set( DebugModulePath "Debug/${DebugModule}" )

#| Top-level directory adjustment
set( HEAD_DIR "${CMAKE_CURRENT_SOURCE_DIR}" )
@@ -87,7 +88,7 @@ add_definitions()
add_definitions(
-I${HEAD_DIR}/${ScanModulePath}
-I${HEAD_DIR}/${MacroModulePath}
-I${HEAD_DIR}/${USBModulePath}
-I${HEAD_DIR}/${OutputModulePath}
-I${HEAD_DIR}/${DebugModulePath}
)

@@ -123,9 +124,9 @@ PathPrepend( SCAN_SRCS ${ScanModulePath} ${SCAN_SRCS} )
include ( "${MacroModulePath}/setup.cmake" )
PathPrepend( MACRO_SRCS ${MacroModulePath} ${MACRO_SRCS} )

#| USB Module
include ( "${USBModulePath}/setup.cmake" )
PathPrepend( USB_SRCS ${USBModulePath} ${USB_SRCS} )
#| Output Module
include ( "${OutputModulePath}/setup.cmake" )
PathPrepend( OUTPUT_SRCS ${OutputModulePath} ${OUTPUT_SRCS} )

#| Debugging Module
include ( "${DebugModulePath}/setup.cmake" )
@@ -138,7 +139,7 @@ message( "${SCAN_SRCS}" )
message( STATUS "Detected Macro Module Source Files:" )
message( "${MACRO_SRCS}" )
message( STATUS "Detected USB Module Source Files:" )
message( "${USB_SRCS}" )
message( "${OUTPUT_SRCS}" )
message( STATUS "Detected Debug Module Source Files:" )
message( "${DEBUG_SRCS}" )