forked from mirrors/qmk_userspace
		
	[Keyboard] Fix Redox Media compilation errors (#14345)
Co-authored-by: Ryan <fauxpark@gmail.com>
This commit is contained in:
		
					parent
					
						
							
								5af1799735
							
						
					
				
			
			
				commit
				
					
						f6a67c10bd
					
				
			
		
					 10 changed files with 51 additions and 22 deletions
				
			
		| 
						 | 
					@ -1,2 +0,0 @@
 | 
				
			||||||
RGBLIGHT_ENABLE = no
 | 
					 | 
				
			||||||
ENCODER_ENABLE = yes
 | 
					 | 
				
			||||||
| 
						 | 
					@ -67,20 +67,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||||
  )
 | 
					  )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					 | 
				
			||||||
bool encoder_update_user(uint8_t index, bool clockwise) {
 | 
					 | 
				
			||||||
   if (index == 0) { /* First encoder */
 | 
					 | 
				
			||||||
      if (clockwise) {
 | 
					 | 
				
			||||||
         tap_code(KC_VOLD);
 | 
					 | 
				
			||||||
      } else {
 | 
					 | 
				
			||||||
         tap_code(KC_VOLU);
 | 
					 | 
				
			||||||
      }
 | 
					 | 
				
			||||||
   } else if (index == 1) { /* Second encoder */
 | 
					 | 
				
			||||||
      if (clockwise) {
 | 
					 | 
				
			||||||
         tap_code(KC_WH_D);
 | 
					 | 
				
			||||||
      } else {
 | 
					 | 
				
			||||||
         tap_code(KC_WH_U);
 | 
					 | 
				
			||||||
      }
 | 
					 | 
				
			||||||
   }
 | 
					 | 
				
			||||||
   return false;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					@ -26,7 +26,7 @@ Obviously start by [installing QMK](https://docs.qmk.fm/#/getting_started_build_
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- Before flashing the firmware you should make sure that it compiles. Thus assuring that your QMK setup works fine and the keyboard and keymap files are correct:
 | 
					- Before flashing the firmware you should make sure that it compiles. Thus assuring that your QMK setup works fine and the keyboard and keymap files are correct:
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
qmk compile -kb redox/media -km media_ch
 | 
					qmk compile -kb redox_media -km default
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
The generated `.hex` file is output to the QMK root.
 | 
					The generated `.hex` file is output to the QMK root.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -15,4 +15,24 @@ You should have received a copy of the GNU General Public License
 | 
				
			||||||
along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
					along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
				
			||||||
*/
 | 
					*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "redox.h"
 | 
					#include "redox_media.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool encoder_update_kb(uint8_t index, bool clockwise) {
 | 
				
			||||||
 | 
					    if (!encoder_update_user(index, clockwise)) {
 | 
				
			||||||
 | 
					        return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (index == 0) { /* First encoder */
 | 
				
			||||||
 | 
					        if (clockwise) {
 | 
				
			||||||
 | 
					            tap_code(KC_VOLD);
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            tap_code(KC_VOLU);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else if (index == 1) { /* Second encoder */
 | 
				
			||||||
 | 
					        if (clockwise) {
 | 
				
			||||||
 | 
					            tap_code(KC_WH_D);
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            tap_code(KC_WH_U);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return true;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -17,10 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#pragma once
 | 
					#pragma once
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "redox.h"
 | 
					 | 
				
			||||||
#include "quantum.h"
 | 
					#include "quantum.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// rows are doubled
 | 
					// rows are doubled
 | 
				
			||||||
 | 
					// clang-format off
 | 
				
			||||||
#define LAYOUT( \
 | 
					#define LAYOUT( \
 | 
				
			||||||
                            R5C6,                                  R11C6,  R11C5,                             \
 | 
					                            R5C6,                                  R11C6,  R11C5,                             \
 | 
				
			||||||
  R0C0, R0C1, R0C2, R0C3, R0C4, R0C5,                                R6C5,  R6C4,  R6C3,  R6C2,  R6C1, R6C0,  \
 | 
					  R0C0, R0C1, R0C2, R0C3, R0C4, R0C5,                                R6C5,  R6C4,  R6C3,  R6C2,  R6C1, R6C0,  \
 | 
				
			||||||
							
								
								
									
										28
									
								
								keyboards/redox_media/rules.mk
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										28
									
								
								keyboards/redox_media/rules.mk
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,28 @@
 | 
				
			||||||
 | 
					# MCU name
 | 
				
			||||||
 | 
					MCU = atmega32u4
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Bootloader selection
 | 
				
			||||||
 | 
					BOOTLOADER = caterina
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Build Options
 | 
				
			||||||
 | 
					#   change yes to no to disable
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 | 
				
			||||||
 | 
					MOUSEKEY_ENABLE = yes       # Mouse keys
 | 
				
			||||||
 | 
					EXTRAKEY_ENABLE = yes       # Audio control and System control
 | 
				
			||||||
 | 
					CONSOLE_ENABLE = no         # Console for debug
 | 
				
			||||||
 | 
					COMMAND_ENABLE = no         # Commands for debug and configuration
 | 
				
			||||||
 | 
					# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
				
			||||||
 | 
					SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 | 
				
			||||||
 | 
					# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 | 
				
			||||||
 | 
					NKRO_ENABLE = yes           # USB Nkey Rollover
 | 
				
			||||||
 | 
					BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 | 
				
			||||||
 | 
					RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
				
			||||||
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
 | 
					ENCODER_ENABLE = yes
 | 
				
			||||||
 | 
					SPLIT_KEYBOARD = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Disable unsupported hardware
 | 
				
			||||||
 | 
					AUDIO_SUPPORTED = no
 | 
				
			||||||
 | 
					BACKLIGHT_SUPPORTED = no
 | 
				
			||||||
 | 
					RGBLIGHT_SUPPORTED = no
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue