diff --git a/Defines.hpp b/Defines.hpp new file mode 100644 index 0000000..26d25c1 --- /dev/null +++ b/Defines.hpp @@ -0,0 +1,33 @@ +#define ccwSpeed 6500 +#define cwSpeed 3300 +#define offSpeed 4900 + +#define ccwMax 10 +#define cwMax 0 + +#define getMovingCW(port) ((movingCW & (1 << port)) >> port) +#define setMovingCW(port) (movingCW |= (1 << port)) +#define clearMovingCW(port) (movingCW &= ~(1 << port)) +#define getMovingCCW(port) ((movingCCW & (1 << port)) >> port) +#define setMovingCCW(port) (movingCCW |= (1 << port)) +#define clearMovingCCW(port) (movingCCW &= ~(1 << port)) +#define getCalibCW(port) ((calibCW & (1 << port)) >> port) +#define setCalibCW(port) (calibCW |= (1 << port)) +#define clearCalibCW(port) (calibCW &= ~(1 << port)) +#define getCalibCCW(port) ((calibCCW & (1 << port)) >> port) +#define setCalibCCW(port) (calibCCW |= (1 << port)) +#define clearCalibCCW(port) (calibCCW &= ~(1 << port)) +#define getCalibDone(port) ((calibDone & (1 << port)) >> port) +#define setCalibDone(port) (calibDone |= (1 << port)) +#define clearCalibDone(port) (calibDone &= ~(1 << port)) +#define getBlocked(port) ((blocked & (1 << port)) >> port) +#define setBlocked(port) (blocked |= (1 << port)) +#define clearBlocked(port) (blocked &= ~(1 << port)) +#define getPos10(port) ((movingCCW & (1 << (port + 4))) >> (port + 4)) +#define setPos10(port) (movingCCW |= (1 << (port + 4))) +#define clearPos10(port) (movingCCW &= ~(1 << (port + 4))) +#define getPos0(port) ((movingCW & (1 << (port + 4))) >> (port + 4)) +#define setPos0(port) (movingCW |= (1 << (port + 4))) +#define clearPos0(port) (movingCW &= ~(1 << (port + 4))) + +#define prefNameCalibs "periph_info_" diff --git a/blinds_esp32.ino b/blinds_esp32.ino index a172acd..0e1ce92 100644 --- a/blinds_esp32.ino +++ b/blinds_esp32.ino @@ -10,40 +10,7 @@ #include #include #include - -#define ccwSpeed 6500 -#define cwSpeed 3300 -#define offSpeed 4900 - -#define ccwMax 10 -#define cwMax 0 - -#define getMovingCW(port) ((movingCW & (1 << port)) >> port) -#define setMovingCW(port) (movingCW |= (1 << port)) -#define clearMovingCW(port) (movingCW &= ~(1 << port)) -#define getMovingCCW(port) ((movingCCW & (1 << port)) >> port) -#define setMovingCCW(port) (movingCCW |= (1 << port)) -#define clearMovingCCW(port) (movingCCW &= ~(1 << port)) -#define getCalibCW(port) ((calibCW & (1 << port)) >> port) -#define setCalibCW(port) (calibCW |= (1 << port)) -#define clearCalibCW(port) (calibCW &= ~(1 << port)) -#define getCalibCCW(port) ((calibCCW & (1 << port)) >> port) -#define setCalibCCW(port) (calibCCW |= (1 << port)) -#define clearCalibCCW(port) (calibCCW &= ~(1 << port)) -#define getCalibDone(port) ((calibDone & (1 << port)) >> port) -#define setCalibDone(port) (calibDone |= (1 << port)) -#define clearCalibDone(port) (calibDone &= ~(1 << port)) -#define getBlocked(port) ((blocked & (1 << port)) >> port) -#define setBlocked(port) (blocked |= (1 << port)) -#define clearBlocked(port) (blocked &= ~(1 << port)) -#define getPos10(port) ((movingCCW & (1 << (port + 4))) >> (port + 4)) -#define setPos10(port) (movingCCW |= (1 << (port + 4))) -#define clearPos10(port) (movingCCW &= ~(1 << (port + 4))) -#define getPos0(port) ((movingCW & (1 << (port + 4))) >> (port + 4)) -#define setPos0(port) (movingCW |= (1 << (port + 4))) -#define clearPos0(port) (movingCW &= ~(1 << (port + 4))) - -#define prefNameCalibs "periph_info_" +#include "Defines.hpp" const uint8_t portToServo[4] = {15, 12, 13, 26}; const uint8_t portTo0Button[4] = {2, 36, 34, 14};