Fixes linker order dependent choice of wrong HID library

The virtual hid was recently included in the core firmware repo.
Due to missing `#ifdef KALEIDOSCOPE_VIRTUAL_BUILD` in some
files, two versions of the hid library, one for the virtual and one for
the physical device were build. The linker perferred the one that it
encountered first. That caused a link order dependency that possibly
renders some firmware builds without HID reports being send to the host.

This change adds thse missing `#ifdef KALEIDOSCOPE_VIRTUAL_BUILD`
clauses.

Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
pull/755/head
Florian Fleissner 5 years ago
parent bab32fcc9d
commit b37a8bb44c

@ -16,6 +16,8 @@
SOFTWARE. SOFTWARE.
*/ */
#ifdef KALEIDOSCOPE_VIRTUAL_BUILD
// This is a modified version of the original HID.cpp from // This is a modified version of the original HID.cpp from
// library KeyboardioHID. It replaces all hardware related stuff // library KeyboardioHID. It replaces all hardware related stuff
// with stub implementations. // with stub implementations.
@ -92,3 +94,5 @@ int HID_::begin(void) {
} }
#endif /* if defined(USBCON) */ #endif /* if defined(USBCON) */
#endif // #ifdef KALEIDOSCOPE_VIRTUAL_BUILD

@ -14,6 +14,8 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef KALEIDOSCOPE_VIRTUAL_BUILD
#include "Logging.h" #include "Logging.h"
namespace kaleidoscope { namespace kaleidoscope {
@ -31,3 +33,5 @@ bool verboseOutputEnabled() {
} // namespace logging } // namespace logging
} // namespace kaleidoscope } // namespace kaleidoscope
#endif // #ifdef KALEIDOSCOPE_VIRTUAL_BUILD

Loading…
Cancel
Save