From 3f755058872adbd374474801e57c6b323a559f40 Mon Sep 17 00:00:00 2001 From: Marvin Blum Date: Tue, 21 Mar 2017 16:59:18 +0100 Subject: [PATCH] Renamed pin functions. --- main.c | 12 ++++++------ pins.c | 12 ++++++------ pins.h | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/main.c b/main.c index 6172670..1687e72 100644 --- a/main.c +++ b/main.c @@ -16,18 +16,18 @@ int main(){ void prepare(){ serial_init(9600); - digitalPinMode(5, OUTPUT); - digitalPinMode(11, OUTPUT); + digital_pin_mode(5, OUTPUT); + digital_pin_mode(11, OUTPUT); } void loop(){ - digitalWrite(5, HIGH); - digitalWrite(11, HIGH); + digital_write(5, HIGH); + digital_write(11, HIGH); _delay_ms(1000); - digitalWrite(5, LOW); - digitalWrite(11, LOW); + digital_write(5, LOW); + digital_write(11, LOW); _delay_ms(1000); } diff --git a/pins.c b/pins.c index 81e9536..30d88f6 100644 --- a/pins.c +++ b/pins.c @@ -6,7 +6,7 @@ const unsigned char HIGH = 0x01; const unsigned char INPUT = 0x00; const unsigned char OUTPUT = 0x01; -void digitalPinMode(unsigned char pin, unsigned char mode){ +void digital_pin_mode(unsigned char pin, unsigned char mode){ if(pin > 13){ return; } @@ -31,7 +31,7 @@ void digitalPinMode(unsigned char pin, unsigned char mode){ } } -int digitalRead(unsigned char pin){ +int digital_read(unsigned char pin){ if(pin > 13){ return 0; } @@ -48,7 +48,7 @@ int digitalRead(unsigned char pin){ return PINB&_BV(DDB0+pin); } -void digitalWrite(unsigned char pin, unsigned char value){ +void digital_write(unsigned char pin, unsigned char value){ if(pin > 13){ return; } @@ -80,7 +80,7 @@ void digitalWrite(unsigned char pin, unsigned char value){ } } -void analogPinMode(unsigned char pin, unsigned char mode){ +void analog_pin_mode(unsigned char pin, unsigned char mode){ if(pin > 7){ return; } @@ -93,7 +93,7 @@ void analogPinMode(unsigned char pin, unsigned char mode){ } } -int analogRead(unsigned char pin){ +int analog_read(unsigned char pin){ if(pin > 7){ return 0; } @@ -101,7 +101,7 @@ int analogRead(unsigned char pin){ return PINC&_BV(DDC0+pin); } -void analogWrite(unsigned char pin, unsigned char value){ +void analog_write(unsigned char pin, unsigned char value){ if(pin > 7){ return; } diff --git a/pins.h b/pins.h index c89b043..7e2d347 100644 --- a/pins.h +++ b/pins.h @@ -6,13 +6,13 @@ extern const unsigned char HIGH; extern const unsigned char INPUT; extern const unsigned char OUTPUT; -// rename underscore -void digitalPinMode(unsigned char, unsigned char); -int digitalRead(unsigned char); -void digitalWrite(unsigned char, unsigned char); +// rename underscore, unify digital and analog +void digital_pin_mode(unsigned char, unsigned char); +int digital_read(unsigned char); +void digital_write(unsigned char, unsigned char); -void analogPinMode(unsigned char, unsigned char); -int analogRead(unsigned char); -void analogWrite(unsigned char, unsigned char); +void analog_pin_mode(unsigned char, unsigned char); +int analog_read(unsigned char); +void analog_write(unsigned char, unsigned char); #endif