Adding default settings for ERM motors for Hadron v3 haptic feedback (q…

…mk#4761) * adding default settings to support 3v ERM vibration motors * set default settings of haptic motor for LV061228B-L64-A 2v LRA * update ishtob keymap and fix config settings
sekigon-gonnoc · Jan 2, 2019 · 484c85b · 484c85b
1 parent a7b1b14
commit 484c85b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/keyboards/hadron/ver3/config.h b/keyboards/hadron/ver3/config.h
@@ -148,13 +148,26 @@
 #define FB_BRAKEFACTOR 6 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
 #define FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
 
+/* default 3V ERM vibration motor voltage and library*/
+#if FB_ERM_LRA == 0 
+#define RATED_VOLTAGE 3
+#define V_RMS 2.3
+#define V_PEAK 3.30
+/* Library Selection */
+#define LIB_SELECTION 4 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
+
+/* default 2V LRA voltage and library */
+#elif FB_ERM_LRA == 1
 #define RATED_VOLTAGE 2
 #define V_RMS 2.0
 #define V_PEAK 2.85
-#define F_LRA 205
+#define F_LRA 200
 /* Library Selection */
 #define LIB_SELECTION 6 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
 
+#endif
+
+
 /* Control 1 register settings */
 #define DRIVE_TIME 25
 #define AC_COUPLE 0
@@ -179,14 +192,11 @@
 #define ZC_DET_TIME 0
 #define AUTO_CAL_TIME 3
 
-//#define WS2812_LED_N 2
-//#define RGBLED_NUM WS2812_LED_N
-//#define WS2812_TIM_N 2
-//#define WS2812_TIM_CH 2
-//#define PORT_WS2812     GPIOA
-//#define PIN_WS2812      15
-//#define WS2812_DMA_STREAM STM32_DMA1_STREAM2  // DMA stream for TIMx_UP (look up in reference manual under DMA Channel selection)
-//#define WS2812_DMA_CHANNEL 7                  // DMA channel for TIMx_UP
-//#define WS2812_EXTERNAL_PULLUP
+//#define RGBLIGHT_ANIMATIONS
+
+//#define RGBLED_NUM 10
+//#define RGB_DI_PIN B5
+//#define DRIVER_LED_TOTAL RGBLED_NUM
 
+//#define RGB_MATRIX_KEYPRESSES
 #endif
diff --git a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_wrapper(
   KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
   KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR,  KC_LPRN, KC_RPRN, KC_DEL, \
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______, KC_F6,   KC_UNDS, KC_PLUS,  KC_LBRC, KC_RBRC, KC_PIPE, \
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______, KC_F6,   KC_UNDS, KC_EQL,  KC_LBRC, KC_RBRC, KC_PIPE, \
   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, _______, _______, KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
 ),

diff --git a/keyboards/hadron/ver3/mcuconf.h b/keyboards/hadron/ver3/mcuconf.h
@@ -159,7 +159,7 @@
 #define STM32_I2C_BUSY_TIMEOUT              50
 #define STM32_I2C_I2C1_IRQ_PRIORITY         10
 #define STM32_I2C_I2C2_IRQ_PRIORITY         10
-#define STM32_I2C_USE_DMA                   TRUE
+#define STM32_I2C_USE_DMA                   FALSE
 #define STM32_I2C_I2C1_DMA_PRIORITY         1
 #define STM32_I2C_I2C2_DMA_PRIORITY         1
 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")