Modernize caravan2 a bit

More to do
patcoll · Dec 31, 2023 · 1965d79 · 1965d79
1 parent d70a345
commit 1965d79
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 26 deletions.
diff --git a/firmware/caravan2/config.h b/firmware/caravan2/config.h
@@ -1,13 +1,16 @@
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
-#define VENDOR_ID     0xFEAE
-#define PRODUCT_ID    0x8847
-#define DEVICE_VER    0x0001
+// #ifndef CONFIG_H
+// #define CONFIG_H
+
+// #define VENDOR_ID     0xFEAE
+// #define PRODUCT_ID    0x8847
+// #define DEVICE_VER    0x0001
 // #define MANUFACTURER  TheVan Keyboards
 // #define PRODUCT       CaraVan 2
 // #define DESCRIPTION   CaraVan Split 40%
 
+
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 16
 #define MATRIX_ROW_PINS { D0, D1, D2 }
@@ -16,22 +19,22 @@
 
 
 
-#define DIODE_DIRECTION ROW2COL
+// #define DIODE_DIRECTION ROW2COL
 
-#define BACKLIGHT_LEVELS 1
+// #define BACKLIGHT_LEVELS 1
 // #define BACKLIGHT_PIN undefined
 
-#define DEBOUNCE 5
+// #define DEBOUNCE 5
 // #define TAPPING_TERM 175
 
-#define USB_MAX_POWER_CONSUMPTION 100
+// #define USB_MAX_POWER_CONSUMPTION 100
 // #define PERMISSIVE_HOLD
 #define MULTIPLEX_PINS { D4, D6, D7, B4 }
 #define MULTIPLEX 4
-#define WS2812_DI_PIN F0
-#define RGBLIGHT_LIMIT_VAL 255
-#define RGBLED_NUM 20
-#define RGBLIGHT_ANIMATIONS
-#define RGBLIGHT_SLEEP
+// #define WS2812_DI_PIN F0
+// #define RGBLIGHT_LIMIT_VAL 255
+// #define RGBLED_NUM 20
+// #define RGBLIGHT_ANIMATIONS
+// #define RGBLIGHT_SLEEP
 #define IS_COMMAND() ( keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) )
-#endif
+// #endif
diff --git a/firmware/caravan2/info.json b/firmware/caravan2/info.json
@@ -1,5 +1,41 @@
 {
     "keyboard_name": "CaraVan 2",
     "maintainer": "TheVan Keyboards",
-    "manufacturer": "TheVan Keyboards"
+    "manufacturer": "TheVan Keyboards",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "usb": {
+        "max_power": 100,
+        "no_startup_check": true,
+        "device_version": "0.0.1",
+        "pid": "0x8847",
+        "vid": "0xFEAE"
+    },
+    "diode_direction": "ROW2COL",
+    "features": {
+        "audio": false,
+        "bluetooth": false,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "midi": false,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "backlight": {
+        "levels": 1
+    },
+    "rgblight": {
+        "animations": {
+            "breathing": true
+        },
+        "max_brightness": 255,
+        "sleep": true,
+        "led_count": 20
+    },
+    "ws2812": {
+        "pin": "F0"
+    }
 }
diff --git a/firmware/caravan2/rules.mk b/firmware/caravan2/rules.mk
@@ -1,5 +1,5 @@
-MCU = atmega32u4
-BOOTLOADER = atmel-dfu
+# MCU = atmega32u4
+# BOOTLOADER = atmel-dfu
 F_CPU = 16000000
 ARCH = AVR8
 F_USB = 16000000
@@ -8,18 +8,18 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 
-NO_USB_STARTUP_CHECK = yes
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
+# NO_USB_STARTUP_CHECK = yes
+# MOUSEKEY_ENABLE = yes
+# EXTRAKEY_ENABLE = yes
 
 
 
-NKRO_ENABLE = yes
+# NKRO_ENABLE = yes
 
-RGBLIGHT_ENABLE = yes
+# RGBLIGHT_ENABLE = yes
 CUSTOM_MATRIX = lite
 
-MIDI_ENABLE = no
-AUDIO_ENABLE = no
-BLUETOOTH_ENABLE = no
+# MIDI_ENABLE = no
+# AUDIO_ENABLE = no
+# BLUETOOTH_ENABLE = no
 SRC += matrix.c