Merge remote-tracking branch 'tmk/master'

[max/tmk_keyboard.git] / keyboard / ergodox / ergodox.h

diff --git a/keyboard/ergodox/ergodox.h b/keyboard/ergodox/ergodox.h
index 460d995fff3e6312e788de7b1e28b6ecad43126e..67d43c3dc8af488e9ab28f3718216d5f1e54e2f3 100644 (file)
--- a/keyboard/ergodox/ergodox.h
+++ b/keyboard/ergodox/ergodox.h
@@ -24,6 +24,9 @@ Most used files are located at
 
 */
 
+#ifndef ERGODOX_H
+#define ERGODOX_H
+
 #include <stdint.h>
 #include <stdbool.h>
 #include <avr/io.h>
@@ -63,23 +66,23 @@ extern bool ergodox_left_led_1;         // left top
 extern bool ergodox_left_led_2;         // left middle
 extern bool ergodox_left_led_3;         // left bottom
 
-inline void ergodox_board_led_on(void)      { DDRD |=  (1<<6); PORTD |=  (1<<6); }
-inline void ergodox_right_led_1_on(void)    { DDRB |=  (1<<5); PORTB |=  (1<<5); }
-inline void ergodox_right_led_2_on(void)    { DDRB |=  (1<<6); PORTB |=  (1<<6); }
-inline void ergodox_right_led_3_on(void)    { DDRB |=  (1<<7); PORTB |=  (1<<7); }
-inline void ergodox_left_led_1_on(void)     { ergodox_left_led_1 = 1; }
-inline void ergodox_left_led_2_on(void)     { ergodox_left_led_2 = 1; }
-inline void ergodox_left_led_3_on(void)     { ergodox_left_led_3 = 1; }
-
-inline void ergodox_board_led_off(void)     { DDRD &= ~(1<<6); PORTD &= ~(1<<6); }
-inline void ergodox_right_led_1_off(void)   { DDRB &= ~(1<<5); PORTB &= ~(1<<5); }
-inline void ergodox_right_led_2_off(void)   { DDRB &= ~(1<<6); PORTB &= ~(1<<6); }
-inline void ergodox_right_led_3_off(void)   { DDRB &= ~(1<<7); PORTB &= ~(1<<7); }
-inline void ergodox_left_led_1_off(void)    { ergodox_left_led_1 = 0; }
-inline void ergodox_left_led_2_off(void)    { ergodox_left_led_2 = 0; }
-inline void ergodox_left_led_3_off(void)    { ergodox_left_led_3 = 0; }
-
-inline void ergodox_led_all_on(void)
+static inline void ergodox_board_led_on(void)      { DDRD |=  (1<<6); PORTD |=  (1<<6); }
+static inline void ergodox_right_led_1_on(void)    { DDRB |=  (1<<5); PORTB |=  (1<<5); }
+static inline void ergodox_right_led_2_on(void)    { DDRB |=  (1<<6); PORTB |=  (1<<6); }
+static inline void ergodox_right_led_3_on(void)    { DDRB |=  (1<<7); PORTB |=  (1<<7); }
+static inline void ergodox_left_led_1_on(void)     { ergodox_left_led_1 = 1; }
+static inline void ergodox_left_led_2_on(void)     { ergodox_left_led_2 = 1; }
+static inline void ergodox_left_led_3_on(void)     { ergodox_left_led_3 = 1; }
+
+static inline void ergodox_board_led_off(void)     { DDRD &= ~(1<<6); PORTD &= ~(1<<6); }
+static inline void ergodox_right_led_1_off(void)   { DDRB &= ~(1<<5); PORTB &= ~(1<<5); }
+static inline void ergodox_right_led_2_off(void)   { DDRB &= ~(1<<6); PORTB &= ~(1<<6); }
+static inline void ergodox_right_led_3_off(void)   { DDRB &= ~(1<<7); PORTB &= ~(1<<7); }
+static inline void ergodox_left_led_1_off(void)    { ergodox_left_led_1 = 0; }
+static inline void ergodox_left_led_2_off(void)    { ergodox_left_led_2 = 0; }
+static inline void ergodox_left_led_3_off(void)    { ergodox_left_led_3 = 0; }
+
+static inline void ergodox_led_all_on(void)
 {
     ergodox_board_led_on();
     ergodox_right_led_1_on();
@@ -91,7 +94,7 @@ inline void ergodox_led_all_on(void)
     ergodox_left_leds_update();
 }
 
-inline void ergodox_led_all_off(void)
+static inline void ergodox_led_all_off(void)
 {
     ergodox_board_led_off();
     ergodox_right_led_1_off();
@@ -103,14 +106,15 @@ inline void ergodox_led_all_off(void)
     ergodox_left_leds_update();
 }
 
-inline void ergodox_right_led_1_set(uint8_t n)    { OCR1A = n; }
-inline void ergodox_right_led_2_set(uint8_t n)    { OCR1B = n; }
-inline void ergodox_right_led_3_set(uint8_t n)    { OCR1C = n; }
+static inline void ergodox_right_led_1_set(uint8_t n)    { OCR1A = n; }
+static inline void ergodox_right_led_2_set(uint8_t n)    { OCR1B = n; }
+static inline void ergodox_right_led_3_set(uint8_t n)    { OCR1C = n; }
 
-inline void ergodox_led_all_set(uint8_t n)
+static inline void ergodox_led_all_set(uint8_t n)
 {
     ergodox_right_led_1_set(n);
     ergodox_right_led_2_set(n);
     ergodox_right_led_3_set(n);
 }
 
+#endif