noisymime
/
speeduino
mirror of https://github.com/noisymime/speeduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix PINMAKS_TYPE typo

This commit is contained in:
Vitor_Boss 2019-03-03 19:15:57 -03:00
parent e150936c71
commit 3532e1bfbc
7 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
speeduino/auxiliaries.h
View File

@ -25,17 +25,17 @@ void fanControl();
#define READ_N2O_ARM_PIN() ((*n2o_arming_pin_port & n2o_arming_pin_mask) ? true : false)
volatile PORT_TYPE *boost_pin_port;
volatile PINMAKS_TYPE boost_pin_mask;
volatile PINMASK_TYPE boost_pin_mask;
volatile PORT_TYPE *vvt_pin_port;
volatile PINMAKS_TYPE vvt_pin_mask;
volatile PINMASK_TYPE vvt_pin_mask;
volatile PORT_TYPE *fan_pin_port;
volatile PINMAKS_TYPE fan_pin_mask;
volatile PINMASK_TYPE fan_pin_mask;
volatile PORT_TYPE *n2o_stage1_pin_port;
volatile PINMAKS_TYPE n2o_stage1_pin_mask;
volatile PINMASK_TYPE n2o_stage1_pin_mask;
volatile PORT_TYPE *n2o_stage2_pin_port;
volatile PINMAKS_TYPE n2o_stage2_pin_mask;
volatile PINMASK_TYPE n2o_stage2_pin_mask;
volatile PORT_TYPE *n2o_arming_pin_port;
volatile PINMAKS_TYPE n2o_arming_pin_mask;
volatile PINMASK_TYPE n2o_arming_pin_mask;
volatile bool boost_pwm_state;
unsigned int boost_pwm_max_count; //Used for variable PWM frequency

2
speeduino/board_avr2560.h
View File

@ -10,7 +10,7 @@
* General
*/
#define PORT_TYPE uint8_t //Size of the port variables (Eg inj1_pin_port).
#define PINMAKS_TYPE uint8_t
#define PINMASK_TYPE uint8_t
void initBoard();
uint16_t freeRam();

2
speeduino/board_stm32.h
View File

@ -8,7 +8,7 @@
* General
*/
#define PORT_TYPE uint32_t
#define PINMAKS_TYPE uint32_t
#define PINMASK_TYPE uint32_t
#define micros_safe() micros() //timer5 method is not used on anything but AVR, the micros_safe() macro is simply an alias for the normal micros()
#ifndef USE_SERIAL3
#define USE_SERIAL3

2
speeduino/board_teensy35.h
View File

@ -9,7 +9,7 @@
void initBoard();
uint16_t freeRam();
#define PORT_TYPE uint8_t //Size of the port variables
#define PINMAKS_TYPE uint8_t
#define PINMASK_TYPE uint8_t
#define BOARD_DIGITAL_GPIO_PINS 34
#define BOARD_NR_GPIO_PINS 34
#define USE_SERIAL3

2
speeduino/board_template.h
View File

@ -7,7 +7,7 @@
* General
*/
#define PORT_TYPE uint32_t //Size of the port variables (Eg inj1_pin_port). Most systems use a byte, but SAMD21 and possibly others are a 32-bit unsigned int
#define PINMAKS_TYPE uint32_t
#define PINMASK_TYPE uint32_t
#define BOARD_NR_GPIO_PINS 52 //Not sure this is correct
#define BOARD_DIGITAL_GPIO_PINS 52 //Pretty sure this isn't right
#define micros_safe() micros() //timer5 method is not used on anything but AVR, the micros_safe() macro is simply an alias for the normal micros()

40
speeduino/globals.h
View File

@ -252,48 +252,48 @@ struct table2D knockWindowDurationTable;
//These are for the direct port manipulation of the injectors, coils and aux outputs
volatile PORT_TYPE *inj1_pin_port;
volatile PINMAKS_TYPE inj1_pin_mask;
volatile PINMASK_TYPE inj1_pin_mask;
volatile PORT_TYPE *inj2_pin_port;
volatile PINMAKS_TYPE inj2_pin_mask;
volatile PINMASK_TYPE inj2_pin_mask;
volatile PORT_TYPE *inj3_pin_port;
volatile PINMAKS_TYPE inj3_pin_mask;
volatile PINMASK_TYPE inj3_pin_mask;
volatile PORT_TYPE *inj4_pin_port;
volatile PINMAKS_TYPE inj4_pin_mask;
volatile PINMASK_TYPE inj4_pin_mask;
volatile PORT_TYPE *inj5_pin_port;
volatile PINMAKS_TYPE inj5_pin_mask;
volatile PINMASK_TYPE inj5_pin_mask;
volatile PORT_TYPE *inj6_pin_port;
volatile PINMAKS_TYPE inj6_pin_mask;
volatile PINMASK_TYPE inj6_pin_mask;
volatile PORT_TYPE *inj7_pin_port;
volatile PINMAKS_TYPE inj7_pin_mask;
volatile PINMASK_TYPE inj7_pin_mask;
volatile PORT_TYPE *inj8_pin_port;
volatile PINMAKS_TYPE inj8_pin_mask;
volatile PINMASK_TYPE inj8_pin_mask;
volatile PORT_TYPE *ign1_pin_port;
volatile PINMAKS_TYPE ign1_pin_mask;
volatile PINMASK_TYPE ign1_pin_mask;
volatile PORT_TYPE *ign2_pin_port;
volatile PINMAKS_TYPE ign2_pin_mask;
volatile PINMASK_TYPE ign2_pin_mask;
volatile PORT_TYPE *ign3_pin_port;
volatile PINMAKS_TYPE ign3_pin_mask;
volatile PINMASK_TYPE ign3_pin_mask;
volatile PORT_TYPE *ign4_pin_port;
volatile PINMAKS_TYPE ign4_pin_mask;
volatile PINMASK_TYPE ign4_pin_mask;
volatile PORT_TYPE *ign5_pin_port;
volatile PINMAKS_TYPE ign5_pin_mask;
volatile PINMASK_TYPE ign5_pin_mask;
volatile PORT_TYPE *ign6_pin_port;
volatile PINMAKS_TYPE ign6_pin_mask;
volatile PINMASK_TYPE ign6_pin_mask;
volatile PORT_TYPE *ign7_pin_port;
volatile PINMAKS_TYPE ign7_pin_mask;
volatile PINMASK_TYPE ign7_pin_mask;
volatile PORT_TYPE *ign8_pin_port;
volatile PINMAKS_TYPE ign8_pin_mask;
volatile PINMASK_TYPE ign8_pin_mask;
volatile PORT_TYPE *tach_pin_port;
volatile PINMAKS_TYPE tach_pin_mask;
volatile PINMASK_TYPE tach_pin_mask;
volatile PORT_TYPE *pump_pin_port;
volatile PINMAKS_TYPE pump_pin_mask;
volatile PINMASK_TYPE pump_pin_mask;
volatile PORT_TYPE *triggerPri_pin_port;
volatile PINMAKS_TYPE triggerPri_pin_mask;
volatile PINMASK_TYPE triggerPri_pin_mask;
volatile PORT_TYPE *triggerSec_pin_port;
volatile PINMAKS_TYPE triggerSec_pin_mask;
volatile PINMASK_TYPE triggerSec_pin_mask;
//These need to be here as they are used in both speeduino.ino and scheduler.ino
bool channel1InjEnabled = true;

4
speeduino/idle.h
View File

@ -42,9 +42,9 @@ unsigned int iacStepTime;
unsigned int completedHomeSteps;
volatile PORT_TYPE *idle_pin_port;
volatile PINMAKS_TYPE idle_pin_mask;
volatile PINMASK_TYPE idle_pin_mask;
volatile PORT_TYPE *idle2_pin_port;
volatile PINMAKS_TYPE idle2_pin_mask;
volatile PINMASK_TYPE idle2_pin_mask;
volatile bool idle_pwm_state;
unsigned int idle_pwm_max_count; //Used for variable PWM frequency