Skip to content

Commit 9c6c5dd

Browse files
committed
Removing CDC Virtual Serial Port and adding SAM4S HID-IO support
- 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
1 parent b748839 commit 9c6c5dd

38 files changed

+721
-4745
lines changed

Debug/cli/cli.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (C) 2014-2019 by Jacob Alexander
1+
/* Copyright (C) 2014-2020 by Jacob Alexander
22
*
33
* Permission is hereby granted, free of charge, to any person obtaining a copy
44
* of this software and associated documentation files (the "Software"), to deal
@@ -98,7 +98,7 @@ void prompt()
9898
{
9999
print("\033[2K\r"); // Erases the current line and resets cursor to beginning of line
100100
print("\033[1;34m:\033[0m "); // Blue bold prompt
101-
#if Output_HIDIOEnabled == 1
101+
#if Output_HIDIOEnabled_define == 1
102102
HIDIO_print_flush();
103103
#endif
104104
}
@@ -325,7 +325,7 @@ int CLI_process()
325325

326326
if (dirty)
327327
{
328-
#if Output_HIDIOEnabled == 1
328+
#if Output_HIDIOEnabled_define == 1
329329
HIDIO_print_flush();
330330
#endif
331331
}
@@ -563,7 +563,7 @@ void cliFunc_exit( char* args )
563563

564564
void cliFunc_help( char* args )
565565
{
566-
#if Output_HIDIOEnabled == 1
566+
#if Output_HIDIOEnabled_define == 1
567567
HIDIO_print_flush();
568568
HIDIO_print_mode( HIDIO_PRINT_BUFFER_BULK );
569569
#endif
@@ -590,7 +590,7 @@ void cliFunc_help( char* args )
590590
print( NL );
591591
}
592592
}
593-
#if Output_HIDIOEnabled == 1
593+
#if Output_HIDIOEnabled_define == 1
594594
HIDIO_print_flush();
595595
HIDIO_print_mode( HIDIO_PRINT_BUFFER_LINE );
596596
#endif

Keyboards/Testing/sam4s2a.bash

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
# These build scripts are just a convenience for configuring your keyboard (less daunting than CMake)
44
# Jacob Alexander 2015-2018
55

6+
# TODO REMOVEME
7+
VENDOR_ID="0x308F"
8+
PRODUCT_ID="0x0015"
69

710

811
#################
@@ -43,7 +46,7 @@ DefaultMap=""
4346
# Keyboard Module Configuration
4447
ScanModule="None"
4548
MacroModule="PartialMap"
46-
OutputModule="None"
49+
OutputModule="USBxUART"
4750
DebugModule="full"
4851

4952
# Microcontroller

0 commit comments

Comments
 (0)