浏览代码

Clueboard Rev4 Updates aka Volcano 660 (#7942)

* fix audio enable repetition

* remove RGB LED support as this board has no RGB LB LEDs

* use pragma once

* this board has no backlight support

* enable COMMAND_ENABLE

* comment cleanups

* setting bootmagic to lite as the first board thathat has this PCB has a solid bottom. If someone forgets to put in a RESET key on their keymap, they are not going to have fun resetting the board

* Update keyboards/clueboard/66/rev4/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/clueboard/66/rev4/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/clueboard/66/rev4/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/clueboard/66/rev4/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* convert the palset and palclear routines to setpinoutput and writepinlow

* remove scankb

* restore original guards instead of pragma once

Co-authored-by: fauxpark <fauxpark@gmail.com>
MechMerlin 5 年之前
父节点
当前提交
e0a0430c31
共有 3 个文件被更改,包括 16 次插入70 次删除
  1. 0 22
      keyboards/clueboard/66/rev4/config.h
  2. 9 40
      keyboards/clueboard/66/rev4/rev4.c
  3. 7 8
      keyboards/clueboard/66/rev4/rules.mk

+ 0 - 22
keyboards/clueboard/66/rev4/config.h

@@ -54,25 +54,3 @@
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
- /* Backlight configuration
- */
-#define BACKLIGHT_LEVELS 1
-
-/* Underlight configuration
- */
-#define RGB_DI_PIN D7
-#define RGBLED_NUM 18     // Number of LEDs
-#define RGBLIGHT_HUE_STEP 32
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-#define RGBLIGHT_ANIMATIONS
-#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
-#define RGBLIGHT_EFFECT_BREATHE_MAX 200
-#define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 666*2
-#define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3   // How many LEDs wide to light up
-#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 2   // The led to start at
-#define RGBLIGHT_EFFECT_KNIGHT_LED_NUM 5  // How many LEDs to travel
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 4    // How many LEDs wide to light up

+ 9 - 40
keyboards/clueboard/66/rev4/rev4.c

@@ -1,5 +1,4 @@
 #include "rev4.h"
-//#include "backlight.h"
 
 void matrix_init_kb(void) {
     // put your keyboard start-up code here
@@ -8,49 +7,19 @@ void matrix_init_kb(void) {
     led_init_ports();
 }
 
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
-void backlight_init_ports(void) {
-    print("init_backlight_pin()\n");
+void led_init_ports() {
     // Set our LED pins as output
-    //DDRD |= (1<<6); // Esc
-    //DDRB |= (1<<7); // Page Up
-    //DDRD |= (1<<4); // Arrows
+    setPinOutput(B13); // LED1
+    writePinLow(B13);
 
-    // Set our LED pins low
-    //PORTD &= ~(1<<6); // Esc
-    //PORTB &= ~(1<<7); // Page Up
-    //PORTD &= ~(1<<4); // Arrows
-}
+    setPinOutput(B14); // LED2
+    writePinLow(B14);
 
-void backlight_set(uint8_t level) {
-/*
-    if ( level == 0 ) {
-        // Turn off light
-        PORTD |= (1<<6); // Esc
-        PORTB |= (1<<7); // Page Up
-        PORTD |= (1<<4); // Arrows
-    } else {
-        // Turn on light
-        PORTD &= ~(1<<6); // Esc
-        PORTB &= ~(1<<7); // Page Up
-        PORTD &= ~(1<<4); // Arrows
-    }
-*/
-}
+    setPinOutput(B8); // LED3
+    writePinLow(B8);
 
-void led_init_ports() {
-    // Set our LED pins as output
-    palSetPadMode(GPIOB, 13, PAL_MODE_OUTPUT_PUSHPULL); // LED1
-    palClearPad(GPIOB, 13);
-    palSetPadMode(GPIOB, 14, PAL_MODE_OUTPUT_PUSHPULL); // LED2
-    palClearPad(GPIOB, 14);
-    palSetPadMode(GPIOA, 8, PAL_MODE_OUTPUT_PUSHPULL); // LED3
-    palClearPad(GPIOA, 8);
-    palSetPadMode(GPIOA, 0, PAL_MODE_OUTPUT_PUSHPULL); // Capslock LED
-    palClearPad(GPIOA, 0);
+    setPinOutput(B0); // Capslock LED
+    writePinLow(B0);
 }
 
 void led_set_kb(uint8_t usb_led) {

+ 7 - 8
keyboards/clueboard/66/rev4/rules.mk

@@ -4,18 +4,17 @@ MCU = STM32F303
 # Build Options
 #   comment out to disable the options.
 #
-BACKLIGHT_ENABLE = yes
-BOOTMAGIC_ENABLE = no   # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes   # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes   # Audio control and System control(+450)
-CONSOLE_ENABLE = yes    # Console for debug(+400)
-COMMAND_ENABLE = no     # Commands for debug and configuration
+BOOTMAGIC_ENABLE = lite   # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes   # Mouse keys
+EXTRAKEY_ENABLE = yes   # Audio control and System control
+CONSOLE_ENABLE = yes    # Console for debug
+COMMAND_ENABLE = yes     # Commands for debug and configuration
 NKRO_ENABLE = yes       # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-AUDIO_ENABLE = no
+AUDIO_ENABLE = yes
 RGBLIGHT_ENABLE = no    # Enable keyboard underlight functionality
+BACKLIGHT_ENABLE = no
 MIDI_ENABLE = no        # MIDI controls
 UNICODE_ENABLE = no     # Unicode
 BLUETOOTH_ENABLE = no   # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = yes
 
 LAYOUTS = 66_ansi 66_iso