Skip to content

Commit f6f6856

Browse files
committed
Reduced global memory footprint by 6 bytes per joystick
1 parent dd3236d commit f6f6856

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

Joystick/src/Joystick.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -415,12 +415,12 @@ Joystick_::Joystick_(
415415
tempHidReportDescriptor[hidReportDescriptorSize++] = 0xc0;
416416

417417
// Create a copy of the HID Report Descriptor template that is just the right size
418-
_customHidReportDescriptor = new uint8_t[hidReportDescriptorSize];
419-
memcpy(_customHidReportDescriptor, tempHidReportDescriptor, hidReportDescriptorSize);
418+
uint8_t *customHidReportDescriptor = new uint8_t[hidReportDescriptorSize];
419+
memcpy(customHidReportDescriptor, tempHidReportDescriptor, hidReportDescriptorSize);
420420

421421
// Register HID Report Description
422-
_node = new DynamicHIDSubDescriptor(_customHidReportDescriptor, hidReportDescriptorSize, false);
423-
DynamicHID().AppendDescriptor(_node);
422+
DynamicHIDSubDescriptor *node = new DynamicHIDSubDescriptor(customHidReportDescriptor, hidReportDescriptorSize, false);
423+
DynamicHID().AppendDescriptor(node);
424424

425425
// Setup Joystick State
426426
if (buttonCount > 0) {

Joystick/src/Joystick.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class Joystick_
7171
// Joystick Settings
7272
bool _autoSendState;
7373
uint8_t _buttonCount;
74-
int _buttonValuesArraySize = 0;
74+
uint8_t _buttonValuesArraySize = 0;
7575
uint8_t _hatSwitchCount;
7676
bool _includeXAxis;
7777
bool _includeYAxis;
@@ -107,10 +107,8 @@ class Joystick_
107107
int16_t _steeringMinimum = JOYSTICK_DEFAULT_SIMULATOR_MINIMUM;
108108
int16_t _steeringMaximum = JOYSTICK_DEFAULT_SIMULATOR_MAXIMUM;
109109

110-
uint8_t *_customHidReportDescriptor = NULL;
111-
DynamicHIDSubDescriptor *_node = NULL;
112110
uint8_t _hidReportId;
113-
int _hidReportSize;
111+
uint8_t _hidReportSize;
114112

115113
protected:
116114
int buildAndSet16BitValue(bool includeValue, int16_t value, int16_t valueMinimum, int16_t valueMaximum, int16_t actualMinimum, int16_t actualMaximum, uint8_t dataLocation[]);

0 commit comments

Comments
 (0)