diff options
Diffstat (limited to 'keyboards/lets_split/rev1')
| -rw-r--r-- | keyboards/lets_split/rev1/Makefile | 3 | ||||
| -rw-r--r-- | keyboards/lets_split/rev1/config.h | 24 | ||||
| -rw-r--r-- | keyboards/lets_split/rev1/rev1.c | 8 | ||||
| -rw-r--r-- | keyboards/lets_split/rev1/rev1.h | 6 | ||||
| -rw-r--r-- | keyboards/lets_split/rev1/rules.mk | 5 |
5 files changed, 45 insertions, 1 deletions
diff --git a/keyboards/lets_split/rev1/Makefile b/keyboards/lets_split/rev1/Makefile new file mode 100644 index 000000000..4e2a6f00f --- /dev/null +++ b/keyboards/lets_split/rev1/Makefile @@ -0,0 +1,3 @@ +ifndef MAKEFILE_INCLUDED + include ../../Makefile +endif
\ No newline at end of file diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h index b609ada07..da5b47673 100644 --- a/keyboards/lets_split/rev1/config.h +++ b/keyboards/lets_split/rev1/config.h @@ -25,7 +25,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define PRODUCT_ID 0x3060 #define DEVICE_VER 0x0001 #define MANUFACTURER Wootpatoot +<<<<<<< HEAD +#define PRODUCT Lets Split +======= #define PRODUCT Lets Split v1 +>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df #define DESCRIPTION A split keyboard for the cheap makers /* key matrix size */ @@ -41,6 +45,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define USE_I2C +<<<<<<< HEAD +// Use serial if not using I2C +#ifndef USE_I2C +# define USE_SERIAL +#endif + +======= +>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df // #define EE_HANDS #define I2C_MASTER_LEFT @@ -69,10 +81,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ) /* ws2812 RGB LED */ +<<<<<<< HEAD +#define RGB_DI_PIN D4 +#define RGBLIGHT_TIMER +#define RGBLED_NUM 8 // Number of LEDs +======= #define ws2812_PORTREG PORTD #define ws2812_DDRREG DDRD #define ws2812_pin PD1 #define RGBLED_NUM 28 // Number of LEDs +>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 @@ -95,4 +113,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION -#endif
\ No newline at end of file +<<<<<<< HEAD +#endif +======= +#endif +>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df diff --git a/keyboards/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c index 574c116a7..41dd1e353 100644 --- a/keyboards/lets_split/rev1/rev1.c +++ b/keyboards/lets_split/rev1/rev1.c @@ -24,7 +24,15 @@ void matrix_init_kb(void) { }; void shutdown_user(void) { +<<<<<<< HEAD + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_goodbye, false, 0); + _delay_ms(150); + stop_all_notes(); + #endif +======= PLAY_NOTE_ARRAY(tone_goodbye, false, 0); _delay_ms(150); stop_all_notes(); +>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df } diff --git a/keyboards/lets_split/rev1/rev1.h b/keyboards/lets_split/rev1/rev1.h index 04fe0ddeb..998b2be7c 100644 --- a/keyboards/lets_split/rev1/rev1.h +++ b/keyboards/lets_split/rev1/rev1.h @@ -1,9 +1,15 @@ #ifndef REV1_H #define REV1_H +<<<<<<< HEAD +#include "../lets_split.h" + +//void promicro_bootloader_jmp(bool program); +======= #include "quantum.h" void promicro_bootloader_jmp(bool program); +>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df #define KEYMAP( \ k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ diff --git a/keyboards/lets_split/rev1/rules.mk b/keyboards/lets_split/rev1/rules.mk new file mode 100644 index 000000000..a0825b4ef --- /dev/null +++ b/keyboards/lets_split/rev1/rules.mk @@ -0,0 +1,5 @@ +BACKLIGHT_ENABLE = no + +ifndef QUANTUM_DIR + include ../../../Makefile +endif
\ No newline at end of file |