Skip to content

Commit 1f64693

Browse files
adbancroftadbancroft
authored
Rename PORT_TYPE & PINMASK_TYPE (speeduino#1350)
1 parent 2f9f75a commit 1f64693

File tree

8 files changed

+134
-134
lines changed

8 files changed

+134
-134
lines changed

‎speeduino/acc_mc33810.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ uint8_t MC33810_BIT_IGN6 = 6;
2020
uint8_t MC33810_BIT_IGN7 = 7;
2121
uint8_t MC33810_BIT_IGN8 = 8;
2222

23-
PORT_TYPE mc33810_1_pin_port;
24-
PINMASK_TYPE mc33810_1_pin_mask;
25-
PORT_TYPE mc33810_2_pin_port;
26-
PINMASK_TYPE mc33810_2_pin_mask;
23+
port_register_t mc33810_1_pin_port;
24+
pin_mask_t mc33810_1_pin_mask;
25+
port_register_t mc33810_2_pin_port;
26+
pin_mask_t mc33810_2_pin_mask;
2727

2828
void initMC33810(void)
2929
{

‎speeduino/acc_mc33810.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
#include "globals.h"
77
#include "board_definition.h"
88

9-
extern PORT_TYPE mc33810_1_pin_port;
10-
extern PINMASK_TYPE mc33810_1_pin_mask;
11-
extern PORT_TYPE mc33810_2_pin_port;
12-
extern PINMASK_TYPE mc33810_2_pin_mask;
9+
extern port_register_t mc33810_1_pin_port;
10+
extern pin_mask_t mc33810_1_pin_mask;
11+
extern port_register_t mc33810_2_pin_port;
12+
extern pin_mask_t mc33810_2_pin_mask;
1313

1414
//#define MC33810_ONOFF_CMD 3
1515
static const uint8_t MC33810_ONOFF_CMD = 0x30; //48 in decimal

‎speeduino/auxiliaries.cpp‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,26 @@ volatile char nextVVT;
2828
byte boostCounter;
2929
byte vvtCounter;
3030

31-
PORT_TYPE boost_pin_port;
32-
PINMASK_TYPE boost_pin_mask;
33-
PORT_TYPE n2o_stage1_pin_port;
34-
PINMASK_TYPE n2o_stage1_pin_mask;
35-
PORT_TYPE n2o_stage2_pin_port;
36-
PINMASK_TYPE n2o_stage2_pin_mask;
37-
PORT_TYPE n2o_arming_pin_port;
38-
PINMASK_TYPE n2o_arming_pin_mask;
39-
PORT_TYPE aircon_comp_pin_port;
40-
PINMASK_TYPE aircon_comp_pin_mask;
41-
PORT_TYPE aircon_fan_pin_port;
42-
PINMASK_TYPE aircon_fan_pin_mask;
43-
PORT_TYPE aircon_req_pin_port;
44-
PINMASK_TYPE aircon_req_pin_mask;
45-
PORT_TYPE vvt1_pin_port;
46-
PINMASK_TYPE vvt1_pin_mask;
47-
PORT_TYPE vvt2_pin_port;
48-
PINMASK_TYPE vvt2_pin_mask;
49-
PORT_TYPE fan_pin_port;
50-
PINMASK_TYPE fan_pin_mask;
31+
port_register_t boost_pin_port;
32+
pin_mask_t boost_pin_mask;
33+
port_register_t n2o_stage1_pin_port;
34+
pin_mask_t n2o_stage1_pin_mask;
35+
port_register_t n2o_stage2_pin_port;
36+
pin_mask_t n2o_stage2_pin_mask;
37+
port_register_t n2o_arming_pin_port;
38+
pin_mask_t n2o_arming_pin_mask;
39+
port_register_t aircon_comp_pin_port;
40+
pin_mask_t aircon_comp_pin_mask;
41+
port_register_t aircon_fan_pin_port;
42+
pin_mask_t aircon_fan_pin_mask;
43+
port_register_t aircon_req_pin_port;
44+
pin_mask_t aircon_req_pin_mask;
45+
port_register_t vvt1_pin_port;
46+
pin_mask_t vvt1_pin_mask;
47+
port_register_t vvt2_pin_port;
48+
pin_mask_t vvt2_pin_mask;
49+
port_register_t fan_pin_port;
50+
pin_mask_t fan_pin_mask;
5151

5252
#if defined(PWM_FAN_AVAILABLE)//PWM fan not available on Arduino MEGA
5353
volatile bool fan_pwm_state;

‎speeduino/auxiliaries.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ void wmiControl(void);
8686

8787
#define WMI_TANK_IS_EMPTY() ((configPage10.wmiEmptyEnabled) ? ((configPage10.wmiEmptyPolarity) ? digitalRead(pinWMIEmpty) : !digitalRead(pinWMIEmpty)) : 1)
8888

89-
extern PORT_TYPE vvt1_pin_port;
90-
extern PINMASK_TYPE vvt1_pin_mask;
91-
extern PORT_TYPE vvt2_pin_port;
92-
extern PINMASK_TYPE vvt2_pin_mask;
93-
extern PORT_TYPE fan_pin_port;
94-
extern PINMASK_TYPE fan_pin_mask;
89+
extern port_register_t vvt1_pin_port;
90+
extern pin_mask_t vvt1_pin_mask;
91+
extern port_register_t vvt2_pin_port;
92+
extern pin_mask_t vvt2_pin_mask;
93+
extern port_register_t fan_pin_port;
94+
extern pin_mask_t fan_pin_mask;
9595

9696
#if defined(PWM_FAN_AVAILABLE)//PWM fan not available on Arduino MEGA
9797
extern uint16_t fan_pwm_max_count; //Used for variable PWM frequency

‎speeduino/globals.cpp‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -27,54 +27,54 @@ struct table3d4RpmLoad dwellTable; ///< 4x4 Dwell map
2727

2828

2929
/// volatile inj*_pin_port and inj*_pin_mask vars are for the direct port manipulation of the injectors, coils and aux outputs.
30-
PORT_TYPE inj1_pin_port;
31-
PINMASK_TYPE inj1_pin_mask;
32-
PORT_TYPE inj2_pin_port;
33-
PINMASK_TYPE inj2_pin_mask;
34-
PORT_TYPE inj3_pin_port;
35-
PINMASK_TYPE inj3_pin_mask;
36-
PORT_TYPE inj4_pin_port;
37-
PINMASK_TYPE inj4_pin_mask;
38-
PORT_TYPE inj5_pin_port;
39-
PINMASK_TYPE inj5_pin_mask;
40-
PORT_TYPE inj6_pin_port;
41-
PINMASK_TYPE inj6_pin_mask;
42-
PORT_TYPE inj7_pin_port;
43-
PINMASK_TYPE inj7_pin_mask;
44-
PORT_TYPE inj8_pin_port;
45-
PINMASK_TYPE inj8_pin_mask;
30+
port_register_t inj1_pin_port;
31+
pin_mask_t inj1_pin_mask;
32+
port_register_t inj2_pin_port;
33+
pin_mask_t inj2_pin_mask;
34+
port_register_t inj3_pin_port;
35+
pin_mask_t inj3_pin_mask;
36+
port_register_t inj4_pin_port;
37+
pin_mask_t inj4_pin_mask;
38+
port_register_t inj5_pin_port;
39+
pin_mask_t inj5_pin_mask;
40+
port_register_t inj6_pin_port;
41+
pin_mask_t inj6_pin_mask;
42+
port_register_t inj7_pin_port;
43+
pin_mask_t inj7_pin_mask;
44+
port_register_t inj8_pin_port;
45+
pin_mask_t inj8_pin_mask;
4646

47-
PORT_TYPE ign1_pin_port;
48-
PINMASK_TYPE ign1_pin_mask;
49-
PORT_TYPE ign2_pin_port;
50-
PINMASK_TYPE ign2_pin_mask;
51-
PORT_TYPE ign3_pin_port;
52-
PINMASK_TYPE ign3_pin_mask;
53-
PORT_TYPE ign4_pin_port;
54-
PINMASK_TYPE ign4_pin_mask;
55-
PORT_TYPE ign5_pin_port;
56-
PINMASK_TYPE ign5_pin_mask;
57-
PORT_TYPE ign6_pin_port;
58-
PINMASK_TYPE ign6_pin_mask;
59-
PORT_TYPE ign7_pin_port;
60-
PINMASK_TYPE ign7_pin_mask;
61-
PORT_TYPE ign8_pin_port;
62-
PINMASK_TYPE ign8_pin_mask;
47+
port_register_t ign1_pin_port;
48+
pin_mask_t ign1_pin_mask;
49+
port_register_t ign2_pin_port;
50+
pin_mask_t ign2_pin_mask;
51+
port_register_t ign3_pin_port;
52+
pin_mask_t ign3_pin_mask;
53+
port_register_t ign4_pin_port;
54+
pin_mask_t ign4_pin_mask;
55+
port_register_t ign5_pin_port;
56+
pin_mask_t ign5_pin_mask;
57+
port_register_t ign6_pin_port;
58+
pin_mask_t ign6_pin_mask;
59+
port_register_t ign7_pin_port;
60+
pin_mask_t ign7_pin_mask;
61+
port_register_t ign8_pin_port;
62+
pin_mask_t ign8_pin_mask;
6363

64-
PORT_TYPE tach_pin_port;
65-
PINMASK_TYPE tach_pin_mask;
66-
PORT_TYPE pump_pin_port;
67-
PINMASK_TYPE pump_pin_mask;
64+
port_register_t tach_pin_port;
65+
pin_mask_t tach_pin_mask;
66+
port_register_t pump_pin_port;
67+
pin_mask_t pump_pin_mask;
6868

69-
PORT_TYPE flex_pin_port;
70-
PINMASK_TYPE flex_pin_mask;
69+
port_register_t flex_pin_port;
70+
pin_mask_t flex_pin_mask;
7171

72-
PORT_TYPE triggerPri_pin_port;
73-
PINMASK_TYPE triggerPri_pin_mask;
74-
PORT_TYPE triggerSec_pin_port;
75-
PINMASK_TYPE triggerSec_pin_mask;
76-
PORT_TYPE triggerThird_pin_port;
77-
PINMASK_TYPE triggerThird_pin_mask;
72+
port_register_t triggerPri_pin_port;
73+
pin_mask_t triggerPri_pin_mask;
74+
port_register_t triggerSec_pin_port;
75+
pin_mask_t triggerSec_pin_mask;
76+
port_register_t triggerThird_pin_port;
77+
pin_mask_t triggerThird_pin_mask;
7878

7979
//These are variables used across multiple files
8080
byte fpPrimeTime = 0; ///< The time (in seconds, based on @ref statuses.secl) that the fuel pump started priming

‎speeduino/globals.h‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -145,54 +145,54 @@ extern trimTable3d trim8Table; //6x6 Fuel trim 8 map
145145
extern struct table3d4RpmLoad dwellTable; //4x4 Dwell map
146146

147147
//These are for the direct port manipulation of the injectors, coils and aux outputs
148-
extern PORT_TYPE inj1_pin_port;
149-
extern PINMASK_TYPE inj1_pin_mask;
150-
extern PORT_TYPE inj2_pin_port;
151-
extern PINMASK_TYPE inj2_pin_mask;
152-
extern PORT_TYPE inj3_pin_port;
153-
extern PINMASK_TYPE inj3_pin_mask;
154-
extern PORT_TYPE inj4_pin_port;
155-
extern PINMASK_TYPE inj4_pin_mask;
156-
extern PORT_TYPE inj5_pin_port;
157-
extern PINMASK_TYPE inj5_pin_mask;
158-
extern PORT_TYPE inj6_pin_port;
159-
extern PINMASK_TYPE inj6_pin_mask;
160-
extern PORT_TYPE inj7_pin_port;
161-
extern PINMASK_TYPE inj7_pin_mask;
162-
extern PORT_TYPE inj8_pin_port;
163-
extern PINMASK_TYPE inj8_pin_mask;
164-
165-
extern PORT_TYPE ign1_pin_port;
166-
extern PINMASK_TYPE ign1_pin_mask;
167-
extern PORT_TYPE ign2_pin_port;
168-
extern PINMASK_TYPE ign2_pin_mask;
169-
extern PORT_TYPE ign3_pin_port;
170-
extern PINMASK_TYPE ign3_pin_mask;
171-
extern PORT_TYPE ign4_pin_port;
172-
extern PINMASK_TYPE ign4_pin_mask;
173-
extern PORT_TYPE ign5_pin_port;
174-
extern PINMASK_TYPE ign5_pin_mask;
175-
extern PORT_TYPE ign6_pin_port;
176-
extern PINMASK_TYPE ign6_pin_mask;
177-
extern PORT_TYPE ign7_pin_port;
178-
extern PINMASK_TYPE ign7_pin_mask;
179-
extern PORT_TYPE ign8_pin_port;
180-
extern PINMASK_TYPE ign8_pin_mask;
181-
182-
extern PORT_TYPE tach_pin_port;
183-
extern PINMASK_TYPE tach_pin_mask;
184-
extern PORT_TYPE pump_pin_port;
185-
extern PINMASK_TYPE pump_pin_mask;
186-
187-
extern PORT_TYPE flex_pin_port;
188-
extern PINMASK_TYPE flex_pin_mask;
189-
190-
extern PORT_TYPE triggerPri_pin_port;
191-
extern PINMASK_TYPE triggerPri_pin_mask;
192-
extern PORT_TYPE triggerSec_pin_port;
193-
extern PINMASK_TYPE triggerSec_pin_mask;
194-
extern PORT_TYPE triggerThird_pin_port;
195-
extern PINMASK_TYPE triggerThird_pin_mask;
148+
extern port_register_t inj1_pin_port;
149+
extern pin_mask_t inj1_pin_mask;
150+
extern port_register_t inj2_pin_port;
151+
extern pin_mask_t inj2_pin_mask;
152+
extern port_register_t inj3_pin_port;
153+
extern pin_mask_t inj3_pin_mask;
154+
extern port_register_t inj4_pin_port;
155+
extern pin_mask_t inj4_pin_mask;
156+
extern port_register_t inj5_pin_port;
157+
extern pin_mask_t inj5_pin_mask;
158+
extern port_register_t inj6_pin_port;
159+
extern pin_mask_t inj6_pin_mask;
160+
extern port_register_t inj7_pin_port;
161+
extern pin_mask_t inj7_pin_mask;
162+
extern port_register_t inj8_pin_port;
163+
extern pin_mask_t inj8_pin_mask;
164+
165+
extern port_register_t ign1_pin_port;
166+
extern pin_mask_t ign1_pin_mask;
167+
extern port_register_t ign2_pin_port;
168+
extern pin_mask_t ign2_pin_mask;
169+
extern port_register_t ign3_pin_port;
170+
extern pin_mask_t ign3_pin_mask;
171+
extern port_register_t ign4_pin_port;
172+
extern pin_mask_t ign4_pin_mask;
173+
extern port_register_t ign5_pin_port;
174+
extern pin_mask_t ign5_pin_mask;
175+
extern port_register_t ign6_pin_port;
176+
extern pin_mask_t ign6_pin_mask;
177+
extern port_register_t ign7_pin_port;
178+
extern pin_mask_t ign7_pin_mask;
179+
extern port_register_t ign8_pin_port;
180+
extern pin_mask_t ign8_pin_mask;
181+
182+
extern port_register_t tach_pin_port;
183+
extern pin_mask_t tach_pin_mask;
184+
extern port_register_t pump_pin_port;
185+
extern pin_mask_t pump_pin_mask;
186+
187+
extern port_register_t flex_pin_port;
188+
extern pin_mask_t flex_pin_mask;
189+
190+
extern port_register_t triggerPri_pin_port;
191+
extern pin_mask_t triggerPri_pin_mask;
192+
extern port_register_t triggerSec_pin_port;
193+
extern pin_mask_t triggerSec_pin_mask;
194+
extern port_register_t triggerThird_pin_port;
195+
extern pin_mask_t triggerThird_pin_mask;
196196

197197
extern byte triggerInterrupt;
198198
extern byte triggerInterrupt2;

‎speeduino/idle.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ long FeedForwardTerm;
3434
unsigned long idle_pwm_target_value;
3535
long idle_cl_target_rpm;
3636

37-
PORT_TYPE idle_pin_port;
38-
PINMASK_TYPE idle_pin_mask;
39-
PORT_TYPE idle2_pin_port;
40-
PINMASK_TYPE idle2_pin_mask;
41-
PORT_TYPE idleUpOutput_pin_port;
42-
PINMASK_TYPE idleUpOutput_pin_mask;
37+
port_register_t idle_pin_port;
38+
pin_mask_t idle_pin_mask;
39+
port_register_t idle2_pin_port;
40+
pin_mask_t idle2_pin_mask;
41+
port_register_t idleUpOutput_pin_port;
42+
pin_mask_t idleUpOutput_pin_mask;
4343

4444
static table2D_u8_u8_10 iacPWMTable(&configPage6.iacBins, &configPage6.iacOLPWMVal);
4545
static table2D_u8_u8_10 iacStepTable(&configPage6.iacBins, &configPage6.iacOLStepVal);

‎speeduino/port_pin.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace type_detection_detail {
1616
}
1717

1818
/** @brief The return type of a "call" to portOutputRegister() */
19-
using PORT_TYPE = decltype(type_detection_detail::return_type_of(&type_detection_detail::detectPortRegisterType));
19+
using port_register_t = decltype(type_detection_detail::return_type_of(&type_detection_detail::detectPortRegisterType));
2020

2121
/** @brief The return type of a "call" to digitalPinToBitMask() */
22-
using PINMASK_TYPE = decltype(type_detection_detail::return_type_of(&type_detection_detail::detectDigitalPinToBitMask));
22+
using pin_mask_t = decltype(type_detection_detail::return_type_of(&type_detection_detail::detectDigitalPinToBitMask));

0 commit comments

Comments
 (0)