Merge pull request #48 from ej113/master_aligned

FFP Force Feedback Effect Improvements
tloimu · Oct 28, 2023 · 60528f7 · 60528f7
2 parents d783221 + abcdae5
commit 60528f7
Show file tree

Hide file tree

Showing 11 changed files with 1,918 additions and 352 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,57 @@
+# Prerequisites
+*.d
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Linker output
+*.ilk
+*.map
+*.exp
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# AVR objects
+*.lst
+*.eep
+*.lss
+*.sym
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+
+# Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb
+
+# Kernel Module Compile Results
+*.mod*
+*.cmd
+.tmp_versions/
+modules.order
+Module.symvers
+Mkfile.old
+dkms.conf
diff --git a/Descriptors.h b/Descriptors.h
@@ -38,7 +38,7 @@
 // Define: ENABLE_JOYSTICK_SERIAL
 //	When defined, includes USB COM serial port to the device
 //	in addition to joystick.
-#define ENABLE_JOYSTICK_SERIAL
+//#define ENABLE_JOYSTICK_SERIAL
 
 	/* Includes: */
 		#include <LUFA/Drivers/USB/USB.h>

diff --git a/debug.h b/debug.h
@@ -46,7 +46,7 @@ bool DoDebug(const uint8_t type);
 
 // If below are defined, code for respective debug target is included into build
 //#define DEBUG_ENABLE_UART
-#define DEBUG_ENABLE_USB
+//#define DEBUG_ENABLE_USB
 
 #define DEBUG_BUFFER_SIZE 512
 

diff --git a/downloads/adaptffbjoy-r54.hex → downloads/adaptffbjoy-0.3.0(r54).hex b/downloads/adaptffbjoy-r54.hex → downloads/adaptffbjoy-0.3.0(r54).hex