diff options
| author | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
|---|---|---|
| committer | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
| commit | e7f4d56592b3975c38af329e77b4efd9108495e8 (patch) | |
| tree | 0a416bccbf70bfdbdb9ffcdb3bf136b47378c014 /keyboards/lets_split/sockets | |
| parent | 71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (diff) | |
| parent | 8416a94ad27b3ff058576f09f35f0704a8b39ff3 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboards/lets_split/sockets')
| -rw-r--r-- | keyboards/lets_split/sockets/config.h | 6 | ||||
| -rw-r--r-- | keyboards/lets_split/sockets/sockets.h | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/keyboards/lets_split/sockets/config.h b/keyboards/lets_split/sockets/config.h index 2d3e68610e..e8459494be 100644 --- a/keyboards/lets_split/sockets/config.h +++ b/keyboards/lets_split/sockets/config.h @@ -19,8 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once /* USB Device descriptor parameter */ -#define VENDOR_ID 0xBEE5 -#define PRODUCT_ID 0xFEED +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x0BEE #define DEVICE_VER 0x0001 #define MANUFACTURER Duckle29 #define PRODUCT Lets Split Sockets @@ -88,4 +88,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define NO_ACTION_FUNCTION #define DISABLE_LEADER -#endif // USE_Link_Time_Optimization
\ No newline at end of file +#endif // USE_Link_Time_Optimization diff --git a/keyboards/lets_split/sockets/sockets.h b/keyboards/lets_split/sockets/sockets.h index a79770bac6..a1a3f00a0e 100644 --- a/keyboards/lets_split/sockets/sockets.h +++ b/keyboards/lets_split/sockets/sockets.h @@ -1,12 +1,9 @@ #pragma once -#define DISABLE_JTAG // The keyboard uses PF4 and PF7, which are used by JTAG. #include "lets_split.h" -//void promicro_bootloader_jmp(bool program); #include "quantum.h" - #ifdef USE_I2C #include <stddef.h> #ifdef __AVR__ @@ -15,8 +12,6 @@ #endif #endif -//void promicro_bootloader_jmp(bool program); - #ifndef FLIP_HALF // Standard Keymap // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) |