Refactoring wilba.tech PCBs, updating Rama Works U80-A (qmk#6272)

* Added WT65-B, WT75-B, minor fixes * Update keyboards/wilba_tech/wt65_b/config.h Co-Authored-By: Drashna Jaelre <[email protected]> * Update keyboards/wilba_tech/wt65_b/readme.md Co-Authored-By: fauxpark <[email protected]> * Update keyboards/wilba_tech/wt75_b/config.h Co-Authored-By: Drashna Jaelre <[email protected]> * Change DEBOUNCING_DELAY to DEBOUNCE * Change DEBOUNCING_DELAY to DEBOUNCE * Move Zeal60/Zeal65 files to keyboards/wilba_tech * Change DEBOUNCING_DELAY to DEBOUNCE * Refactoring zeal60 code to wilba_tech * Moved Rama Works PCBs to wilba_tech * Rename Rama Works files * Cleanup info.json * Cleanup readme.md * Cleanup USB device strings * U80-A RGB matrix, IS31FL3731 driver changes * Fixed #include from keyboards/zeal60
cd-glacier · Jul 21, 2019 · bffbb4b · bffbb4b
1 parent d686c0e
commit bffbb4b
Show file tree

Hide file tree

Showing 118 changed files with 655 additions and 606 deletions.
diff --git a/drivers/issi/is31fl3731.c b/drivers/issi/is31fl3731.c
@@ -71,10 +71,10 @@ uint8_t g_twi_transfer_buffer[20];
 // buffers and the transfers in IS31FL3731_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
 uint8_t g_pwm_buffer[DRIVER_COUNT][144];
-bool g_pwm_buffer_update_required = false;
+bool g_pwm_buffer_update_required[DRIVER_COUNT] = { false };
 
 uint8_t g_led_control_registers[DRIVER_COUNT][18] = { { 0 }, { 0 } };
-bool g_led_control_registers_update_required = false;
+bool g_led_control_registers_update_required[DRIVER_COUNT] = { false };
 
 // This is the bit pattern in the LED control registers
 // (for matrix A, add one to register for matrix B)
@@ -204,7 +204,7 @@ void IS31FL3731_set_color( int index, uint8_t red, uint8_t green, uint8_t blue )
         g_pwm_buffer[led.driver][led.r - 0x24] = red;
         g_pwm_buffer[led.driver][led.g - 0x24] = green;
         g_pwm_buffer[led.driver][led.b - 0x24] = blue;
-        g_pwm_buffer_update_required = true;
+        g_pwm_buffer_update_required[led.driver] = true;
     }
 }
 
@@ -220,12 +220,12 @@ void IS31FL3731_set_led_control_register( uint8_t index, bool red, bool green, b
 {
     is31_led led = g_is31_leds[index];
 
-  uint8_t control_register_r = (led.r - 0x24) / 8;
-  uint8_t control_register_g = (led.g - 0x24) / 8;
-  uint8_t control_register_b = (led.b - 0x24) / 8;
-  uint8_t bit_r = (led.r - 0x24) % 8;
-  uint8_t bit_g = (led.g - 0x24) % 8;
-  uint8_t bit_b = (led.b - 0x24) % 8;
+    uint8_t control_register_r = (led.r - 0x24) / 8;
+    uint8_t control_register_g = (led.g - 0x24) / 8;
+    uint8_t control_register_b = (led.b - 0x24) / 8;
+    uint8_t bit_r = (led.r - 0x24) % 8;
+    uint8_t bit_g = (led.g - 0x24) % 8;
+    uint8_t bit_b = (led.b - 0x24) % 8;
 
     if ( red ) {
         g_led_control_registers[led.driver][control_register_r] |= (1 << bit_r);
@@ -243,28 +243,26 @@ void IS31FL3731_set_led_control_register( uint8_t index, bool red, bool green, b
         g_led_control_registers[led.driver][control_register_b] &= ~(1 << bit_b);
     }
 
-    g_led_control_registers_update_required = true;
+    g_led_control_registers_update_required[led.driver] = true;
 
 }
 
-void IS31FL3731_update_pwm_buffers( uint8_t addr1, uint8_t addr2 )
+void IS31FL3731_update_pwm_buffers( uint8_t addr, uint8_t index )
 {
-    if ( g_pwm_buffer_update_required )
+    if ( g_pwm_buffer_update_required[index] )
     {
-        IS31FL3731_write_pwm_buffer( addr1, g_pwm_buffer[0] );
-        IS31FL3731_write_pwm_buffer( addr2, g_pwm_buffer[1] );
+        IS31FL3731_write_pwm_buffer( addr, g_pwm_buffer[index] );
     }
-    g_pwm_buffer_update_required = false;
+    g_pwm_buffer_update_required[index] = false;
 }
 
-void IS31FL3731_update_led_control_registers( uint8_t addr1, uint8_t addr2 )
+void IS31FL3731_update_led_control_registers( uint8_t addr, uint8_t index )
 {
-    if ( g_led_control_registers_update_required )
+    if ( g_led_control_registers_update_required[index] )
     {
         for ( int i=0; i<18; i++ )
         {
-            IS31FL3731_write_register(addr1, i, g_led_control_registers[0][i] );
-            IS31FL3731_write_register(addr2, i, g_led_control_registers[1][i] );
+            IS31FL3731_write_register( addr, i, g_led_control_registers[index][i] );
         }
     }
 }
diff --git a/drivers/issi/is31fl3731.h b/drivers/issi/is31fl3731.h
@@ -44,8 +44,8 @@ void IS31FL3731_set_led_control_register( uint8_t index, bool red, bool green, b
 // (eg. from a timer interrupt).
 // Call this while idle (in between matrix scans).
 // If the buffer is dirty, it will update the driver with the buffer.
-void IS31FL3731_update_pwm_buffers( uint8_t addr1, uint8_t addr2 );
-void IS31FL3731_update_led_control_registers( uint8_t addr1, uint8_t addr2 );
+void IS31FL3731_update_pwm_buffers( uint8_t addr, uint8_t index  );
+void IS31FL3731_update_led_control_registers( uint8_t addr, uint8_t index );
 
 #define C1_1  0x24
 #define C1_2  0x25

diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
@@ -17,8 +17,8 @@
 #include "tmk_core/common/eeprom.h"
 
 // HACK
-#include "keyboards/zeal60/zeal60_api.h" // Temporary hack
-#include "keyboards/zeal60/zeal60_keycodes.h" // Temporary hack
+#include "keyboards/wilba_tech/via_api.h" // Temporary hack
+#include "keyboards/wilba_tech/via_keycodes.h" // Temporary hack
 
 
 /* Artificial delay added to get media keys to work in the encoder*/
@@ -72,7 +72,7 @@ void eeprom_set_valid(bool valid)
 
 void eeprom_reset(void)
 {
-	// Set the Zeal60 specific EEPROM state as invalid.
+	// Set the VIA specific EEPROM state as invalid.
 	eeprom_set_valid(false);
 	// Set the TMK/QMK EEPROM state as invalid.
 	eeconfig_disable();

diff --git a/keyboards/cannonkeys/stm32f072/keyboard.c b/keyboards/cannonkeys/stm32f072/keyboard.c
@@ -12,8 +12,8 @@
 #include "tmk_core/common/eeprom.h"
 
 // HACK
-#include "keyboards/zeal60/zeal60_api.h" // Temporary hack
-#include "keyboards/zeal60/zeal60_keycodes.h" // Temporary hack
+#include "keyboards/wilba_tech/via_api.h" // Temporary hack
+#include "keyboards/wilba_tech/via_keycodes.h" // Temporary hack
 
 
 backlight_config_t kb_backlight_config = {

diff --git a/keyboards/hs60/v2/keymaps/ansi_via/rules.mk b/keyboards/hs60/v2/keymaps/ansi_via/rules.mk
@@ -1,6 +1,6 @@
 # project specific files
-SRC =	keyboards/zeal60/zeal60.c \
-		keyboards/zeal60/rgb_backlight.c \
+SRC =	keyboards/wilba_tech/wt_main.c \
+		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/issi/is31fl3733.c \
 		quantum/color.c \
 		drivers/arm/i2c_master.c

diff --git a/keyboards/hs60/v2/keymaps/default_via/rules.mk b/keyboards/hs60/v2/keymaps/default_via/rules.mk
@@ -1,6 +1,6 @@
 # project specific files
-SRC =	keyboards/zeal60/zeal60.c \
-		keyboards/zeal60/rgb_backlight.c \
+SRC =	keyboards/wilba_tech/wt_main.c \
+		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/issi/is31fl3733.c \
 		quantum/color.c \
 		drivers/arm/i2c_master.c

diff --git a/keyboards/hs60/v2/keymaps/goatmaster/rules.mk b/keyboards/hs60/v2/keymaps/goatmaster/rules.mk
@@ -1,6 +1,6 @@
 # project specific files
-SRC =	keyboards/zeal60/zeal60.c \
-		keyboards/zeal60/rgb_backlight.c \
+SRC =	keyboards/wilba_tech/wt_main.c \
+		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/issi/is31fl3733.c \
 		quantum/color.c \
 		drivers/arm/i2c_master.c

diff --git a/keyboards/hs60/v2/keymaps/hhkb_via/rules.mk b/keyboards/hs60/v2/keymaps/hhkb_via/rules.mk
@@ -1,6 +1,6 @@
 # project specific files
-SRC =	keyboards/zeal60/zeal60.c \
-		keyboards/zeal60/rgb_backlight.c \
+SRC =	keyboards/wilba_tech/wt_main.c \
+		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/issi/is31fl3733.c \
 		quantum/color.c \
 		drivers/arm/i2c_master.c

diff --git a/keyboards/hs60/v2/keymaps/iso_andys8/rules.mk b/keyboards/hs60/v2/keymaps/iso_andys8/rules.mk
@@ -1,6 +1,6 @@
 # project specific files
-SRC =	keyboards/zeal60/zeal60.c \
-		keyboards/zeal60/rgb_backlight.c \
+SRC =	keyboards/wilba_tech/wt_main.c \
+		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/issi/is31fl3733.c \
 		quantum/color.c \
 		drivers/arm/i2c_master.c

diff --git a/keyboards/hs60/v2/keymaps/stanrc85/rules.mk b/keyboards/hs60/v2/keymaps/stanrc85/rules.mk
@@ -1,6 +1,6 @@
 # project specific files
-SRC =	keyboards/zeal60/zeal60.c \
-        keyboards/zeal60/rgb_backlight.c \
+SRC =	keyboards/wilba_tech/wt_main.c \
+        keyboards/wilba_tech/wt_rgb_backlight.c \
 	    drivers/issi/is31fl3733.c \
 	    quantum/color.c \
 	    drivers/arm/i2c_master.c

diff --git a/keyboards/hs60/v2/keymaps/win_osx_dual/rules.mk b/keyboards/hs60/v2/keymaps/win_osx_dual/rules.mk
@@ -1,6 +1,6 @@
 # project specific files
-SRC =	keyboards/zeal60/zeal60.c \
-		keyboards/zeal60/rgb_backlight.c \
+SRC =	keyboards/wilba_tech/wt_main.c \
+		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/issi/is31fl3733.c \
 		quantum/color.c \
 		drivers/arm/i2c_master.c

diff --git a/keyboards/hs60/v2/rules.mk b/keyboards/hs60/v2/rules.mk
@@ -1,6 +1,6 @@
 # project specific files
-SRC =	keyboards/zeal60/zeal60.c \
-		keyboards/zeal60/rgb_backlight.c \
+SRC =	keyboards/wilba_tech/wt_main.c \
+		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/issi/is31fl3733.c \
 		quantum/color.c \
 		drivers/arm/i2c_master.c

diff --git a/keyboards/hs60/v2/v2.h b/keyboards/hs60/v2/v2.h
@@ -18,8 +18,8 @@
 #define XXX KC_NO
 
 #include "quantum.h"
-#include "../../zeal60/rgb_backlight_keycodes.h"
-#include "../../zeal60/zeal60_keycodes.h"
+#include "../../wilba_tech/wt_rgb_backlight_keycodes.h"
+#include "../../wilba_tech/via_keycodes.h"
 
 // This a shortcut to help you visually see your layout.
 

diff --git a/keyboards/keebio/iris/iris.h b/keyboards/keebio/iris/iris.h
@@ -11,7 +11,7 @@
 #endif
 
 #include "quantum.h"
-#include "../../zeal60/zeal60_keycodes.h"
+#include "../../wilba_tech/via_keycodes.h"
 
 // Used to create a keymap using only KC_ prefixed keys
 #define LAYOUT_kc( \

diff --git a/keyboards/nk65/keymaps/default_via/rules.mk b/keyboards/nk65/keymaps/default_via/rules.mk
@@ -1,6 +1,6 @@
 # project specific files
-SRC =	keyboards/zeal60/zeal60.c \
-		keyboards/zeal60/rgb_backlight.c \
+SRC =	keyboards/wilba_tech/wt_main.c \
+		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/issi/is31fl3733.c \
 		quantum/color.c \
 		drivers/arm/i2c_master.c

diff --git a/keyboards/nk65/nk65.h b/keyboards/nk65/nk65.h
@@ -18,8 +18,8 @@
 #define XXX KC_NO
 
 #include "quantum.h"
-#include "../zeal60/rgb_backlight_keycodes.h"
-#include "../zeal60/zeal60_keycodes.h"
+#include "../wilba_tech/wt_rgb_backlight_keycodes.h"
+#include "../wilba_tech/via_keycodes.h"
 
 // This a shortcut to help you visually see your layout.
 

diff --git a/keyboards/nk65/rules.mk b/keyboards/nk65/rules.mk
@@ -1,6 +1,6 @@
 # project specific files
-SRC =	keyboards/zeal60/zeal60.c \
-		keyboards/zeal60/rgb_backlight.c \
+SRC =	keyboards/wilba_tech/wt_main.c \
+		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/issi/is31fl3733.c \
 		quantum/color.c \
 		drivers/arm/i2c_master.c

diff --git a/keyboards/rama/readme.md b/keyboards/rama/readme.md
diff --git a/keyboards/rama/u80_a/keymaps/default/keymap.c b/keyboards/rama/u80_a/keymaps/default/keymap.c
diff --git a/keyboards/rama/koyu/config.h → ...oards/wilba_tech/rama_works_koyu/config.h b/keyboards/rama/koyu/config.h → ...oards/wilba_tech/rama_works_koyu/config.h
@@ -21,9 +21,9 @@
 #define VENDOR_ID       0x5241 // "RW"
 #define PRODUCT_ID      0x4B59 // "KY"
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    RAMA.WORKS
-#define PRODUCT         RAMA KOYU
-#define DESCRIPTION     RAMA KOYU Keyboard
+#define MANUFACTURER    RAMA WORKS
+#define PRODUCT         RAMA WORKS KOYU
+#define DESCRIPTION     RAMA WORKS KOYU
 
 
 

diff --git a/keyboards/rama/koyu/info.json → ...ards/wilba_tech/rama_works_koyu/info.json b/keyboards/rama/koyu/info.json → ...ards/wilba_tech/rama_works_koyu/info.json
@@ -1,8 +1,8 @@
 {
-    "keyboard_name": "KOYU", 
-    "url": "", 
+    "keyboard_name": "RAMA WORKS KOYU", 
+    "url": "http://rama.works", 
     "maintainer": "Wilba", 
-    "bootloader": "DFU", 
+    "bootloader": "atmel-dfu", 
     "width": 16, 
     "height": 5, 
     "layouts": {

diff --git a/keyboards/rama/koyu/keymaps/default/keymap.c → .../rama_works_koyu/keymaps/default/keymap.c b/keyboards/rama/koyu/keymaps/default/keymap.c → .../rama_works_koyu/keymaps/default/keymap.c
diff --git a/keyboards/rama/koyu/koyu.c → ...ba_tech/rama_works_koyu/rama_works_koyu.c b/keyboards/rama/koyu/koyu.c → ...ba_tech/rama_works_koyu/rama_works_koyu.c
diff --git a/keyboards/rama/koyu/koyu.h → ...ba_tech/rama_works_koyu/rama_works_koyu.h b/keyboards/rama/koyu/koyu.h → ...ba_tech/rama_works_koyu/rama_works_koyu.h
@@ -17,8 +17,8 @@
 #pragma once
 
 #include "quantum.h"
-#include "../../zeal60/rgb_backlight_keycodes.h"
-#include "../../zeal60/zeal60_keycodes.h"
+#include "keyboards/wilba_tech/wt_rgb_backlight_keycodes.h"
+#include "keyboards/wilba_tech/via_keycodes.h"
 
 #define ____ KC_NO
 

diff --git a/keyboards/rama/koyu/readme.md → ...ards/wilba_tech/rama_works_koyu/readme.md b/keyboards/rama/koyu/readme.md → ...ards/wilba_tech/rama_works_koyu/readme.md
@@ -1,6 +1,6 @@
-# RAMA KOYU
+# RAMA WORKS KOYU
 
-![RAMA KOYU](https://static1.squarespace.com/static/563c788ae4b099120ae219e2/t/5b8bd6e6b8a045c95eac2003/1535891375794/RW-KOYU-A-RENDER-04-TOP.1335.jpg?format=1500w)
+![RAMA WORKS KOYU](https://static1.squarespace.com/static/563c788ae4b099120ae219e2/t/5b8bd6e6b8a045c95eac2003/1535891375794/RW-KOYU-A-RENDER-04-TOP.1335.jpg?format=1500w)
 
 The 'wait' for something isn't the most conscious desire, but that anticipation creates nostalgia.   
 
@@ -13,11 +13,11 @@ This is the sound of Rama Works. Never too busy-a feeling of delightful modern w
 [More info at RAMA WORKS](https://rama.works/koyu/)
 
 Keyboard Maintainer: [Wilba6582](https://github.com/Wilba6582)  
-Hardware Supported: RAMA KOYU PCB  
+Hardware Supported: RAMA WORKS KOYU PCB  
 Hardware Availability: [RAMA WORKS Store](https://ramaworks.store/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make rama/koyu:default
+    make wilba_tech/rama_works_koyu:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/rama/koyu/rules.mk → ...oards/wilba_tech/rama_works_koyu/rules.mk b/keyboards/rama/koyu/rules.mk → ...oards/wilba_tech/rama_works_koyu/rules.mk
@@ -1,8 +1,8 @@
 
 
 # project specific files
-SRC =	keyboards/zeal60/zeal60.c \
-		keyboards/zeal60/rgb_backlight.c \
+SRC =	keyboards/wilba_tech/wt_main.c \
+		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/issi/is31fl3731.c \
 		drivers/avr/i2c_master.c

diff --git a/keyboards/rama/m10_b/config.h → ...ards/wilba_tech/rama_works_m10_b/config.h b/keyboards/rama/m10_b/config.h → ...ards/wilba_tech/rama_works_m10_b/config.h
@@ -24,9 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VENDOR_ID       0x5241 // "RW"
 #define PRODUCT_ID      0x00AB // 10-B
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    RAMA.WORKS
-#define PRODUCT         RAMA M10-B
-#define DESCRIPTION     RAMA M10-B
+#define MANUFACTURER    RAMA WORKS
+#define PRODUCT         RAMA WORKS M10-B
+#define DESCRIPTION     RAMA WORKS M10-B
 
 /* key matrix size */
 #define MATRIX_ROWS 1

diff --git a/keyboards/rama/m10_b/info.json → ...rds/wilba_tech/rama_works_m10_b/info.json b/keyboards/rama/m10_b/info.json → ...rds/wilba_tech/rama_works_m10_b/info.json
@@ -1,7 +1,7 @@
 {
-  "keyboard_name": "m10-b",
-  "url": "",
-  "maintainer": "qmk",
+  "keyboard_name": "RAMA WORKS M10-B",
+  "url": "http://rama.works",
+  "maintainer": "Wilba",
   "width": 3,
   "height": 4,
   "layouts": {

diff --git a/...oards/rama/m10_b/keymaps/default/config.h → ...rama_works_m10_b/keymaps/default/config.h b/...oards/rama/m10_b/keymaps/default/config.h → ...rama_works_m10_b/keymaps/default/config.h
diff --git a/...oards/rama/m10_b/keymaps/default/keymap.c → ...rama_works_m10_b/keymaps/default/keymap.c b/...oards/rama/m10_b/keymaps/default/keymap.c → ...rama_works_m10_b/keymaps/default/keymap.c
diff --git a/...ards/rama/m10_b/keymaps/default/readme.md → ...ama_works_m10_b/keymaps/default/readme.md b/...ards/rama/m10_b/keymaps/default/readme.md → ...ama_works_m10_b/keymaps/default/readme.md
diff --git a/keyboards/rama/m10_b/keymaps/knops/config.h → ...h/rama_works_m10_b/keymaps/knops/config.h b/keyboards/rama/m10_b/keymaps/knops/config.h → ...h/rama_works_m10_b/keymaps/knops/config.h
diff --git a/keyboards/rama/m10_b/keymaps/knops/keymap.c → ...h/rama_works_m10_b/keymaps/knops/keymap.c b/keyboards/rama/m10_b/keymaps/knops/keymap.c → ...h/rama_works_m10_b/keymaps/knops/keymap.c
diff --git a/keyboards/rama/m10_b/keymaps/knops/readme.md → .../rama_works_m10_b/keymaps/knops/readme.md b/keyboards/rama/m10_b/keymaps/knops/readme.md → .../rama_works_m10_b/keymaps/knops/readme.md
diff --git a/keyboards/rama/m10_b/m10_b.c → ..._tech/rama_works_m10_b/rama_works_m10_b.c b/keyboards/rama/m10_b/m10_b.c → ..._tech/rama_works_m10_b/rama_works_m10_b.c
diff --git a/keyboards/rama/m10_b/m10_b.h → ..._tech/rama_works_m10_b/rama_works_m10_b.h b/keyboards/rama/m10_b/m10_b.h → ..._tech/rama_works_m10_b/rama_works_m10_b.h