From 490eb6cc9a7c55a44b078a564f1126912a56d9fe Mon Sep 17 00:00:00 2001 From: Rob Giseburt Date: Sun, 21 Jun 2020 18:42:46 -0500 Subject: [PATCH] Due/gShield: Fix missing HAS_HOBBY_SERVO_MOTOR --- g2core/board/ArduinoDue/hardware.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/g2core/board/ArduinoDue/hardware.h b/g2core/board/ArduinoDue/hardware.h index a60a311c..4f69e87c 100644 --- a/g2core/board/ArduinoDue/hardware.h +++ b/g2core/board/ArduinoDue/hardware.h @@ -43,17 +43,14 @@ #define G2CORE_HARDWARE_PLATFORM "ArduinoDue" #define G2CORE_HARDWARE_VERSION "na" -#ifndef HAS_LASER -#if HAS_HOBBY_SERVO_MOTOR -#error Can NOT have a laser and a hobby servo at the same time, sorry -#endif -#define HAS_LASER 0 -#endif - /***** Motors & PWM channels supported by this hardware *****/ // These must be defines (not enums) so expressions like this: // #if (MOTORS >= 6) will work +#ifndef HAS_LASER +#define HAS_LASER 0 +#endif + #if HAS_LASER #define MOTORS 5 // number of motors + one "laser" motor (used for pulsing the laser in sync) #else