Skip to content

Commit

Permalink
Removing CDC Virtual Serial Port and adding SAM4S HID-IO support
Browse files Browse the repository at this point in the history
- No longer used as HID-IO is fully supported as a serial port
- SAM4S only has enough USB endpoints to support HID-IO or CDC (not
both)
- General cleanup/removal of now unused code
  * Joystick code was never used and will be implemented as part of
  HID-IO now
- Adding RawIO support (HID-IO) for SAM4S
  • Loading branch information
haata committed Jan 18, 2020
1 parent b748839 commit 9c6c5dd
Show file tree
Hide file tree
Showing 38 changed files with 721 additions and 4,745 deletions.
10 changes: 5 additions & 5 deletions Debug/cli/cli.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 2014-2019 by Jacob Alexander
/* Copyright (C) 2014-2020 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
Expand Down Expand Up @@ -98,7 +98,7 @@ void prompt()
{
print("\033[2K\r"); // Erases the current line and resets cursor to beginning of line
print("\033[1;34m:\033[0m "); // Blue bold prompt
#if Output_HIDIOEnabled == 1
#if Output_HIDIOEnabled_define == 1
HIDIO_print_flush();
#endif
}
Expand Down Expand Up @@ -325,7 +325,7 @@ int CLI_process()

if (dirty)
{
#if Output_HIDIOEnabled == 1
#if Output_HIDIOEnabled_define == 1
HIDIO_print_flush();
#endif
}
Expand Down Expand Up @@ -563,7 +563,7 @@ void cliFunc_exit( char* args )

void cliFunc_help( char* args )
{
#if Output_HIDIOEnabled == 1
#if Output_HIDIOEnabled_define == 1
HIDIO_print_flush();
HIDIO_print_mode( HIDIO_PRINT_BUFFER_BULK );
#endif
Expand All @@ -590,7 +590,7 @@ void cliFunc_help( char* args )
print( NL );
}
}
#if Output_HIDIOEnabled == 1
#if Output_HIDIOEnabled_define == 1
HIDIO_print_flush();
HIDIO_print_mode( HIDIO_PRINT_BUFFER_LINE );
#endif
Expand Down
5 changes: 4 additions & 1 deletion Keyboards/Testing/sam4s2a.bash
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
# These build scripts are just a convenience for configuring your keyboard (less daunting than CMake)
# Jacob Alexander 2015-2018

# TODO REMOVEME
VENDOR_ID="0x308F"
PRODUCT_ID="0x0015"


#################
Expand Down Expand Up @@ -43,7 +46,7 @@ DefaultMap=""
# Keyboard Module Configuration
ScanModule="None"
MacroModule="PartialMap"
OutputModule="None"
OutputModule="USBxUART"
DebugModule="full"

# Microcontroller
Expand Down

0 comments on commit 9c6c5dd

Please sign in to comment.