Skip to content

Commit 4e8075a

Browse files
MHeironimusMHeironimus
committed
Updated simulation value settings
1 parent 11a71e2 commit 4e8075a

File tree

3 files changed

+62
-62
lines changed

3 files changed

+62
-62
lines changed

‎README.md

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -113,93 +113,93 @@ Starts emulating a game controller connected to a computer. By default, all meth
113113

114114
### Joystick.end()
115115

116-
Stops the game controller emulation to a connected computer.
116+
Stops the game controller emulation to a connected computer (Note: just like the Arduino `Keyboard.h` and `Mouse.h` libraries, the `end()` function does not actually do anything).
117117

118-
### Joystick.setXAxisRange(int16_t minimum, int16_t maximum)
118+
### Joystick.setXAxisRange(int32_t minimum, int32_t maximum)
119119

120120
Sets the range of values that will be used for the X axis. Default: `0` to `1023`
121121

122-
### Joystick.setXAxis(int16_t value)
122+
### Joystick.setXAxis(int32_t value)
123123

124124
Sets the X axis value. See `setXAxisRange` for the range.
125125

126-
### Joystick.setYAxisRange(int16_t minimum, int16_t maximum)
126+
### Joystick.setYAxisRange(int32_t minimum, int32_t maximum)
127127

128128
Sets the range of values that will be used for the Y axis. Default: `0` to `1023`
129129

130-
### Joystick.setYAxis(int16_t value)
130+
### Joystick.setYAxis(int32_t value)
131131

132132
Sets the Y axis value. See `setYAxisRange` for the range.
133133

134-
### Joystick.setZAxisRange(int16_t minimum, int16_t maximum)
134+
### Joystick.setZAxisRange(int32_t minimum, int32_t maximum)
135135

136136
Sets the range of values that will be used for the Z axis. Default: `0` to `1023`
137137

138-
### Joystick.setZAxis(int16_t value)
138+
### Joystick.setZAxis(int32_t value)
139139

140140
Sets the Z axis value. See `setZAxisRange` for the range.
141141

142-
### Joystick.setRxAxisRange(int16_t minimum, int16_t maximum)
142+
### Joystick.setRxAxisRange(int32_t minimum, int32_t maximum)
143143

144144
Sets the range of values that will be used for the X axis rotation. Default: `0` to `1023`
145145

146-
### Joystick.setRxAxis(int16_t value)
146+
### Joystick.setRxAxis(int32_t value)
147147

148148
Sets the X axis rotation value. See `setRxAxisRange` for the range.
149149

150-
### Joystick.setRyAxisRange(int16_t minimum, int16_t maximum)
150+
### Joystick.setRyAxisRange(int32_t minimum, int32_t maximum)
151151

152152
Sets the range of values that will be used for the Y axis rotation. Default: `0` to `1023`
153153

154-
### Joystick.setRyAxis(int16_t value)
154+
### Joystick.setRyAxis(int32_t value)
155155

156156
Sets the Y axis rotation value. See `setRyAxisRange` for the range.
157157

158-
### Joystick.setRzAxisRange(int16_t minimum, int16_t maximum)
158+
### Joystick.setRzAxisRange(int32_t minimum, int32_t maximum)
159159

160160
Sets the range of values that will be used for the Z axis rotation. Default: `0` to `1023`
161161

162-
### Joystick.setRzAxis(int16_t value)
162+
### Joystick.setRzAxis(int32_t value)
163163

164164
Sets the Z axis rotation value. See `setRzAxisRange` for the range.
165165

166-
### Joystick.setRudderRange(int16_t minimum, int16_t maximum)
166+
### Joystick.setRudderRange(int32_t minimum, int32_t maximum)
167167

168168
Sets the range of values that will be used for the Rudder. Default: `0` to `1023`
169169

170-
### Joystick.setRudder(int16_t value)
170+
### Joystick.setRudder(int32_t value)
171171

172172
Sets the Rudder value. See `setRudderRange` for the range.
173173

174-
### Joystick.setThrottleRange(int16_t minimum, int16_t maximum)
174+
### Joystick.setThrottleRange(int32_t minimum, int32_t maximum)
175175

176176
Sets the range of values that will be used for the Throttle. Default: `0` to `1023`
177177

178-
### Joystick.setThrottle(int16_t value)
178+
### Joystick.setThrottle(int32_t value)
179179

180180
Sets the Throttle value. See `setThrottleRange` for the range.
181181

182-
### Joystick.setAcceleratorRange(int16_t minimum, int16_t maximum)
182+
### Joystick.setAcceleratorRange(int32_t minimum, int32_t maximum)
183183

184184
Sets the range of values that will be used for the Accelerator. Default: `0` to `1023`
185185

186-
### Joystick.setAccelerator(int16_t value)
186+
### Joystick.setAccelerator(int32_t value)
187187

188188
Sets the Accelerator value. See `setAcceleratorRange` for the range.
189189

190-
### Joystick.setBrakeRange(int16_t minimum, int16_t maximum)
190+
### Joystick.setBrakeRange(int32_t minimum, int32_t maximum)
191191

192192
Sets the range of values that will be used for the Brake. Default: `0` to `1023`
193193

194-
### Joystick.setBrake(int16_t value)
194+
### Joystick.setBrake(int32_t value)
195195

196196
Sets the Brake value. See `setBrakeRange` for the range.
197197

198-
### Joystick.setSteeringRange(int16_t minimum, int16_t maximum)
198+
### Joystick.setSteeringRange(int32_t minimum, int32_t maximum)
199199

200200
Sets the range of values that will be used for the Steering. Default: `0` to `1023`
201201

202-
### Joystick.setSteering(int16_t value)
202+
### Joystick.setSteering(int32_t value)
203203

204204
Sets the Steering value. See `setSteeringRange` for the range.
205205

‎src/Joystick.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ Joystick_::Joystick_(
455455
_hidReportSize += (axisCount * 2);
456456
_hidReportSize += (simulationCount * 2);
457457

458-
// Initalize Joystick State
458+
// Initialize Joystick State
459459
_xAxis = 0;
460460
_yAxis = 0;
461461
_zAxis = 0;
@@ -551,27 +551,27 @@ void Joystick_::setRzAxis(int32_t value)
551551
if (_autoSendState) sendState();
552552
}
553553

554-
void Joystick_::setRudder(uint16_t value)
554+
void Joystick_::setRudder(int32_t value)
555555
{
556556
_rudder = value;
557557
if (_autoSendState) sendState();
558558
}
559-
void Joystick_::setThrottle(uint16_t value)
559+
void Joystick_::setThrottle(int32_t value)
560560
{
561561
_throttle = value;
562562
if (_autoSendState) sendState();
563563
}
564-
void Joystick_::setAccelerator(uint16_t value)
564+
void Joystick_::setAccelerator(int32_t value)
565565
{
566566
_accelerator = value;
567567
if (_autoSendState) sendState();
568568
}
569-
void Joystick_::setBrake(uint16_t value)
569+
void Joystick_::setBrake(int32_t value)
570570
{
571571
_brake = value;
572572
if (_autoSendState) sendState();
573573
}
574-
void Joystick_::setSteering(uint16_t value)
574+
void Joystick_::setSteering(int32_t value)
575575
{
576576
_steering = value;
577577
if (_autoSendState) sendState();
@@ -623,7 +623,7 @@ int Joystick_::buildAndSetAxisValue(bool includeAxis, int32_t axisValue, int32_t
623623
return buildAndSet16BitValue(includeAxis, axisValue, axisMinimum, axisMaximum, JOYSTICK_AXIS_MINIMUM, JOYSTICK_AXIS_MAXIMUM, dataLocation);
624624
}
625625

626-
int Joystick_::buildAndSetSimulationValue(bool includeValue, uint16_t value, uint16_t valueMinimum, uint16_t valueMaximum, uint8_t dataLocation[])
626+
int Joystick_::buildAndSetSimulationValue(bool includeValue, int32_t value, int32_t valueMinimum, int32_t valueMaximum, uint8_t dataLocation[])
627627
{
628628
return buildAndSet16BitValue(includeValue, value, valueMinimum, valueMaximum, JOYSTICK_SIMULATOR_MINIMUM, JOYSTICK_SIMULATOR_MAXIMUM, dataLocation);
629629
}

‎src/Joystick.h

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -66,21 +66,21 @@ class Joystick_
6666
int32_t _xAxisRotation;
6767
int32_t _yAxisRotation;
6868
int32_t _zAxisRotation;
69-
uint16_t _throttle;
70-
uint16_t _rudder;
71-
uint16_t _accelerator;
72-
uint16_t _brake;
73-
uint16_t _steering;
69+
int32_t _throttle;
70+
int32_t _rudder;
71+
int32_t _accelerator;
72+
int32_t _brake;
73+
int32_t _steering;
7474
int16_t _hatSwitchValues[JOYSTICK_HATSWITCH_COUNT_MAXIMUM];
7575
uint8_t *_buttonValues = NULL;
7676

7777
// Joystick Settings
78-
bool _autoSendState;
79-
uint8_t _buttonCount;
80-
uint8_t _buttonValuesArraySize = 0;
81-
uint8_t _hatSwitchCount;
82-
uint8_t _includeAxisFlags;
83-
uint8_t _includeSimulatorFlags;
78+
bool _autoSendState;
79+
uint8_t _buttonCount;
80+
uint8_t _buttonValuesArraySize = 0;
81+
uint8_t _hatSwitchCount;
82+
uint8_t _includeAxisFlags;
83+
uint8_t _includeSimulatorFlags;
8484
int32_t _xAxisMinimum = JOYSTICK_DEFAULT_AXIS_MINIMUM;
8585
int32_t _xAxisMaximum = JOYSTICK_DEFAULT_AXIS_MAXIMUM;
8686
int32_t _yAxisMinimum = JOYSTICK_DEFAULT_AXIS_MINIMUM;
@@ -93,24 +93,24 @@ class Joystick_
9393
int32_t _ryAxisMaximum = JOYSTICK_DEFAULT_AXIS_MAXIMUM;
9494
int32_t _rzAxisMinimum = JOYSTICK_DEFAULT_AXIS_MINIMUM;
9595
int32_t _rzAxisMaximum = JOYSTICK_DEFAULT_AXIS_MAXIMUM;
96-
uint16_t _rudderMinimum = JOYSTICK_DEFAULT_SIMULATOR_MINIMUM;
97-
uint16_t _rudderMaximum = JOYSTICK_DEFAULT_SIMULATOR_MAXIMUM;
98-
uint16_t _throttleMinimum = JOYSTICK_DEFAULT_SIMULATOR_MINIMUM;
99-
uint16_t _throttleMaximum = JOYSTICK_DEFAULT_SIMULATOR_MAXIMUM;
100-
uint16_t _acceleratorMinimum = JOYSTICK_DEFAULT_SIMULATOR_MINIMUM;
101-
uint16_t _acceleratorMaximum = JOYSTICK_DEFAULT_SIMULATOR_MAXIMUM;
102-
uint16_t _brakeMinimum = JOYSTICK_DEFAULT_SIMULATOR_MINIMUM;
103-
uint16_t _brakeMaximum = JOYSTICK_DEFAULT_SIMULATOR_MAXIMUM;
104-
uint16_t _steeringMinimum = JOYSTICK_DEFAULT_SIMULATOR_MINIMUM;
105-
uint16_t _steeringMaximum = JOYSTICK_DEFAULT_SIMULATOR_MAXIMUM;
96+
int32_t _rudderMinimum = JOYSTICK_DEFAULT_SIMULATOR_MINIMUM;
97+
int32_t _rudderMaximum = JOYSTICK_DEFAULT_SIMULATOR_MAXIMUM;
98+
int32_t _throttleMinimum = JOYSTICK_DEFAULT_SIMULATOR_MINIMUM;
99+
int32_t _throttleMaximum = JOYSTICK_DEFAULT_SIMULATOR_MAXIMUM;
100+
int32_t _acceleratorMinimum = JOYSTICK_DEFAULT_SIMULATOR_MINIMUM;
101+
int32_t _acceleratorMaximum = JOYSTICK_DEFAULT_SIMULATOR_MAXIMUM;
102+
int32_t _brakeMinimum = JOYSTICK_DEFAULT_SIMULATOR_MINIMUM;
103+
int32_t _brakeMaximum = JOYSTICK_DEFAULT_SIMULATOR_MAXIMUM;
104+
int32_t _steeringMinimum = JOYSTICK_DEFAULT_SIMULATOR_MINIMUM;
105+
int32_t _steeringMaximum = JOYSTICK_DEFAULT_SIMULATOR_MAXIMUM;
106106

107107
uint8_t _hidReportId;
108108
uint8_t _hidReportSize;
109109

110110
protected:
111111
int buildAndSet16BitValue(bool includeValue, int32_t value, int32_t valueMinimum, int32_t valueMaximum, int32_t actualMinimum, int32_t actualMaximum, uint8_t dataLocation[]);
112112
int buildAndSetAxisValue(bool includeAxis, int32_t axisValue, int32_t axisMinimum, int32_t axisMaximum, uint8_t dataLocation[]);
113-
int buildAndSetSimulationValue(bool includeValue, uint16_t value, uint16_t valueMinimum, uint16_t valueMaximum, uint8_t dataLocation[]);
113+
int buildAndSetSimulationValue(bool includeValue, int32_t value, int32_t valueMinimum, int32_t valueMaximum, uint8_t dataLocation[]);
114114

115115
public:
116116
Joystick_(
@@ -164,27 +164,27 @@ class Joystick_
164164
_rzAxisMinimum = minimum;
165165
_rzAxisMaximum = maximum;
166166
}
167-
inline void setRudderRange(uint16_t minimum, uint16_t maximum)
167+
inline void setRudderRange(int32_t minimum, int32_t maximum)
168168
{
169169
_rudderMinimum = minimum;
170170
_rudderMaximum = maximum;
171171
}
172-
inline void setThrottleRange(uint16_t minimum, uint16_t maximum)
172+
inline void setThrottleRange(int32_t minimum, int32_t maximum)
173173
{
174174
_throttleMinimum = minimum;
175175
_throttleMaximum = maximum;
176176
}
177-
inline void setAcceleratorRange(uint16_t minimum, uint16_t maximum)
177+
inline void setAcceleratorRange(int32_t minimum, int32_t maximum)
178178
{
179179
_acceleratorMinimum = minimum;
180180
_acceleratorMaximum = maximum;
181181
}
182-
inline void setBrakeRange(uint16_t minimum, uint16_t maximum)
182+
inline void setBrakeRange(int32_t minimum, int32_t maximum)
183183
{
184184
_brakeMinimum = minimum;
185185
_brakeMaximum = maximum;
186186
}
187-
inline void setSteeringRange(uint16_t minimum, uint16_t maximum)
187+
inline void setSteeringRange(int32_t minimum, int32_t maximum)
188188
{
189189
_steeringMinimum = minimum;
190190
_steeringMaximum = maximum;
@@ -199,11 +199,11 @@ class Joystick_
199199
void setRzAxis(int32_t value);
200200

201201
// Set Simulation Values
202-
void setRudder(uint16_t value);
203-
void setThrottle(uint16_t value);
204-
void setAccelerator(uint16_t value);
205-
void setBrake(uint16_t value);
206-
void setSteering(uint16_t value);
202+
void setRudder(int32_t value);
203+
void setThrottle(int32_t value);
204+
void setAccelerator(int32_t value);
205+
void setBrake(int32_t value);
206+
void setSteering(int32_t value);
207207

208208
void setButton(uint8_t button, uint8_t value);
209209
void pressButton(uint8_t button);

0 commit comments

Comments
 (0)