Code: Select all
/* Key and Mods */
case ACT_LMODS:
case ACT_RMODS:
{
uint8_t mods = (action.kind.id == ACT_LMODS) ? action.key.mods :
action.key.mods<<4;
if (event.pressed) {
/* if no mousekeys are pressed but other regular keys,
* turn off the MOUSE_LAYER*/
if( action.key.kind == ACT_LMODS
&& action.key.mods == 0
&& tp_buttons==0) {
mouse_layer_helper = ML_UNSET;
layer_off(MOUSE_LAYER);
}
if (mods) {
add_weak_mods(mods);
send_keyboard_report();
}
register_code(action.key.code);
} else {
unregister_code(action.key.code);
if (mods) {
del_weak_mods(mods);
send_keyboard_report();
}
}
}
break;
Code: Select all
GFX_DIR = u8glib/src
OLED_ENABLE = yes # OLED Display
ifdef OLED_ENABLE
__AVR__ = yes
SRC += \
u8g_dev_ssd1351_128x128.c \
u8g_com_api.c \
u8g_com_atmega_hw_spi.c \
u8g_pbxh24.c \
u8g_delay.c \
u8g_com_io.c \
u8g_com_atmega_sw_spi.c \
u8g_pbxh16.c \
u8g_pb8h8.c \
u8g_state.c \
u8g_page.c \
u8g_pb.c \
u8g_bitmap.c \
u8g_circle.c \
u8g_clip.c \
u8g_ellipse.c \
u8g_font.c \
u8g_font_data.c \
u8g_line.c \
u8g_rect.c \
u8g_rot.c \
u8g_scale.c \
u8g_u8toa.c \
u8g_u16toa.c \
u8g_ll_api.c
VPATH += $(GFX_DIR)/
OPT_DEFS += -DDISPLAY_ENABLE
# Tell u8glib how to support hardware SPI:
OPT_DEFS += -D__AT_AT90USB1286__
endif
Code: Select all
#OLED_ENABLE = yes
Code: Select all
OLED_ENABLE = yes
Ah, my bad. You also need to use these macros in addition of those to discriminate between keys and modifiers.Ray wrote: ↑turns out I was ignoring what I learned about software-testing and didn't check some cases...
right now, any keydown (incl. mods) I break out of my mouselayer (on which I have mousekeys next to my trackpoint), but moving the trackpoint brings me back in, so I am kinda ok.
snip from action.clooks like action.key.kind == ACT_LMODS && action.key.mods == 0 evaluates to true even for my KC_LSFT and KC_LCTL.Code: Select all
/* Key and Mods */ case ACT_LMODS: case ACT_RMODS: { uint8_t mods = (action.kind.id == ACT_LMODS) ? action.key.mods : action.key.mods<<4; if (event.pressed) { /* if no mousekeys are pressed but other regular keys, * turn off the MOUSE_LAYER*/ if( action.key.kind == ACT_LMODS && action.key.mods == 0 && tp_buttons==0) { mouse_layer_helper = ML_UNSET; layer_off(MOUSE_LAYER); } if (mods) { add_weak_mods(mods); send_keyboard_report(); } register_code(action.key.code); } else { unregister_code(action.key.code); if (mods) { del_weak_mods(mods); send_keyboard_report(); } } } break;
I don't think those compiled objects are linked if as long as you don't use them(calling those functions).Vizir wrote: ↑I'm trying to add OLED display to the IBM F-122 keyboard and integrate the code into terminal_usb converter. Using u8glib, I can't get tmk to boot properly on the teensy++2.0. And this is when I'm just including the .c files to the Makefile. I'm not doing any calls to them at all. Here's what I've done:
... snip ...
the teensy goes back into bootloader after I click the reboot button. it never starts. Any clues why?
(action.key.code & 0b11111100)!=KC_LCTRL does the trick for me. Comparing keycodes to the 8 mods is easyer for me than understanding that union.Ray wrote: ↑ looks like action.key.kind == ACT_LMODS && action.key.mods == 0 evaluates to true even for my KC_LSFT and KC_LCTL.
Code: Select all
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index a790f87..860fc1a 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -124,6 +124,7 @@ CFLAGS += -O$(OPT)
CFLAGS += -funsigned-char
CFLAGS += -funsigned-bitfields
CFLAGS += -ffunction-sections
+CFLAGS += -fdata-sections
CFLAGS += -fno-inline-small-functions
CFLAGS += -fpack-struct
CFLAGS += -fshort-enums
Code: Select all
debug_matrix = true;
Code: Select all
-------------------------------------
| |
| |
PS2 port | ADB port |
| |
clock Vcc Data GND Data Vcc GND |
| | | | | | |
| | ----- ------------- | | |
| | | | | | |
| | | | | | |
| | | | | | |
| --------(|)-(|)---- --------- --------|
| | | | | |
| | | | | |
| | | | | |
-------- | | | | |
| \ / | | |
| | | | |
| | \ / |
| | | |
| | | |
| | | |
| | | |
|---R---(|)-------| |
| | | |
| | | |
| | | |
| | | |
| |---R----| |
| | | |
| | | |
| | | |
| | | ----R--LED---- |
| | | | | |
| | | | | |
| | | | ------ | |
| | ------ ---Vcc GND|--------
o | | |
| | -----------PD0 |
| | ADB on | |
| | ----o--- | |
| | ----------|PD2 |
| | PS2 port on | |
| | | |
ADB port on -------------------------|PD5 |
PS2 port on ------
Code: Select all
mkdir -p obj_alps64/protocol/lufa
Compiling C: ../../tmk_core/protocol/lufa/lufa.c
avr-gcc -c -mmcu=atmega32u2 -gdwarf-2 -DF_CPU=16000000UL -DINTERRUPT_CONTROL_ENDPOINT -DBOOTLOADER_SIZE=4096 -DF_USB=16000000UL -DARCH=ARCH_AVR8 -DUSB_DEVICE_ONLY -DUSE_FLASH_DESCRIPTORS -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DFIXED_NUM_CONFIGURATIONS=1 -DPROTOCOL_LUFA -DBOOTMAGIC_ENABLE -DMOUSEKEY_ENABLE -DMOUSE_ENABLE -DEXTRAKEY_ENABLE -DCONSOLE_ENABLE -DCOMMAND_ENABLE -DVERSION=unknown -Os -funsigned-char -funsigned-bitfields -ffunction-sections -fdata-sections -fno-inline-small-functions -fpack-struct -fshort-enums -fno-strict-aliasing -Wall -Wstrict-prototypes -Wa,-adhlns=obj_alps64/protocol/lufa/lufa.lst -I. -I../../tmk_core -I../../tmk_core/protocol/lufa -I../../tmk_core/protocol/lufa/LUFA-git -I../../tmk_core/common -std=gnu99 -include config.h -MMD -MP -MF .dep/obj_alps64_protocol_lufa_lufa.o.d ../../tmk_core/protocol/lufa/lufa.c -o obj_alps64/protocol/lufa/lufa.o
../../tmk_core/protocol/lufa/lufa.c: In function 'EVENT_USB_Device_Suspend':
../../tmk_core/protocol/lufa/lufa.c:182: warning: implicit declaration of function 'matrix_power_down'
../../tmk_core/protocol/lufa/lufa.c: In function 'setup_mcu':
../../tmk_core/protocol/lufa/lufa.c:576: warning: implicit declaration of function 'clock_prescale_set'
../../tmk_core/protocol/lufa/lufa.c:576: error: 'clock_div_1' undeclared (first use in this function)
../../tmk_core/protocol/lufa/lufa.c:576: error: (Each undeclared identifier is reported only once
../../tmk_core/protocol/lufa/lufa.c:576: error: for each function it appears in.)
make: *** [obj_alps64/protocol/lufa/lufa.o] Error 1
.100 times this! Someone should update the old guides here - I've seen this happen several times in the last few months. It's not just 32u2 that borks out.hasu wrote: ↑Probably you need newer toolchain, old WinAVR deosn't have enough support for ATMega32u2 unfortunately IIRC.
You can download Atmel GCC toolchain from their website, you will need to registration though.
Code: Select all
function uint32_t get_layer_state() {
//maybe do other stuff
return(layer_state);
}
I don't think this is 100% correct. You can mark global variables (and functions) with the static keyword and they'll become visible only in the current translation unit.Halvar wrote: ↑You also can't define different global variables with the same name in two files, or you'll get a linker error.
