Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update oscc to v1.2.4, add validation modifications #31

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
654e9ef
Update README with vehicle compatibility list
vertexmachina Nov 9, 2017
047933b
Add deadzone for steering joystick
vertexmachina Nov 29, 2017
f7d062c
Clear out exponential filter averages on disable
vertexmachina Nov 29, 2017
7ae3fd2
Update torque range to 20% of max range
Dec 8, 2017
75fd4fe
Fix typoo in documentation
Dec 8, 2017
da0fe09
Fix another typo
Dec 8, 2017
92b6dce
Merge remote-tracking branch 'origin/maint/update-torque-feel' into d…
vertexmachina Dec 13, 2017
ffeda9a
Merge 'origin/maint/update-readme' into devel
Dec 13, 2017
d8806e9
Merge 'origin/maint/zero-filters-on-disable' into devel
Dec 13, 2017
cd5bbf5
Add Jenkinsfile
Dec 14, 2017
21b5f03
Fix typo
Dec 14, 2017
90ecfbc
More carefully fix typoo because testing Jenkins locally is hard
Dec 14, 2017
83edf6a
Pull in OSCC repo for building
Dec 14, 2017
2f1377c
Remove unnecessary catch block
Jan 2, 2018
3b61d81
Merge 'origin/maint/add-jenkinsfile' into devel
Jan 2, 2018
f7cca5b
Make initialization of `joystick_data` explicit
Jan 16, 2018
752b391
Merge remote-tracking branch 'snewt/bug/explicit-joystick-data-init' …
Jan 24, 2018
9410337
Add OSCC configuration file
rebpdx Jun 7, 2018
0b2269a
Add OSCC submodule
rebpdx Jun 7, 2018
e1f0c70
Merge pull request #27 from PolySync/maint/update-cmake-config
Jun 7, 2018
9cae150
Merge pull request #30 from PolySync/master
cotos Oct 25, 2018
3454aa3
update oscc to v1.2.4, add validation modifictions
cotos Jul 9, 2019
45bc4c6
Updated README and LICENSE files
cotos Jul 10, 2019
2a60f8f
Update README.md
cotos Jul 10, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "oscc"]
path = oscc
url = https://github.com/PolySync/oscc.git
7 changes: 1 addition & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ project(oscc-joystick-commander)
find_package(PkgConfig REQUIRED)
pkg_check_modules(SDL2 REQUIRED sdl2)

if(KIA_SOUL)
add_definitions(-DKIA_SOUL)
elseif(KIA_SOUL_EV)
add_definitions(-DKIA_SOUL_EV)
endif()
include(oscc/api/OsccConfig.cmake)

add_executable(
oscc-joystick-commander
Expand All @@ -29,4 +25,3 @@ target_link_libraries(
oscc-joystick-commander
PRIVATE
${SDL2_LIBRARIES})

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ cd oscc-joystick-commander
From within the joystick commander directory, clone the OSCC repo:

```
git clone [email protected]:PolySync/oscc.git --branch master
git submodule update --init
```

This will clone into a directory called `oscc` where CMake will look for the OSCC API when it builds joystick commander.
Expand Down
1 change: 1 addition & 0 deletions oscc
Submodule oscc added at 2a2f11