Mike R
An I/O controller for virtual pinball machines: accelerometer nudge sensing, analog plunger input, button input encoding, LedWiz compatible output controls, and more.
Dependencies: mbed FastIO FastPWM USBDevice
Fork of
Pinscape_Controller
by 
Mike R
This is Version 2 of the Pinscape Controller, an I/O controller for virtual pinball machines. (You can find the old version 1 software here.) Pinscape is software for the KL25Z that turns the board into a full-featured I/O controller for virtual pinball, with support for accelerometer-based nudging, a mechanical plunger, button inputs, and feedback device control.
In case you haven't heard of the idea before, a "virtual pinball machine" is basically a video pinball simulator that's built into a real pinball machine body. A TV monitor goes in place of the pinball playfield, and a second TV goes in the backbox to show the backglass artwork. Some cabs also include a third monitor to simulate the DMD (Dot Matrix Display) used for scoring on 1990s machines, or even an original plasma DMD. A computer (usually a Windows PC) is hidden inside the cabinet, running pinball emulation software that displays a life-sized playfield on the main TV. The cabinet has all of the usual buttons, too, so it not only looks like the real thing, but plays like it too. That's a picture of my own machine to the right. On the outside, it's built exactly like a real arcade pinball machine, with the same overall dimensions and all of the standard pinball cabinet trim hardware.
It's possible to buy a pre-built virtual pinball machine, but it also makes a great DIY project. If you have some basic wood-working skills and know your way around PCs, you can build one from scratch. The computer part is just an ordinary Windows PC, and all of the pinball emulation can be built out of free, open-source software. In that spirit, the Pinscape Controller is an open-source software/hardware project that offers a no-compromises, all-in-one control center for all of the unique input/output needs of a virtual pinball cabinet. If you've been thinking about building one of these, but you're not sure how to connect a plunger, flipper buttons, lights, nudge sensor, and whatever else you can think of, this project might be just what you're looking for.
You can find much more information about DIY Pin Cab building in general in the Virtual Cabinet Forum on vpforums.org. Also visit my Pinscape Resources page for more about this project and other virtual pinball projects I'm working on.
Downloads
- Pinscape Release Builds: This page has download links for all of the Pinscape software. To get started, install and run the Pinscape Config Tool on your Windows computer. It will lead you through the steps for installing the Pinscape firmware on the KL25Z.
- Config Tool Source Code. The complete C# source code for the config tool. You don't need this to run the tool, but it's available if you want to customize anything or see how it works inside.
Documentation
The new Version 2 Build Guide is now complete! This new version aims to be a complete guide to building a virtual pinball machine, including not only the Pinscape elements but all of the basics, from sourcing parts to building all of the hardware.
You can also refer to the original Hardware Build Guide (PDF), but that's out of date now, since it refers to the old version 1 software, which was rather different (especially when it comes to configuration).
System Requirements
The new Config Tool requires a fairly up-to-date Microsoft .NET installation. If you use Windows Update to keep your system current, you should be fine. A modern version of Internet Explorer (IE) is required, even if you don't use it as your main browser, because the Config Tool uses some system components that Microsoft packages into the IE install set. I test with IE11, so that's known to work. IE8 doesn't work. IE9 and 10 are unknown at this point.
The Windows requirements are only for the config tool. The firmware doesn't care about anything on the Windows side, so if you can make do without the config tool, you can use almost any Windows setup.
Main Features
Plunger: The Pinscape Controller started out as a "mechanical plunger" controller: a device for attaching a real pinball plunger to the video game software so that you could launch the ball the natural way. This is still, of course, a central feature of the project. The software supports several types of sensors: a high-resolution optical sensor (which works by essentially taking pictures of the plunger as it moves); a slide potentiometer (which determines the position via the changing electrical resistance in the pot); a quadrature sensor (which counts bars printed on a special guide rail that it moves along); and an IR distance sensor (which determines the position by sending pulses of light at the plunger and measuring the round-trip travel time). The Build Guide explains how to set up each type of sensor.
Nudging: The KL25Z (the little microcontroller that the software runs on) has a built-in accelerometer. The Pinscape software uses it to sense when you nudge the cabinet, and feeds the acceleration data to the pinball software on the PC. This turns physical nudges into virtual English on the ball. The accelerometer is quite sensitive and accurate, so we can measure the difference between little bumps and hard shoves, and everything in between. The result is natural and immersive.
Buttons: You can wire real pinball buttons to the KL25Z, and the software will translate the buttons into PC input. You have the option to map each button to a keyboard key or joystick button. You can wire up your flipper buttons, Magna Save buttons, Start button, coin slots, operator buttons, and whatever else you need.
Feedback devices: You can also attach "feedback devices" to the KL25Z. Feedback devices are things that create tactile, sound, and lighting effects in sync with the game action. The most popular PC pinball emulators know how to address a wide variety of these devices, and know how to match them to on-screen action in each virtual table. You just need an I/O controller that translates commands from the PC into electrical signals that turn the devices on and off. The Pinscape Controller can do that for you.
Expansion Boards
There are two main ways to run the Pinscape Controller: standalone, or using the "expansion boards".
In the basic standalone setup, you just need the KL25Z, plus whatever buttons, sensors, and feedback devices you want to attach to it. This mode lets you take advantage of everything the software can do, but for some features, you'll have to build some ad hoc external circuitry to interface external devices with the KL25Z. The Build Guide has detailed plans for exactly what you need to build.
The other option is the Pinscape Expansion Boards. The expansion boards are a companion project, which is also totally free and open-source, that provides Printed Circuit Board (PCB) layouts that are designed specifically to work with the Pinscape software. The PCB designs are in the widely used EAGLE format, which many PCB manufacturers can turn directly into physical boards for you. The expansion boards organize all of the external connections more neatly than on the standalone KL25Z, and they add all of the interface circuitry needed for all of the advanced software functions. The big thing they bring to the table is lots of high-power outputs. The boards provide a modular system that lets you add boards to add more outputs. If you opt for the basic core setup, you'll have enough outputs for all of the toys in a really well-equipped cabinet. If your ambitions go beyond merely well-equipped and run to the ridiculously extravagant, just add an extra board or two. The modular design also means that you can add to the system over time.
Update notes
If you have a Pinscape V1 setup already installed, you should be able to switch to the new version pretty seamlessly. There are just a couple of things to be aware of.
First, the "configuration" procedure is completely different in the new version. Way better and way easier, but it's not what you're used to from V1. In V1, you had to edit the project source code and compile your own custom version of the program. No more! With V2, you simply install the standard, pre-compiled .bin file, and select options using the Pinscape Config Tool on Windows.
Second, if you're using the TSL1410R optical sensor for your plunger, there's a chance you'll need to boost your light source's brightness a little bit. The "shutter speed" is faster in this version, which means that it doesn't spend as much time collecting light per frame as before. The software actually does "auto exposure" adaptation on every frame, so the increased shutter speed really shouldn't bother it, but it does require a certain minimum level of contrast, which requires a certain minimal level of lighting. Check the plunger viewer in the setup tool if you have any problems; if the image looks totally dark, try increasing the light level to see if that helps.
New Features
V2 has numerous new features. Here are some of the highlights...
Dynamic configuration: as explained above, configuration is now handled through the Config Tool on Windows. It's no longer necessary to edit the source code or compile your own modified binary.
Improved plunger sensing: the software now reads the TSL1410R optical sensor about 15x faster than it did before. This allows reading the sensor at full resolution (400dpi), about 400 times per second. The faster frame rate makes a big difference in how accurately we can read the plunger position during the fast motion of a release, which allows for more precise position sensing and faster response. The differences aren't dramatic, since the sensing was already pretty good even with the slower V1 scan rate, but you might notice a little better precision in tricky skill shots.
Keyboard keys: button inputs can now be mapped to keyboard keys. The joystick button option is still available as well, of course. Keyboard keys have the advantage of being closer to universal for PC pinball software: some pinball software can be set up to take joystick input, but nearly all PC pinball emulators can take keyboard input, and nearly all of them use the same key mappings.
Local shift button: one physical button can be designed as the local shift button. This works like a Shift button on a keyboard, but with cabinet buttons. It allows each physical button on the cabinet to have two PC keys assigned, one normal and one shifted. Hold down the local shift button, then press another key, and the other key's shifted key mapping is sent to the PC. The shift button can have a regular key mapping of its own as well, so it can do double duty. The shift feature lets you access more functions without cluttering your cabinet with extra buttons. It's especially nice for less frequently used functions like adjusting the volume or activating night mode.
Night mode: the output controller has a new "night mode" option, which lets you turn off all of your noisy devices with a single button, switch, or PC command. You can designate individual ports as noisy or not. Night mode only disables the noisemakers, so you still get the benefit of your flashers, button lights, and other quiet devices. This lets you play late into the night without disturbing your housemates or neighbors.
Gamma correction: you can designate individual output ports for gamma correction. This adjusts the intensity level of an output to make it match the way the human eye perceives brightness, so that fades and color mixes look more natural in lighting devices. You can apply this to individual ports, so that it only affects ports that actually have lights of some kind attached.
IR Remote Control: the controller software can transmit and/or receive IR remote control commands if you attach appropriate parts (an IR LED to send, an IR sensor chip to receive). This can be used to turn on your TV(s) when the system powers on, if they don't turn on automatically, and for any other functions you can think of requiring IR send/receive capabilities. You can assign IR commands to cabinet buttons, so that pressing a button on your cabinet sends a remote control command from the attached IR LED, and you can have the controller generate virtual key presses on your PC in response to received IR commands. If you have the IR sensor attached, the system can use it to learn commands from your existing remotes.
Yet more USB fixes: I've been gradually finding and fixing USB bugs in the mbed library for months now. This version has all of the fixes of the last couple of releases, of course, plus some new ones. It also has a new "last resort" feature, since there always seems to be "just one more" USB bug. The last resort is that you can tell the device to automatically reboot itself if it loses the USB connection and can't restore it within a given time limit.
More Downloads
- Custom VP builds: I created modified versions of Visual Pinball 9.9 and Physmod5 that you might want to use in combination with this controller. The modified versions have special handling for plunger calibration specific to the Pinscape Controller, as well as some enhancements to the nudge physics. If you're not using the plunger, you might still want it for the nudge improvements. The modified version also works with any other input controller, so you can get the enhanced nudging effects even if you're using a different plunger/nudge kit. The big change in the modified versions is a "filter" for accelerometer input that's designed to make the response to cabinet nudges more realistic. It also makes the response more subdued than in the standard VP, so it's not to everyone's taste. The downloads include both the updated executables and the source code changes, in case you want to merge the changes into your own custom version(s).
Note! These features are now standard in the official VP releases, so you don't need my custom builds if you're using 9.9.1 or later and/or VP 10. I don't think there's any reason to use my versions instead of the latest official ones, and in fact I'd encourage you to use the official releases since they're more up to date, but I'm leaving my builds available just in case. In the official versions, look for the checkbox "Enable Nudge Filter" in the Keys preferences dialog. My custom versions don't include that checkbox; they just enable the filter unconditionally.
- Output circuit shopping list: This is a saved shopping cart at mouser.com with the parts needed to build one copy of the high-power output circuit for the LedWiz emulator feature, for use with the standalone KL25Z (that is, without the expansion boards). The quantities in the cart are for one output channel, so if you want N outputs, simply multiply the quantities by the N, with one exception: you only need one ULN2803 transistor array chip for each eight output circuits. If you're using the expansion boards, you won't need any of this, since the boards provide their own high-power outputs.
- Cary Owens' optical sensor housing: A 3D-printable design for a housing/mounting bracket for the optical plunger sensor, designed by Cary Owens. This makes it easy to mount the sensor.
- Lemming77's potentiometer mounting bracket and shooter rod connecter: Sketchup designs for 3D-printable parts for mounting a slide potentiometer as the plunger sensor. These were designed for a particular slide potentiometer that used to be available from an Aliexpress.com seller but is no longer listed. You can probably use this design as a starting point for other similar devices; just check the dimensions before committing the design to plastic.
Copyright and License
The Pinscape firmware is copyright 2014, 2021 by Michael J Roberts. It's released under an MIT open-source license. See License.
Warning to VirtuaPin Kit Owners
This software isn't designed as a replacement for the VirtuaPin plunger kit's firmware. If you bought the VirtuaPin kit, I recommend that you don't install this software. The KL25Z can only run one firmware program at a time, so if you install the Pinscape firmware on your KL25Z, it will replace and erase your existing VirtuaPin proprietary firmware. If you do this, the only way to restore your VirtuaPin firmware is to physically ship the KL25Z back to VirtuaPin and ask them to re-flash it. They don't allow you to do this at home, and they don't even allow you to back up your firmware, since they want to protect their proprietary software from copying. For all of these reasons, if you want to run the Pinscape software, I strongly recommend that you buy a "blank" retail KL25Z to use with Pinscape. They only cost about $15 and are available at several online retailers, including Amazon, Mouser, and eBay. The blank retail boards don't come with any proprietary firmware pre-installed, so installing Pinscape won't delete anything that you paid extra for.
With those warnings in mind, if you're absolutely sure that you don't mind permanently erasing your VirtuaPin firmware, it is at least possible to use Pinscape as a replacement for the VirtuaPin firmware. Pinscape uses the same button wiring conventions as the VirtuaPin setup, so you can keep your buttons (although you'll have to update the GPIO pin mappings in the Config Tool to match your physical wiring). As of the June, 2021 firmware, the Vishay VCNL4010 plunger sensor that comes with the VirtuaPin v3 plunger kit is supported, so you can also keep your plunger, if you have that chip. (You should check to be sure that's the sensor chip you have before committing to this route, if keeping the plunger sensor is important to you. The older VirtuaPin plunger kits came with different IR sensors that the Pinscape software doesn't handle.)
Diff: USBJoystick/USBJoystick.cpp
- Revision:
- 63:5cd1a5f3a41b
- Parent:
- 62:f071ccde32a0
- Child:
- 68:998faf685b00
--- a/USBJoystick/USBJoystick.cpp Thu Jun 02 22:52:25 2016 +0000
+++ b/USBJoystick/USBJoystick.cpp Tue Jun 14 20:24:34 2016 +0000
@@ -31,6 +31,8 @@
// Maximum report sizes
const int MAX_REPORT_JS_TX = reportLen;
const int MAX_REPORT_JS_RX = 8;
+const int MAX_REPORT_KB_TX = 8;
+const int MAX_REPORT_KB_RX = 4;
bool USBJoystick::update(int16_t x, int16_t y, int16_t z, uint32_t buttons, uint16_t status)
{
@@ -47,26 +49,24 @@
bool USBJoystick::update()
{
- // start the report with the report ID
HID_REPORT report;
- report.data[0] = REPORT_ID_JS;
-
+
// Fill the report according to the Joystick Descriptor
#define put(idx, val) (report.data[idx] = (val) & 0xff, report.data[(idx)+1] = ((val) >> 8) & 0xff)
#define putbe(idx, val) (report.data[(idx)+1] = (val) & 0xff, report.data[idx] = ((val) >> 8) & 0xff)
#define putl(idx, val) (put(idx, val), put((idx)+2, (val) >> 16))
#define putlbe(idx, val) (putbe((idx)+2, val), putbe(idx, (val) >> 16))
- put(1, _status);
- put(3, 0); // second word of status - zero in high bit identifies as normal joystick report
- put(5, _buttonsLo);
- put(7, _buttonsHi);
- put(9, _x);
- put(11, _y);
- put(13, _z);
+ put(0, _status);
+ put(2, 0); // second word of status - zero in high bit identifies as normal joystick report
+ put(4, _buttonsLo);
+ put(6, _buttonsHi);
+ put(8, _x);
+ put(10, _y);
+ put(12, _z);
// important: keep reportLen in sync with the actual byte length of
// the reports we build here
- report.length = reportLen + 1;
+ report.length = reportLen;
// send the report
return sendTO(&report, 100);
@@ -99,16 +99,14 @@
bool USBJoystick::sendPlungerStatus(
int npix, int edgePos, int dir, uint32_t avgScanTime, uint32_t processingTime)
{
- // set up the report ID
HID_REPORT report;
- report.data[0] = REPORT_ID_STAT;
// Set the special status bits to indicate it's an extended
// exposure report.
- put(1, 0x87FF);
+ put(0, 0x87FF);
// start at the second byte
- int ofs = 3;
+ int ofs = 2;
// write the report subtype (0) to byte 2
report.data[ofs++] = 0;
@@ -145,26 +143,25 @@
report.data[ofs++] = (t >> 16) & 0xff;
// send the report
- report.length = reportLen + 1;
+ report.length = reportLen;
return sendTO(&report, 100);
}
bool USBJoystick::sendPlungerPix(int &idx, int npix, const uint8_t *pix)
{
HID_REPORT report;
- report.data[0] = REPORT_ID_STAT;
// Set the special status bits to indicate it's an exposure report.
// The high 5 bits of the status word are set to 10000, and the
// low 11 bits are the current pixel index.
uint16_t s = idx | 0x8000;
- put(1, s);
+ put(0, s);
// start at the second byte
- int ofs = 3;
+ int ofs = 2;
// now fill out the remaining bytes with exposure values
- report.length = reportLen + 1;
+ report.length = reportLen;
for ( ; ofs < report.length ; ++ofs)
report.data[ofs] = (idx < npix ? pix[idx++] : 0);
@@ -179,24 +176,21 @@
// initially fill the report with zeros
memset(report.data, 0, sizeof(report.data));
- // set the report ID
- report.data[0] = REPORT_ID_STAT;
-
// Set the special status bits to indicate that it's an ID report
uint16_t s = 0x9000;
- put(1, s);
+ put(0, s);
// add the requested ID index
- report.data[3] = (uint8_t)index;
+ report.data[2] = (uint8_t)index;
// figure out which ID we're reporting
switch (index)
{
case 1:
// KL25Z CPU ID
- putbe(4, SIM->UIDMH);
- putlbe(6, SIM->UIDML);
- putlbe(10, SIM->UIDL);
+ putbe(3, SIM->UIDMH);
+ putlbe(5, SIM->UIDML);
+ putlbe(9, SIM->UIDL);
break;
case 2:
@@ -205,12 +199,12 @@
// 80 bits = 10 bytes. So skip ahead 16 and back up 10 to get
// the starting point.)
extern const char *getOpenSDAID();
- memcpy(&report.data[4], getOpenSDAID() + 16 - 10, 10);
+ memcpy(&report.data[3], getOpenSDAID() + 16 - 10, 10);
break;
}
// send the report
- report.length = reportLen + 1;
+ report.length = reportLen;
return sendTO(&report, 100);
}
@@ -221,13 +215,10 @@
// initially fill the report with zeros
memset(report.data, 0, sizeof(report.data));
- // set the report ID
- report.data[0] = REPORT_ID_STAT;
-
// Set the special status bits to indicate that it's a build
// info report
uint16_t s = 0xA000;
- put(1, s);
+ put(0, s);
// Parse the date. This is given in the standard __DATE__ " " __TIME
// macro format, "Mon dd yyyy hh:mm:ss" (e.g., "Feb 16 2016 12:15:06").
@@ -253,11 +244,11 @@
+ (atol(date+18));
// store the build date and time
- putl(3, dd);
- putl(7, tt);
+ putl(2, dd);
+ putl(6, tt);
// send the report
- report.length = reportLen + 1;
+ report.length = reportLen;
return sendTO(&report, 100);
}
@@ -268,19 +259,16 @@
// initially fill the report with zeros
memset(report.data, 0, sizeof(report.data));
- // set the report ID
- report.data[0] = REPORT_ID_STAT;
-
// Set the special status bits to indicate that it's a config
// variable report
uint16_t s = 0x9800;
- put(1, s);
+ put(0, s);
// Copy the variable data (7 bytes, starting with the variable ID)
- memcpy(report.data + 3, data, 7);
+ memcpy(report.data + 2, data, 7);
// send the report
- report.length = reportLen + 1;
+ report.length = reportLen;
return sendTO(&report, 100);
}
@@ -294,30 +282,27 @@
// initially fill the report with zeros
memset(report.data, 0, sizeof(report.data));
- // set the report ID
- report.data[0] = REPORT_ID_STAT;
-
// Set the special status bits to indicate that it's a config report.
uint16_t s = 0x8800;
- put(1, s);
+ put(0, s);
// write the number of configured outputs
- put(3, numOutputs);
+ put(2, numOutputs);
// write the unit number
- put(5, unitNo);
+ put(4, unitNo);
// write the plunger zero and max values
- put(7, plungerZero);
- put(9, plungerMax);
- report.data[11] = uint8_t(plungerRlsTime);
+ put(6, plungerZero);
+ put(8, plungerMax);
+ report.data[10] = uint8_t(plungerRlsTime);
// write the status bits:
// 0x01 -> configuration loaded
- report.data[12] = (configured ? 0x01 : 0x00);
+ report.data[11] = (configured ? 0x01 : 0x00);
// send the report
- report.length = reportLen + 1;
+ report.length = reportLen;
return sendTO(&report, 100);
}
@@ -345,15 +330,11 @@
{
HID_REPORT report;
- // clear the report
- memset(report.data, 0, sizeof(report.data));
-
- // set the report ID
- report.data[0] = REPORT_ID_STAT;
-
- // Indicate that it's a status report
- put(1, status);
- report.length = reportLen + 1;
+ // Fill the report according to the Joystick Descriptor
+#define put(idx, val) (report.data[idx] = (val) & 0xff, report.data[(idx)+1] = ((val) >> 8) & 0xff)
+ memset(report.data, 0, reportLen);
+ put(0, status);
+ report.length = reportLen;
// send the report
return sendTO(&report, 100);
@@ -372,205 +353,184 @@
// --------------------------------------------------------------------------
//
-// USB HID Report Descriptors
+// USB HID Report Descriptor - Joystick
//
+static const uint8_t reportDescriptorJS[] =
+{
+ USAGE_PAGE(1), 0x01, // Generic desktop
+ USAGE(1), 0x04, // Joystick
+ COLLECTION(1), 0x01, // Application
+ // input report (device to host)
-#define HID_REPORT_JS \
- USAGE_PAGE(1), 0x01, /* Generic desktop */ \
- USAGE(1), 0x04, /* Joystick */ \
- COLLECTION(1), 0x01, /* Application */ \
- /* input report (device to host) */ \
- REPORT_ID(1), REPORT_ID_JS, \
- USAGE_PAGE(1), 0x06, /* generic device controls - for config status */ \
- USAGE(1), 0x00, /* undefined device control */ \
- LOGICAL_MINIMUM(1), 0x00, /* 8-bit values */ \
- LOGICAL_MAXIMUM(1), 0xFF, \
- REPORT_SIZE(1), 0x08, /* 8 bits per report */ \
- REPORT_COUNT(1), 0x04, /* 4 reports (4 bytes) */ \
- INPUT(1), 0x02, /* Data, Variable, Absolute */ \
- \
- USAGE_PAGE(1), 0x09, /* Buttons */ \
- USAGE_MINIMUM(1), 0x01, /* { buttons } */ \
- USAGE_MAXIMUM(1), 0x20, /* { 1-32 } */ \
- LOGICAL_MINIMUM(1), 0x00, /* 1-bit buttons - 0... */ \
- LOGICAL_MAXIMUM(1), 0x01, /* ...to 1 */ \
- REPORT_SIZE(1), 0x01, /* 1 bit per report */ \
- REPORT_COUNT(1), 0x20, /* 32 reports */ \
- UNIT_EXPONENT(1), 0x00, /* Unit_Exponent (0) */ \
- UNIT(1), 0x00, /* Unit (None) */ \
- INPUT(1), 0x02, /* Data, Variable, Absolute */ \
- \
- USAGE_PAGE(1), 0x01, /* Generic desktop */ \
- USAGE(1), 0x30, /* X axis */ \
- USAGE(1), 0x31, /* Y axis */ \
- USAGE(1), 0x32, /* Z axis */ \
- LOGICAL_MINIMUM(2), 0x00,0xF0, /* each value ranges -4096 */ \
- LOGICAL_MAXIMUM(2), 0x00,0x10, /* ...to +4096 */ \
- REPORT_SIZE(1), 0x10, /* 16 bits per report */ \
- REPORT_COUNT(1), 0x03, /* 3 reports (X, Y, Z) */ \
- INPUT(1), 0x02, /* Data, Variable, Absolute */ \
- \
- /* output report (host to device) */ \
- REPORT_ID(1), REPORT_ID_JS, \
- REPORT_SIZE(1), 0x08, /* 8 bits per report */ \
- REPORT_COUNT(1), 0x08, /* output report count - 8-byte LedWiz format */ \
- 0x09, 0x01, /* usage */ \
- 0x91, 0x01, /* Output (array) */ \
- \
- END_COLLECTION(0)
-
-
-#define HID_REPORT_STAT \
- USAGE_PAGE(1), 0x01, /* Generic desktop */ \
- USAGE(1), 0x00, /* Undefined */ \
- COLLECTION(1), 0x01, /* Application */ \
- REPORT_ID(1), REPORT_ID_STAT, \
- USAGE_PAGE(1), 0x06, /* generic device controls */ \
- USAGE(1), 0x00, /* undefined device control */ \
- LOGICAL_MINIMUM(1), 0x00, /* 8-bit value range */ \
- LOGICAL_MAXIMUM(1), 0xFF, \
- REPORT_SIZE(1), 0x08, /* 8 bits per report */ \
- REPORT_COUNT(1), reportLen, /* 'reportLen' reports==bytes */ \
- INPUT(1), 0x02, /* Data, Variable, Absolute */ \
- END_COLLECTION(0)
+ USAGE_PAGE(1), 0x06, // generic device controls - for config status
+ USAGE(1), 0x00, // undefined device control
+ LOGICAL_MINIMUM(1), 0x00, // 8-bit values
+ LOGICAL_MAXIMUM(1), 0xFF,
+ REPORT_SIZE(1), 0x08, // 8 bits per report
+ REPORT_COUNT(1), 0x04, // 4 reports (4 bytes)
+ INPUT(1), 0x02, // Data, Variable, Absolute
-#define HID_REPORT_KB \
- USAGE_PAGE(1), 0x01, /* Generic Desktop */ \
- USAGE(1), 0x06, /* Keyboard */ \
- \
- /* Keyboard keys */ \
- COLLECTION(1), 0x01, /* Application */ \
- REPORT_ID(1), REPORT_ID_KB, \
- \
- /* input report (device to host) - regular keys */ \
- REPORT_COUNT(1), 0x06, \
- REPORT_SIZE(1), 0x08, \
- LOGICAL_MINIMUM(1), 0x00, \
- LOGICAL_MAXIMUM(1), 0x65, \
- USAGE_PAGE(1), 0x07, /* Key Codes */ \
- USAGE_MINIMUM(1), 0x00, \
- USAGE_MAXIMUM(1), 0x65, \
- INPUT(1), 0x00, /* Data, Array */ \
- \
- /* input report (device to host) - modifier keys */ \
- USAGE_PAGE(1), 0x07, /* Key Codes */ \
- USAGE_MINIMUM(1), 0xE0, \
- USAGE_MAXIMUM(1), 0xE7, \
- LOGICAL_MINIMUM(1), 0x00, \
- LOGICAL_MAXIMUM(1), 0x01, \
- REPORT_SIZE(1), 0x01, \
- REPORT_COUNT(1), 0x08, \
- INPUT(1), 0x02, /* Data, Variable, Absolute */ \
- REPORT_COUNT(1), 0x01, \
- REPORT_SIZE(1), 0x08, \
- INPUT(1), 0x01, /* Constant */ \
- \
- /* output report (host to device) - LED status */ \
- REPORT_COUNT(1), 0x05, \
- REPORT_SIZE(1), 0x01, \
- USAGE_PAGE(1), 0x08, /* LEDs */ \
- USAGE_MINIMUM(1), 0x01, \
- USAGE_MAXIMUM(1), 0x05, \
- OUTPUT(1), 0x02, /* Data, Variable, Absolute */ \
- REPORT_COUNT(1), 0x01, \
- REPORT_SIZE(1), 0x03, \
- OUTPUT(1), 0x01, /* Constant */ \
- END_COLLECTION(0), \
- \
- /* Media Control Keys */ \
- USAGE_PAGE(1), 0x0C, \
- USAGE(1), 0x01, \
- COLLECTION(1), 0x01, \
- /* input report (device to host) */ \
- REPORT_ID(1), REPORT_ID_MEDIA, \
- USAGE_PAGE(1), 0x0C, \
- LOGICAL_MINIMUM(1), 0x00, \
- LOGICAL_MAXIMUM(1), 0x01, \
- REPORT_SIZE(1), 0x01, \
- REPORT_COUNT(1), 0x07, \
- USAGE(1), 0xE2, /* Mute -> 0x01 */ \
- USAGE(1), 0xE9, /* Volume Up -> 0x02 */ \
- USAGE(1), 0xEA, /* Volume Down -> 0x04 */ \
- USAGE(1), 0xB5, /* Next Track -> 0x08 */ \
- USAGE(1), 0xB6, /* Previous Track -> 0x10 */ \
- USAGE(1), 0xB7, /* Stop -> 0x20 */ \
- USAGE(1), 0xCD, /* Play / Pause -> 0x40 */ \
- INPUT(1), 0x02, /* Input (Data, Variable, Absolute) -> 0x80 */ \
- REPORT_COUNT(1), 0x01, \
- INPUT(1), 0x01, \
- END_COLLECTION(0)
+ USAGE_PAGE(1), 0x09, // Buttons
+ USAGE_MINIMUM(1), 0x01, // { buttons }
+ USAGE_MAXIMUM(1), 0x20, // { 1-32 }
+ LOGICAL_MINIMUM(1), 0x00, // 1-bit buttons - 0...
+ LOGICAL_MAXIMUM(1), 0x01, // ...to 1
+ REPORT_SIZE(1), 0x01, // 1 bit per report
+ REPORT_COUNT(1), 0x20, // 32 reports
+ UNIT_EXPONENT(1), 0x00, // Unit_Exponent (0)
+ UNIT(1), 0x00, // Unit (None)
+ INPUT(1), 0x02, // Data, Variable, Absolute
+
+ USAGE_PAGE(1), 0x01, // Generic desktop
+ USAGE(1), 0x30, // X axis
+ USAGE(1), 0x31, // Y axis
+ USAGE(1), 0x32, // Z axis
+ LOGICAL_MINIMUM(2), 0x00,0xF0, // each value ranges -4096
+ LOGICAL_MAXIMUM(2), 0x00,0x10, // ...to +4096
+ REPORT_SIZE(1), 0x10, // 16 bits per report
+ REPORT_COUNT(1), 0x03, // 3 reports (X, Y, Z)
+ INPUT(1), 0x02, // Data, Variable, Absolute
+
+ // output report (host to device)
+ REPORT_SIZE(1), 0x08, // 8 bits per report
+ REPORT_COUNT(1), 0x08, // output report count - 8-byte LedWiz format
+ 0x09, 0x01, // usage
+ 0x91, 0x01, // Output (array)
-#define HID_REPORT_LW \
- USAGE_PAGE(1), 0x01, /* Generic desktop */ \
- USAGE(1), 0x00, /* Undefined */ \
- COLLECTION(1), 0x01, /* Application */ \
- /* output report (host to device) */ \
- REPORT_ID(1), REPORT_ID_JS, \
- REPORT_SIZE(1), 0x08, /* 8 bits per report */ \
- REPORT_COUNT(1), 0x08, /* output report count (LEDWiz messages) */ \
- 0x09, 0x01, /* usage */ \
- 0x91, 0x01, /* Output (array) */ \
- END_COLLECTION(0)
-
-
-// Joystick + Keyboard + LedWiz
-static const uint8_t reportDescriptorJS[] =
-{
- USAGE_PAGE(1), 0x01, /* Generic desktop */ \
- USAGE(1), 0x04, /* Joystick */ \
- COLLECTION(1), 0x01, /* Application */ \
-
- HID_REPORT_JS,
- HID_REPORT_STAT,
- HID_REPORT_KB,
-
END_COLLECTION(0)
};
-// Keyboard + LedWiz
+//
+// USB HID Report Descriptor - Keyboard/Media Control
+//
static const uint8_t reportDescriptorKB[] =
{
- HID_REPORT_LW,
- HID_REPORT_STAT,
- HID_REPORT_KB
+ USAGE_PAGE(1), 0x01, // Generic Desktop
+ USAGE(1), 0x06, // Keyboard
+ COLLECTION(1), 0x01, // Application
+ REPORT_ID(1), REPORT_ID_KB,
+
+ USAGE_PAGE(1), 0x07, // Key Codes
+ USAGE_MINIMUM(1), 0xE0,
+ USAGE_MAXIMUM(1), 0xE7,
+ LOGICAL_MINIMUM(1), 0x00,
+ LOGICAL_MAXIMUM(1), 0x01,
+ REPORT_SIZE(1), 0x01,
+ REPORT_COUNT(1), 0x08,
+ INPUT(1), 0x02, // Data, Variable, Absolute
+ REPORT_COUNT(1), 0x01,
+ REPORT_SIZE(1), 0x08,
+ INPUT(1), 0x01, // Constant
+
+ REPORT_COUNT(1), 0x05,
+ REPORT_SIZE(1), 0x01,
+ USAGE_PAGE(1), 0x08, // LEDs
+ USAGE_MINIMUM(1), 0x01,
+ USAGE_MAXIMUM(1), 0x05,
+ OUTPUT(1), 0x02, // Data, Variable, Absolute
+ REPORT_COUNT(1), 0x01,
+ REPORT_SIZE(1), 0x03,
+ OUTPUT(1), 0x01, // Constant
+
+ REPORT_COUNT(1), 0x06,
+ REPORT_SIZE(1), 0x08,
+ LOGICAL_MINIMUM(1), 0x00,
+ LOGICAL_MAXIMUM(1), 0x65,
+ USAGE_PAGE(1), 0x07, // Key Codes
+ USAGE_MINIMUM(1), 0x00,
+ USAGE_MAXIMUM(1), 0x65,
+ INPUT(1), 0x00, // Data, Array
+ END_COLLECTION(0),
+
+ // Media Control
+ USAGE_PAGE(1), 0x0C,
+ USAGE(1), 0x01,
+ COLLECTION(1), 0x01,
+ REPORT_ID(1), REPORT_ID_MEDIA,
+ USAGE_PAGE(1), 0x0C,
+ LOGICAL_MINIMUM(1), 0x00,
+ LOGICAL_MAXIMUM(1), 0x01,
+ REPORT_SIZE(1), 0x01,
+ REPORT_COUNT(1), 0x07,
+ USAGE(1), 0xE2, // Mute -> 0x01
+ USAGE(1), 0xE9, // Volume Up -> 0x02
+ USAGE(1), 0xEA, // Volume Down -> 0x04
+ USAGE(1), 0xB5, // Next Track -> 0x08
+ USAGE(1), 0xB6, // Previous Track -> 0x10
+ USAGE(1), 0xB7, // Stop -> 0x20
+ USAGE(1), 0xCD, // Play / Pause -> 0x40
+ INPUT(1), 0x02, // Input (Data, Variable, Absolute) -> 0x80
+ REPORT_COUNT(1), 0x01,
+ INPUT(1), 0x01,
+ END_COLLECTION(0),
};
-// LedWiz only
-static const uint8_t reportDescriptorLW[] =
-{
- HID_REPORT_LW,
- HID_REPORT_STAT
+//
+// USB HID Report Descriptor - LedWiz only, with no joystick or keyboard
+// input reporting
+//
+static const uint8_t reportDescriptorLW[] =
+{
+ USAGE_PAGE(1), 0x01, // Generic desktop
+ USAGE(1), 0x00, // Undefined
+
+ COLLECTION(1), 0x01, // Application
+
+ // input report (device to host)
+ USAGE_PAGE(1), 0x06, // generic device controls - for config status
+ USAGE(1), 0x00, // undefined device control
+ LOGICAL_MINIMUM(1), 0x00, // 8-bit values
+ LOGICAL_MAXIMUM(1), 0xFF,
+ REPORT_SIZE(1), 0x08, // 8 bits per report
+ REPORT_COUNT(1), reportLen, // standard report length (same as if we were in joystick mode)
+ INPUT(1), 0x02, // Data, Variable, Absolute
+
+ // output report (host to device)
+ REPORT_SIZE(1), 0x08, // 8 bits per report
+ REPORT_COUNT(1), 0x08, // output report count (LEDWiz messages)
+ 0x09, 0x01, // usage
+ 0x91, 0x01, // Output (array)
+
+ END_COLLECTION(0)
};
+
const uint8_t *USBJoystick::reportDesc(int idx, uint16_t &len)
{
- // we only have one interface (#0)
- if (idx != 0)
+ switch (idx)
{
+ case 0:
+ // If the joystick is enabled, this is the joystick.
+ // Otherwise, it's the plain LedWiz control interface.
+ if (enableJoystick)
+ {
+ len = sizeof(reportDescriptorJS);
+ return reportDescriptorJS;
+ }
+ else
+ {
+ len = sizeof(reportDescriptorLW);
+ return reportDescriptorLW;
+ }
+
+ case 1:
+ // This is the keyboard, if enabled.
+ if (useKB)
+ {
+ len = sizeof(reportDescriptorKB);
+ return reportDescriptorKB;
+ }
+ else
+ {
+ len = 0;
+ return 0;
+ }
+
+ default:
+ // Unknown interface ID
len = 0;
return 0;
}
-
- // figure which type of reports we generate according to which
- // features are enabled
- if (enableJoystick)
- {
- // joystick enabled - use the JS + KB + LW descriptor
- len = sizeof(reportDescriptorJS);
- return reportDescriptorJS;
- }
- else if (useKB)
- {
- // joystick disabled, keyboard enabled - use KB + LW
- len = sizeof(reportDescriptorKB);
- return reportDescriptorKB;
- }
- else
- {
- // joystick and keyboard disabled - LW only
- len = sizeof(reportDescriptorLW);
- return reportDescriptorLW;
- }
}
const uint8_t *USBJoystick::stringImanufacturerDesc() {
@@ -611,18 +571,10 @@
// the interfaces once the information is cached, causing connection failures.
// The cache key includes the device serial number, though, so this can be
// resolved by changing the serial number when the interface setup changes.
- //
- // The version suffix serves a similar purpose, to force a new Windows cache
- // key whenever we make changes in the USB descriptors that require a refresh
- // on the Windows side. The version here is completely unrelated to any other
- // version numbers throughout the system; it's purely internal to this class
- // and doesn't have to be synced to anything else. There aren't any particular
- // rules about when it needs to be changed; we'll change it as needed when we
- // observe the need for it due to caching problems on Windows.
char xbuf[numChars + 1];
uint32_t x = SIM->UIDML;
static char ifcCode[] = "LJKC";
- sprintf(xbuf, "PSC%08lX%08lX%c009",
+ sprintf(xbuf, "PSC%08lX%08lX%c008",
SIM->UIDML,
SIM->UIDL,
ifcCode[(enableJoystick ? 0x01 : 0x00) | (useKB ? 0x02 : 0x00)]);
@@ -654,67 +606,165 @@
const uint8_t *USBJoystick::configurationDesc()
{
- int rptlen = reportDescLength(0);
- const int cfglen =
- ((1 * CONFIGURATION_DESCRIPTOR_LENGTH)
- + (1 * INTERFACE_DESCRIPTOR_LENGTH)
- + (1 * HID_DESCRIPTOR_LENGTH)
- + (2 * ENDPOINT_DESCRIPTOR_LENGTH));
- static uint8_t configurationDescriptor[] =
+ int rptlen0 = reportDescLength(0);
+ int rptlen1 = reportDescLength(1);
+ if (useKB)
{
- // Configuration descriptor
- CONFIGURATION_DESCRIPTOR_LENGTH,// bLength
- CONFIGURATION_DESCRIPTOR, // bDescriptorType
- LSB(cfglen), // wTotalLength (LSB)
- MSB(cfglen), // wTotalLength (MSB)
- 0x01, // bNumInterfaces
- DEFAULT_CONFIGURATION, // bConfigurationValue
- 0x00, // iConfiguration
- C_RESERVED | C_SELF_POWERED, // bmAttributes
- C_POWER(0), // bMaxPower
-
- // Interface descriptor
- INTERFACE_DESCRIPTOR_LENGTH, // bLength
- INTERFACE_DESCRIPTOR, // bDescriptorType
- 0x00, // bInterfaceNumber
- 0x00, // bAlternateSetting
- 0x02, // bNumEndpoints
- HID_CLASS, // bInterfaceClass
- HID_SUBCLASS_NONE, // bInterfaceSubClass
- HID_PROTOCOL_NONE, // bInterfaceProtocol
- 0x00, // iInterface
-
- // HID descriptor, with link to report descriptor
- HID_DESCRIPTOR_LENGTH, // bLength
- HID_DESCRIPTOR, // bDescriptorType
- LSB(HID_VERSION_1_11), // bcdHID (LSB)
- MSB(HID_VERSION_1_11), // bcdHID (MSB)
- 0x00, // bCountryCode
- 0x01, // bNumDescriptors
- REPORT_DESCRIPTOR, // bDescriptorType
- LSB(rptlen), // wDescriptorLength (LSB)
- MSB(rptlen), // wDescriptorLength (MSB)
-
- // IN endpoint descriptor
- ENDPOINT_DESCRIPTOR_LENGTH, // bLength
- ENDPOINT_DESCRIPTOR, // bDescriptorType
- PHY_TO_DESC(EPINT_IN), // bEndpointAddress - EPINT == EP1
- E_INTERRUPT, // bmAttributes
- LSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (LSB)
- MSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (MSB)
- 1, // bInterval (milliseconds)
-
- // OUT endpoint descriptor
- ENDPOINT_DESCRIPTOR_LENGTH, // bLength
- ENDPOINT_DESCRIPTOR, // bDescriptorType
- PHY_TO_DESC(EPINT_OUT), // bEndpointAddress - EPINT == EP1
- E_INTERRUPT, // bmAttributes
- LSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (LSB)
- MSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (MSB)
- 1 // bInterval (milliseconds)
- };
+ const int cfglenKB =
+ ((1 * CONFIGURATION_DESCRIPTOR_LENGTH)
+ + (2 * INTERFACE_DESCRIPTOR_LENGTH)
+ + (2 * HID_DESCRIPTOR_LENGTH)
+ + (4 * ENDPOINT_DESCRIPTOR_LENGTH));
+ static uint8_t configurationDescriptorWithKB[] =
+ {
+ CONFIGURATION_DESCRIPTOR_LENGTH,// bLength
+ CONFIGURATION_DESCRIPTOR, // bDescriptorType
+ LSB(cfglenKB), // wTotalLength (LSB)
+ MSB(cfglenKB), // wTotalLength (MSB)
+ 0x02, // bNumInterfaces - TWO INTERFACES (JOYSTICK + KEYBOARD)
+ DEFAULT_CONFIGURATION, // bConfigurationValue
+ 0x00, // iConfiguration
+ C_RESERVED | C_SELF_POWERED, // bmAttributes
+ C_POWER(0), // bMaxPower
+
+ // ***** INTERFACE 0 - JOYSTICK/LEDWIZ ******
+ INTERFACE_DESCRIPTOR_LENGTH, // bLength
+ INTERFACE_DESCRIPTOR, // bDescriptorType
+ 0x00, // bInterfaceNumber
+ 0x00, // bAlternateSetting
+ 0x02, // bNumEndpoints
+ HID_CLASS, // bInterfaceClass
+ HID_SUBCLASS_NONE, // bInterfaceSubClass
+ HID_PROTOCOL_NONE, // bInterfaceProtocol
+ 0x00, // iInterface
+
+ HID_DESCRIPTOR_LENGTH, // bLength
+ HID_DESCRIPTOR, // bDescriptorType
+ LSB(HID_VERSION_1_11), // bcdHID (LSB)
+ MSB(HID_VERSION_1_11), // bcdHID (MSB)
+ 0x00, // bCountryCode
+ 0x01, // bNumDescriptors
+ REPORT_DESCRIPTOR, // bDescriptorType
+ LSB(rptlen0), // wDescriptorLength (LSB)
+ MSB(rptlen0), // wDescriptorLength (MSB)
+
+ ENDPOINT_DESCRIPTOR_LENGTH, // bLength
+ ENDPOINT_DESCRIPTOR, // bDescriptorType
+ PHY_TO_DESC(EPINT_IN), // bEndpointAddress - EPINT == EP1
+ E_INTERRUPT, // bmAttributes
+ LSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (LSB)
+ MSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (MSB)
+ 1, // bInterval (milliseconds)
+
+ ENDPOINT_DESCRIPTOR_LENGTH, // bLength
+ ENDPOINT_DESCRIPTOR, // bDescriptorType
+ PHY_TO_DESC(EPINT_OUT), // bEndpointAddress - EPINT == EP1
+ E_INTERRUPT, // bmAttributes
+ LSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (LSB)
+ MSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (MSB)
+ 1, // bInterval (milliseconds)
+
+ // ****** INTERFACE 1 - KEYBOARD ******
+ INTERFACE_DESCRIPTOR_LENGTH, // bLength
+ INTERFACE_DESCRIPTOR, // bDescriptorType
+ 0x01, // bInterfaceNumber
+ 0x00, // bAlternateSetting
+ 0x02, // bNumEndpoints
+ HID_CLASS, // bInterfaceClass
+ HID_SUBCLASS_BOOT, // bInterfaceSubClass
+ HID_PROTOCOL_KB, // bInterfaceProtocol
+ 0x00, // iInterface
+
+ HID_DESCRIPTOR_LENGTH, // bLength
+ HID_DESCRIPTOR, // bDescriptorType
+ LSB(HID_VERSION_1_11), // bcdHID (LSB)
+ MSB(HID_VERSION_1_11), // bcdHID (MSB)
+ 0x00, // bCountryCode
+ 0x01, // bNumDescriptors
+ REPORT_DESCRIPTOR, // bDescriptorType
+ LSB(rptlen1), // wDescriptorLength (LSB)
+ MSB(rptlen1), // wDescriptorLength (MSB)
+
+ ENDPOINT_DESCRIPTOR_LENGTH, // bLength
+ ENDPOINT_DESCRIPTOR, // bDescriptorType
+ PHY_TO_DESC(EP4IN), // bEndpointAddress
+ E_INTERRUPT, // bmAttributes
+ LSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (LSB)
+ MSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (MSB)
+ 1, // bInterval (milliseconds)
+
+ ENDPOINT_DESCRIPTOR_LENGTH, // bLength
+ ENDPOINT_DESCRIPTOR, // bDescriptorType
+ PHY_TO_DESC(EP4OUT), // bEndpointAddress
+ E_INTERRUPT, // bmAttributes
+ LSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (LSB)
+ MSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (MSB)
+ 1, // bInterval (milliseconds)
- return configurationDescriptor;
+ };
+
+ // Keyboard + joystick interfaces
+ return configurationDescriptorWithKB;
+ }
+ else
+ {
+ // No keyboard - joystick interface only
+ const int cfglenNoKB =
+ ((1 * CONFIGURATION_DESCRIPTOR_LENGTH)
+ + (1 * INTERFACE_DESCRIPTOR_LENGTH)
+ + (1 * HID_DESCRIPTOR_LENGTH)
+ + (2 * ENDPOINT_DESCRIPTOR_LENGTH));
+ static uint8_t configurationDescriptorNoKB[] =
+ {
+ CONFIGURATION_DESCRIPTOR_LENGTH,// bLength
+ CONFIGURATION_DESCRIPTOR, // bDescriptorType
+ LSB(cfglenNoKB), // wTotalLength (LSB)
+ MSB(cfglenNoKB), // wTotalLength (MSB)
+ 0x01, // bNumInterfaces
+ DEFAULT_CONFIGURATION, // bConfigurationValue
+ 0x00, // iConfiguration
+ C_RESERVED | C_SELF_POWERED, // bmAttributes
+ C_POWER(0), // bMaxPower
+
+ INTERFACE_DESCRIPTOR_LENGTH, // bLength
+ INTERFACE_DESCRIPTOR, // bDescriptorType
+ 0x00, // bInterfaceNumber
+ 0x00, // bAlternateSetting
+ 0x02, // bNumEndpoints
+ HID_CLASS, // bInterfaceClass
+ HID_SUBCLASS_NONE, // bInterfaceSubClass
+ HID_PROTOCOL_NONE, // bInterfaceProtocol (keyboard)
+ 0x00, // iInterface
+
+ HID_DESCRIPTOR_LENGTH, // bLength
+ HID_DESCRIPTOR, // bDescriptorType
+ LSB(HID_VERSION_1_11), // bcdHID (LSB)
+ MSB(HID_VERSION_1_11), // bcdHID (MSB)
+ 0x00, // bCountryCode
+ 0x01, // bNumDescriptors
+ REPORT_DESCRIPTOR, // bDescriptorType
+ (uint8_t)(LSB(rptlen0)), // wDescriptorLength (LSB)
+ (uint8_t)(MSB(rptlen0)), // wDescriptorLength (MSB)
+
+ ENDPOINT_DESCRIPTOR_LENGTH, // bLength
+ ENDPOINT_DESCRIPTOR, // bDescriptorType
+ PHY_TO_DESC(EPINT_IN), // bEndpointAddress
+ E_INTERRUPT, // bmAttributes
+ LSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (LSB)
+ MSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (MSB)
+ 1, // bInterval (milliseconds)
+
+ ENDPOINT_DESCRIPTOR_LENGTH, // bLength
+ ENDPOINT_DESCRIPTOR, // bDescriptorType
+ PHY_TO_DESC(EPINT_OUT), // bEndpointAddress
+ E_INTERRUPT, // bmAttributes
+ LSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (LSB)
+ MSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (MSB)
+ 1 // bInterval (milliseconds)
+ };
+
+ return configurationDescriptorNoKB;
+ }
}
// Set the configuration. We need to set up the endpoints for
@@ -725,10 +775,19 @@
if (configuration != DEFAULT_CONFIGURATION)
return false;
- // Configure endpoint 1
+ // Configure endpoint 1 - we use this in all cases, for either
+ // the combined joystick/ledwiz interface or just the ledwiz interface
addEndpoint(EPINT_IN, MAX_REPORT_JS_TX + 1);
addEndpoint(EPINT_OUT, MAX_REPORT_JS_RX + 1);
readStart(EPINT_OUT, MAX_REPORT_JS_TX + 1);
+
+ // if the keyboard is enabled, configure endpoint 4 for the kb interface
+ if (useKB)
+ {
+ addEndpoint(EP4IN, MAX_REPORT_KB_TX + 1);
+ addEndpoint(EP4OUT, MAX_REPORT_KB_RX + 1);
+ readStart(EP4OUT, MAX_REPORT_KB_TX + 1);
+ }
// success
return true;
@@ -746,31 +805,33 @@
bool USBJoystick::EP1_OUT_callback()
{
// Read this message
- uint8_t buf[MAX_HID_REPORT_SIZE];
+ union {
+ LedWizMsg msg;
+ uint8_t buf[MAX_HID_REPORT_SIZE];
+ } buf;
uint32_t bytesRead = 0;
- USBDevice::readEP(EP1OUT, buf, &bytesRead, MAX_HID_REPORT_SIZE);
+ USBDevice::readEP(EP1OUT, buf.buf, &bytesRead, MAX_HID_REPORT_SIZE);
- // check the report type
- switch (buf[0])
- {
- case REPORT_ID_JS:
- // Joystick/ledwiz. These are LedWiz or private protocol command
- // messages. Queue to the incoming LW command list.
- if (bytesRead == 9)
- lwbuf.write((LedWizMsg *)&buf[1]);
- break;
-
- case REPORT_ID_KB:
- // Keyboard. These are standard USB keyboard protocol messages,
- // telling us the shift key LED status. We don't do anything with
- // these; just accept and ignore them.
- break;
-
- default:
- // Other report types are unexpected; just ignore them.
- break;
- }
+ // if it's the right length, queue it to our circular buffer
+ if (bytesRead == 8)
+ lwbuf.write(buf.msg);
// start the next read
return readStart(EP1OUT, MAX_HID_REPORT_SIZE);
}
+
+// Handle incoming messages on the keyboard interface = endpoint 4.
+// The host uses this to send updates for the keyboard indicator LEDs
+// (caps lock, num lock, etc). We don't do anything with these, but
+// we have to read them to keep the pipe open.
+bool USBJoystick::EP4_OUT_callback()
+{
+ // read this message
+ uint32_t bytesRead = 0;
+ uint8_t led[MAX_HID_REPORT_SIZE];
+ USBDevice::readEP(EP4OUT, led, &bytesRead, MAX_HID_REPORT_SIZE);
+
+ // start the next read
+ return readStart(EP4OUT, MAX_HID_REPORT_SIZE);
+}
+