Skip to content

Python API fixes #2599

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.

Sign up for GitHub

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

Merged
Ratnesh Madaan (madratman) merged 2 commits into from
Apr 30, 2020
Merged

Python API fixes #2599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a32285
[Pythonclient/types] Fix set_throttle method in CarControls
rajat2004 Apr 19, 2020
8e03078
[PythonClient] Remove return from void-type APIs
rajat2004 Apr 19, 2020
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
12 changes: 6 additions & 6 deletions PythonClient/airsim/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def enableApiControl(self, is_enabled, vehicle_name = ''):
is_enabled (bool): True to enable, False to disable API control
vehicle_name (str, optional): Name of the vehicle to send this command to
"""
return self.client.call('enableApiControl', is_enabled, vehicle_name)
self.client.call('enableApiControl', is_enabled, vehicle_name)

def isApiControlEnabled(self, vehicle_name = ''):
"""
Expand Down Expand Up @@ -186,7 +186,7 @@ def simSetTimeOfDay(self, is_enabled, start_datetime = "", is_start_datetime_dst
update_interval_secs (float, optional): Interval to update the Sun's position
move_sun (bool, optional): Whether or not to move the Sun
"""
return self.client.call('simSetTimeOfDay', is_enabled, start_datetime, is_start_datetime_dst, celestial_clock_speed, update_interval_secs, move_sun)
self.client.call('simSetTimeOfDay', is_enabled, start_datetime, is_start_datetime_dst, celestial_clock_speed, update_interval_secs, move_sun)

# weather
def simEnableWeather(self, enable):
Expand All @@ -196,7 +196,7 @@ def simEnableWeather(self, enable):
Args:
enable (bool): True to enable, False to disable
"""
return self.client.call('simEnableWeather', enable)
self.client.call('simEnableWeather', enable)

def simSetWeatherParameter(self, param, val):
"""
Expand All @@ -206,7 +206,7 @@ def simSetWeatherParameter(self, param, val):
param (WeatherParameter): Weather effect to be enabled
val (float): Intensity of the effect, Range 0-1
"""
return self.client.call('simSetWeatherParameter', param, val)
self.client.call('simSetWeatherParameter', param, val)

# camera control
# simGetImage returns compressed png in array of bytes
Expand Down Expand Up @@ -401,7 +401,7 @@ def simPrintLogMessage(self, message, message_param = "", severity = 0):
message_param (str, optional): Parameter to be printed next to the message
severity (int, optional): Range 0-3, inclusive, corresponding to the severity of the message
"""
return self.client.call('simPrintLogMessage', message, message_param, severity)
self.client.call('simPrintLogMessage', message, message_param, severity)

def simGetCameraInfo(self, camera_name, vehicle_name = ''):
"""
Expand Down Expand Up @@ -439,7 +439,7 @@ def simSetCameraFov(self, camera_name, fov_degrees, vehicle_name = ''):
vehicle_name (str, optional): Name of vehicle which the camera corresponds to
"""
# TODO: below str() conversion is only needed for legacy reason and should be removed in future
return self.client.call('simSetCameraFov', str(camera_name), fov_degrees, vehicle_name)
self.client.call('simSetCameraFov', str(camera_name), fov_degrees, vehicle_name)

def simGetGroundTruthKinematics(self, vehicle_name = ''):
"""
Expand Down
12 changes: 6 additions & 6 deletions PythonClient/airsim/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,13 +304,13 @@ def __init__(self, throttle = 0, steering = 0, brake = 0,

def set_throttle(self, throttle_val, forward):
if (forward):
is_manual_gear = False
manual_gear = 0
throttle = abs(throttle_val)
self.is_manual_gear = False
self.manual_gear = 0
self.throttle = abs(throttle_val)
else:
is_manual_gear = False
manual_gear = -1
throttle = - abs(throttle_val)
self.is_manual_gear = False
self.manual_gear = -1
self.throttle = - abs(throttle_val)

class KinematicsState(MsgpackMixin):
position = Vector3r()
Expand Down