Merge pull request #1331 from ariasuni/master

Fix undefined reference errors with avr-gcc 7.1
daktil_thumb_popravljen
Erez Zukerman 2017-06-22 08:40:59 -04:00 committed by GitHub
commit fe9556104b
4 changed files with 62 additions and 8 deletions

View File

@ -1,6 +1,30 @@
#include "ez.h" #include "ez.h"
#include "i2cmaster.h" #include "i2cmaster.h"
extern inline void ergodox_board_led_on(void);
extern inline void ergodox_right_led_1_on(void);
extern inline void ergodox_right_led_2_on(void);
extern inline void ergodox_right_led_3_on(void);
extern inline void ergodox_right_led_on(uint8_t led);
extern inline void ergodox_board_led_off(void);
extern inline void ergodox_right_led_1_off(void);
extern inline void ergodox_right_led_2_off(void);
extern inline void ergodox_right_led_3_off(void);
extern inline void ergodox_right_led_off(uint8_t led);
extern inline void ergodox_led_all_on(void);
extern inline void ergodox_led_all_off(void);
extern inline void ergodox_right_led_1_set(uint8_t n);
extern inline void ergodox_right_led_2_set(uint8_t n);
extern inline void ergodox_right_led_3_set(uint8_t n);
extern inline void ergodox_right_led_set(uint8_t led, uint8_t n);
extern inline void ergodox_led_all_set(uint8_t n);
bool i2c_initialized = 0; bool i2c_initialized = 0;
uint8_t mcp23018_status = 0x20; uint8_t mcp23018_status = 0x20;
@ -57,7 +81,7 @@ uint8_t init_mcp23018(void) {
// cli(); // cli();
if (i2c_initialized == 0) { if (i2c_initialized == 0) {
i2c_init(); // on pins D(1,0) i2c_init(); // on pins D(1,0)
i2c_initialized++; i2c_initialized = true;
_delay_ms(1000); _delay_ms(1000);
} }

View File

@ -1,25 +1,39 @@
#include "gh60.h" #include "gh60.h"
extern inline void gh60_caps_led_on(void);
extern inline void gh60_poker_leds_on(void);
extern inline void gh60_fn_led_on(void);
extern inline void gh60_esc_led_on(void);
extern inline void gh60_wasd_leds_on(void);
extern inline void gh60_caps_led_off(void);
extern inline void gh60_poker_leds_off(void);
extern inline void gh60_fn_led_off(void);
extern inline void gh60_esc_led_off(void);
extern inline void gh60_wasd_leds_off(void);
void led_set_kb(uint8_t usb_led) { void led_set_kb(uint8_t usb_led) {
// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
if (usb_led & (1<<USB_LED_CAPS_LOCK)) { if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
gh60_caps_led_on(); gh60_caps_led_on();
} else { } else {
gh60_caps_led_off(); gh60_caps_led_off();
} }
// if (usb_led & (1<<USB_LED_NUM_LOCK)) { // if (usb_led & (1<<USB_LED_NUM_LOCK)) {
// gh60_esc_led_on(); // gh60_esc_led_on();
// } else { // } else {
// gh60_esc_led_off(); // gh60_esc_led_off();
// } // }
// if (usb_led & (1<<USB_LED_SCROLL_LOCK)) { // if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
// gh60_fn_led_on(); // gh60_fn_led_on();
// } else { // } else {
// gh60_fn_led_off(); // gh60_fn_led_off();
// } // }
led_set_user(usb_led); led_set_user(usb_led);
} }

View File

@ -17,6 +17,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "pegasushoof.h" #include "pegasushoof.h"
extern inline void ph_caps_led_on(void);
extern inline void ph_caps_led_off(void);
extern inline void ph_sclk_led_on(void);
extern inline void ph_sclk_led_off(void);
__attribute__ ((weak)) __attribute__ ((weak))
void matrix_init_user(void) { void matrix_init_user(void) {
}; };

View File

@ -1,5 +1,13 @@
#include "xd60.h" #include "xd60.h"
extern inline void xd60_caps_led_on(void);
extern inline void xd60_bl_led_on(void);
extern inline void xd60_caps_led_off(void);
extern inline void xd60_bl_led_off(void);
void led_set_kb(uint8_t usb_led) { void led_set_kb(uint8_t usb_led) {
// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here