diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-26 04:56:43 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-26 04:56:43 +0000 |
| commit | 0b37c0dfa0690c60ddf0798d8d771b74f47ebca1 (patch) | |
| tree | 3fa910e5907b75137d047363eee6680cc89228ee /drivers | |
| parent | ffd7e44e5af660fbd131f67ef803ac3aad2123d6 (diff) | |
| parent | 1d1d5da43f86d9dded47c66afec94991d623f114 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/avr/hd44780.h | 6 | ||||
| -rw-r--r-- | drivers/avr/i2c_master.h | 5 | ||||
| -rw-r--r-- | drivers/avr/i2c_slave.h | 5 | ||||
| -rw-r--r-- | drivers/avr/ssd1306.h | 5 |
4 files changed, 5 insertions, 16 deletions
diff --git a/drivers/avr/hd44780.h b/drivers/avr/hd44780.h index e60817e989..08e60f8a44 100644 --- a/drivers/avr/hd44780.h +++ b/drivers/avr/hd44780.h @@ -1,5 +1,3 @@ -#ifndef LCD_H -#define LCD_H /************************************************************************* Title : C include file for the HD44780U LCD library (lcd.c) Author: Peter Fleury <pfleury@gmx.ch> http://tinyurl.com/peterfleury @@ -43,6 +41,8 @@ */ +#pragma once + #include <inttypes.h> #include <avr/pgmspace.h> @@ -346,5 +346,3 @@ extern void lcd_data(uint8_t data); #define lcd_puts_P(__s) lcd_puts_p(PSTR(__s)) /**@}*/ - -#endif // LCD_H diff --git a/drivers/avr/i2c_master.h b/drivers/avr/i2c_master.h index 4a35867cd0..e5af73364b 100644 --- a/drivers/avr/i2c_master.h +++ b/drivers/avr/i2c_master.h @@ -17,8 +17,7 @@ * GitHub repository: https://github.com/g4lvanix/I2C-master-lib */ -#ifndef I2C_MASTER_H -#define I2C_MASTER_H +#pragma once #define I2C_READ 0x01 #define I2C_WRITE 0x00 @@ -42,5 +41,3 @@ i2c_status_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16 i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout); i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout); void i2c_stop(void); - -#endif // I2C_MASTER_H diff --git a/drivers/avr/i2c_slave.h b/drivers/avr/i2c_slave.h index 5d92150e65..1cd0625ef4 100644 --- a/drivers/avr/i2c_slave.h +++ b/drivers/avr/i2c_slave.h @@ -20,8 +20,7 @@ Read or write to the necessary buffer according to the opperation. */ -#ifndef I2C_SLAVE_H -#define I2C_SLAVE_H +#pragma once #define I2C_SLAVE_REG_COUNT 30 @@ -29,5 +28,3 @@ extern volatile uint8_t i2c_slave_reg[I2C_SLAVE_REG_COUNT]; void i2c_slave_init(uint8_t address); void i2c_slave_stop(void); - -#endif // I2C_SLAVE_H diff --git a/drivers/avr/ssd1306.h b/drivers/avr/ssd1306.h index 9131afcf61..6eecdcfaa4 100644 --- a/drivers/avr/ssd1306.h +++ b/drivers/avr/ssd1306.h @@ -1,5 +1,4 @@ -#ifndef SSD1306_H -#define SSD1306_H +#pragma once #include <stdbool.h> #include <stdio.h> @@ -86,5 +85,3 @@ void matrix_write_char(struct CharacterMatrix *matrix, uint8_t c); void matrix_write(struct CharacterMatrix *matrix, const char *data); void matrix_write_P(struct CharacterMatrix *matrix, const char *data); void matrix_render(struct CharacterMatrix *matrix); - -#endif |