File tree 3 files changed +5
-5
lines changed 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -110,7 +110,7 @@ typedef struct DashMessage {
110
110
}
111
111
112
112
// read payload from digital input pins
113
- void setFromPins (int (* myDigitalRead )(pin_size_t )) {
113
+ void setFromPins (PinStatus (* myDigitalRead )(pin_size_t )) {
114
114
setBit (MasterSignal ::Values ::boostWarning , myDigitalRead (MasterPin ::Values ::boostWarning ));
115
115
setBit (MasterSignal ::Values ::boostCritical , myDigitalRead (MasterPin ::Values ::boostCritical ));
116
116
setBit (MasterSignal ::Values ::acOn , myDigitalRead (MasterPin ::Values ::acOn ));
@@ -159,7 +159,7 @@ typedef struct DashMessage {
159
159
}
160
160
161
161
// construct from arduino inputs
162
- DashMessage (int (* myDigitalRead )(pin_size_t )) {
162
+ DashMessage (PinStatus (* myDigitalRead )(pin_size_t )) {
163
163
initFrames ();
164
164
setFromPins (myDigitalRead );
165
165
}
Original file line number Diff line number Diff line change @@ -91,7 +91,7 @@ const unsigned int NUM_DASH_LEDS = DASH_LED_MAX + 1;
91
91
typedef struct DashSupport {
92
92
void (*pinMode)(pin_size_t , int );
93
93
int (*analogRead)(unsigned char );
94
- int (*digitalRead)(unsigned char );
94
+ PinStatus (*digitalRead)(unsigned char );
95
95
void (*digitalWrite)(pin_size_t , int );
96
96
CFastLED* fastLed;
97
97
} DashSupport;
Original file line number Diff line number Diff line change @@ -73,7 +73,7 @@ typedef struct SlaveState {
73
73
}
74
74
75
75
// 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 )) {
77
77
scrollCAN = myDigitalRead (SlavePin::Values::scrollCAN);
78
78
backlightDim = myDigitalRead (SlavePin::Values::backlightDim);
79
79
tachometerCritical = myDigitalRead (SlavePin::Values::tachometerCritical);
@@ -102,7 +102,7 @@ typedef struct SlaveState {
102
102
}
103
103
104
104
// 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 )) {
106
106
setFromPins (myDigitalRead, myAnalogRead);
107
107
}
108
108
You can’t perform that action at this time.
0 commit comments