Skip to content

Commit b902c51

Browse files
committed
Use proper type signature for digitalRead
1 parent c554da1 commit b902c51

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/DashMessage.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ typedef struct DashMessage {
110110
}
111111

112112
// read payload from digital input pins
113-
void setFromPins(int (*myDigitalRead)(pin_size_t)) {
113+
void setFromPins(PinStatus (*myDigitalRead)(pin_size_t)) {
114114
setBit(MasterSignal::Values::boostWarning, myDigitalRead(MasterPin::Values::boostWarning ));
115115
setBit(MasterSignal::Values::boostCritical, myDigitalRead(MasterPin::Values::boostCritical ));
116116
setBit(MasterSignal::Values::acOn, myDigitalRead(MasterPin::Values::acOn ));
@@ -159,7 +159,7 @@ typedef struct DashMessage {
159159
}
160160

161161
// construct from arduino inputs
162-
DashMessage(int (*myDigitalRead)(pin_size_t)) {
162+
DashMessage(PinStatus (*myDigitalRead)(pin_size_t)) {
163163
initFrames();
164164
setFromPins(myDigitalRead);
165165
}

src/DashState.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ const unsigned int NUM_DASH_LEDS = DASH_LED_MAX + 1;
9191
typedef struct DashSupport {
9292
void (*pinMode)(pin_size_t, int);
9393
int (*analogRead)(unsigned char);
94-
int (*digitalRead)(unsigned char);
94+
PinStatus (*digitalRead)(unsigned char);
9595
void (*digitalWrite)(pin_size_t, int);
9696
CFastLED* fastLed;
9797
} DashSupport;

src/SlaveProperties.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ typedef struct SlaveState {
7373
}
7474

7575
// read payload from digital input pins into the fields of this struct
76-
void setFromPins(int (*myDigitalRead)(pin_size_t), int (*myAnalogRead)(pin_size_t)) {
76+
void setFromPins(PinStatus (*myDigitalRead)(pin_size_t), int (*myAnalogRead)(pin_size_t)) {
7777
scrollCAN = myDigitalRead(SlavePin::Values::scrollCAN);
7878
backlightDim = myDigitalRead(SlavePin::Values::backlightDim);
7979
tachometerCritical = myDigitalRead(SlavePin::Values::tachometerCritical);
@@ -102,7 +102,7 @@ typedef struct SlaveState {
102102
}
103103

104104
// shortcut: construct directly from the pin states
105-
SlaveState(int (*myDigitalRead)(pin_size_t), int (*myAnalogRead)(pin_size_t)) {
105+
SlaveState(PinStatus (*myDigitalRead)(pin_size_t), int (*myAnalogRead)(pin_size_t)) {
106106
setFromPins(myDigitalRead, myAnalogRead);
107107
}
108108

0 commit comments

Comments
 (0)