diff options
| author | Ryan <fauxpark@gmail.com> | 2020-04-30 16:24:47 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 16:24:47 +1000 |
| commit | 16a15c1cfcbfd0feb2c2cf1383676747e2f97d73 (patch) | |
| tree | aaa3c9f5a23207861d05c37ed4860af8efd40f85 /users/mtdjr | |
| parent | 37a4b53c4f51b66992e687b5012c83df9cc6b138 (diff) | |
| download | qmk_firmware-16a15c1cfcbfd0feb2c2cf1383676747e2f97d73.tar.gz qmk_firmware-16a15c1cfcbfd0feb2c2cf1383676747e2f97d73.zip | |
QMK-ify some GPIO macros (#8315)
Diffstat (limited to 'users/mtdjr')
| -rw-r--r-- | users/mtdjr/solenoid.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/users/mtdjr/solenoid.h b/users/mtdjr/solenoid.h index a911bf794..4ef329b4a 100644 --- a/users/mtdjr/solenoid.h +++ b/users/mtdjr/solenoid.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define SOLENOID_H | 2 | #define SOLENOID_H |
| 3 | 3 | ||
| 4 | #include <timer.h> | 4 | #include <timer.h> |
| 5 | #include "pincontrol.h" | ||
| 6 | 5 | ||
| 7 | 6 | ||
| 8 | #define SOLENOID_DEFAULT_DWELL 12 | 7 | #define SOLENOID_DEFAULT_DWELL 12 |
| @@ -45,7 +44,7 @@ void solenoid_toggle(void) { | |||
| 45 | } | 44 | } |
| 46 | 45 | ||
| 47 | void solenoid_stop(void) { | 46 | void solenoid_stop(void) { |
| 48 | digitalWrite(SOLENOID_PIN, PinLevelLow); | 47 | writePinLow(SOLENOID_PIN); |
| 49 | solenoid_on = false; | 48 | solenoid_on = false; |
| 50 | solenoid_buzzing = false; | 49 | solenoid_buzzing = false; |
| 51 | } | 50 | } |
| @@ -59,7 +58,7 @@ void solenoid_fire(void) { | |||
| 59 | solenoid_on = true; | 58 | solenoid_on = true; |
| 60 | solenoid_buzzing = true; | 59 | solenoid_buzzing = true; |
| 61 | solenoid_start = timer_read(); | 60 | solenoid_start = timer_read(); |
| 62 | digitalWrite(SOLENOID_PIN, PinLevelHigh); | 61 | writePinHigh(SOLENOID_PIN); |
| 63 | } | 62 | } |
| 64 | 63 | ||
| 65 | void solenoid_check(void) { | 64 | void solenoid_check(void) { |
| @@ -80,20 +79,20 @@ void solenoid_check(void) { | |||
| 80 | if (elapsed / SOLENOID_MIN_DWELL % 2 == 0){ | 79 | if (elapsed / SOLENOID_MIN_DWELL % 2 == 0){ |
| 81 | if (!solenoid_buzzing) { | 80 | if (!solenoid_buzzing) { |
| 82 | solenoid_buzzing = true; | 81 | solenoid_buzzing = true; |
| 83 | digitalWrite(SOLENOID_PIN, PinLevelHigh); | 82 | writePinHigh(SOLENOID_PIN); |
| 84 | } | 83 | } |
| 85 | } | 84 | } |
| 86 | else { | 85 | else { |
| 87 | if (solenoid_buzzing) { | 86 | if (solenoid_buzzing) { |
| 88 | solenoid_buzzing = false; | 87 | solenoid_buzzing = false; |
| 89 | digitalWrite(SOLENOID_PIN, PinLevelLow); | 88 | writePinLow(SOLENOID_PIN); |
| 90 | } | 89 | } |
| 91 | } | 90 | } |
| 92 | } | 91 | } |
| 93 | } | 92 | } |
| 94 | 93 | ||
| 95 | void solenoid_setup(void) { | 94 | void solenoid_setup(void) { |
| 96 | pinMode(SOLENOID_PIN, PinDirectionOutput); | 95 | setPinOutput(SOLENOID_PIN); |
| 97 | } | 96 | } |
| 98 | 97 | ||
| 99 | #endif | 98 | #endif |
