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

mine #332

Merged
merged 4 commits into from
Mar 9, 2018
Merged

mine #332

merged 4 commits into from
Mar 9, 2018

Conversation

Mitteau
Copy link
Contributor

@Mitteau Mitteau commented Mar 4, 2018

No description provided.

Jean-Claude Mitteau added 2 commits March 3, 2018 11:47
…son mapping file

 Modifications qui seront validées :
	modifié :         src/cfclient/configs/input/Generic_OS_X.json
	modifié :         src/cfclient/configs/input/Joystick.json
	modifié :         src/cfclient/configs/input/PS3_Mode_1.json
	modifié :         src/cfclient/configs/input/PS3_Mode_2.json
	modifié :         src/cfclient/configs/input/PS3_Mode_3.json
	modifié :         src/cfclient/configs/input/PS4_Mode_1.json
	modifié :         src/cfclient/configs/input/PS4_Mode_2.json
	modifié :         src/cfclient/configs/input/PS4_shoulder_btns_yaw.json
	modifié :         src/cfclient/configs/input/xbox360_mode1.json
	modifié :         src/cfclient/ui/main.py
	modifié :         src/cfclient/utils/input/__init__.py
	modifié :         src/cfclient/utils/input/inputreaders/__init__.py
 Sur la branche master
 Votre branche est en avance sur 'origin/master' de 1 commit.
   (utilisez "git push" pour publier vos commits locaux)

 Modifications qui seront validées :
	modifié :         src/cfclient/utils/input/inputreaders/__init__.py
@Mitteau
Copy link
Contributor Author

Mitteau commented Mar 4, 2018

Implement a roll & pitch deadzone for the input device, parametrized according to the mapping json file. This improvement gives better stationary flight and progressive take off. Also add a json file for new xbox360 joystick.

@krichardsson
Copy link
Contributor

Very nice, this is a great feature that is very useful!

However when I tested, it did not work out of the box since I do not have the "rp_dead_band" parameter in my settings. I get a

Traceback (most recent call last):
  File "/Users/kristoffer/code/bitcraze/crazyflie-clients-python/src/cfclient/ui/main.py", line 738, in _inputconfig_selected
    self.joystickReader.set_input_map(device.name, selected_mapping)
  File "/Users/kristoffer/code/bitcraze/crazyflie-clients-python/src/cfclient/utils/input/__init__.py", line 307, in set_input_map
    self._rp_dead_band = settings["rp_dead_band"]
KeyError: 'rp_dead_band'

I suggest that you add a default value to make the change backwards compatible with configurations that users already have in their machines. You might want to take a look at the _translate_for_backwards_compatibility() function in the config_manager.py file for inspiration!

Thanks!
Kristoffer

 Modifications qui seront validées :
	modifié :         src/cfclient/utils/config_manager.py
	modifié :         src/cfclient/utils/input/__init__.py
@Mitteau Mitteau closed this Mar 5, 2018
 Modifications qui seront validées :
	modifié :         src/cfclient/utils/input/__init__.py
@Mitteau Mitteau reopened this Mar 5, 2018
@krichardsson krichardsson merged commit 120c68c into bitcraze:master Mar 9, 2018
@krichardsson
Copy link
Contributor

Thanks!

@Mitteau
Copy link
Contributor Author

Mitteau commented Mar 10, 2018

With pleasure!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants