Merge pull request #755 from CapeLeidokos/pr_hid_linker_order_dependency_fix

Fixes linker order dependent choice of wrong HID library
pull/763/head
Gergely Nagy 5 years ago committed by GitHub
commit 157f0133a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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