pwm audio

5 files changed, 82 insertions, 8 deletions

diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile
index 485c5f77f6..fdf8c16400 100644
--- a/keyboard/planck/Makefile
+++ b/keyboard/planck/Makefile
@@ -122,8 +122,8 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 # SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 # NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-# MIDI_ENABLE = YES 		# MIDI controls
+# BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
+MIDI_ENABLE = YES 		# MIDI controls
 # UNICODE_ENABLE = YES 		# Unicode
 # BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
 
diff --git a/keyboard/planck/keymaps/keymap_eric.c b/keyboard/planck/keymaps/keymap_eric.c
new file mode 100644
index 0000000000..ffeec5f805
--- /dev/null
+++ b/keyboard/planck/keymaps/keymap_eric.c
@@ -0,0 +1,42 @@
+#include "planck.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = {
+    {KC_BSLS, S(KC_SLSH), KC_COMM,       KC_DOT,   KC_P,   KC_Y,   KC_F,    KC_G,         KC_C,    KC_R,    KC_L, KC_SLSH}, 
+    {TG(1),         KC_A,    KC_O,         KC_E,   KC_U,   KC_I,   KC_D,    KC_H,         KC_T,    KC_N,    KC_S, KC_MINS},
+    {KC_LGUI,    KC_QUOT,    KC_Q,         KC_J,   KC_K,   KC_X,   KC_B,    KC_M,         KC_W,    KC_V,    KC_Z, KC_RGUI},
+    {KC_LCBR,    KC_LCTL, KC_LALT, LT(1, TG(2)), KC_SPC, KC_TAB, KC_ENT, KC_BSPC, LT(1, TG(3)), KC_RALT, KC_RCTL, KC_RCBR}
+  },
+
+ [1] = {
+    {KC_PIPE,    KC_COLN, KC_LBRC,  KC_RBRC, S(KC_P), S(KC_Y), S(KC_F), S(KC_G), S(KC_C), S(KC_R), S(KC_L), KC_AMPR}, 
+    {KC_TRNS,    S(KC_A), S(KC_O),  S(KC_E), S(KC_U), S(KC_I), S(KC_D), S(KC_H), S(KC_T), S(KC_N), S(KC_S), KC_GRV},
+    {KC_TRNS,    KC_SCLN, S(KC_Q),  S(KC_J), S(KC_K), S(KC_X), S(KC_B), S(KC_M), S(KC_W), S(KC_V), S(KC_Z), KC_TRNS},
+    {S(KC_COMM), KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_DOT)}
+  },
+
+ [2] = {
+    {KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_NO}, 
+    {KC_NO,  KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20, KC_NO},
+    {KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_TRNS},
+    {KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO}
+  },
+
+ [3] = {
+    {KC_EXLM,  KC_7,    KC_5,    KC_3,      KC_1,    KC_9,    KC_0,    KC_2,    KC_4,    KC_6,    KC_8, KC_EQL}, 
+    {TG(4),   KC_NO, KC_PGUP, KC_HOME, KC_INSERT,   KC_NO,   KC_NO,  BL_DEC,   KC_UP,  BL_INC,   KC_NO, KC_NO},
+    {KC_TRNS, KC_NO, KC_PGDN,  KC_END, KC_DELETE,   KC_NO,   KC_NO, KC_LEFT, KC_DOWN, KC_RGHT,   KC_NO, KC_TRNS},
+    {KC_NO, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO}
+  },
+
+ [4] = {
+    {KC_TILD, KC_HASH, KC_LPRN, KC_RPRN, S(KC_QUOT), KC_PERC, KC_UNDS, KC_CIRC,  KC_DLR,   KC_AT, KC_ASTR, KC_PLUS}, 
+    {KC_TRNS,   KC_NO,   KC_NO,   KC_NO,      KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO},
+    {KC_TRNS,   KC_NO,   KC_NO,   KC_NO,      KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_TRNS},
+    {KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO}
+  }
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+
+};
\ No newline at end of file
diff --git a/keyboard/planck/keymaps/keymap_lock.c b/keyboard/planck/keymaps/keymap_lock.c
index cc9be55f64..c2bf0b7d81 100644
--- a/keyboard/planck/keymaps/keymap_lock.c
+++ b/keyboard/planck/keymaps/keymap_lock.c
@@ -1,5 +1,5 @@
 #include "keymap_common.h"
-#include "backlight.h"
+// #include "backlight.h"
 #include "action_layer.h"
 #include "keymap_midi.h"
 #include <avr/boot.h>
@@ -71,7 +71,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
         if (record->event.pressed) {
           // play_note(440, 20);
           // register_code(KC_RSFT);
-          backlight_set(BACKLIGHT_LEVELS);
+          // backlight_set(BACKLIGHT_LEVELS);
           default_layer_and(0); 
           default_layer_or((1<<5));
 
@@ -106,9 +106,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
           // note(0+12, 20);
           // note(0+24, 20);
         } else {
-          // unregister_code(KC_RSFT);
-          // stop_note();
-          backlight_set(0);
+          unregister_code(KC_RSFT);
+          // stop_all_notes();
+          // backlight_set(0);
           default_layer_and(0); 
           default_layer_or(0);
           // note(0+24, 20);
diff --git a/keyboard/planck/planck.c b/keyboard/planck/planck.c
index b62862af04..a986bd8812 100644
--- a/keyboard/planck/planck.c
+++ b/keyboard/planck/planck.c
@@ -19,6 +19,35 @@ void * matrix_init_kb(void) {
     DDRE |= (1<<6);
     PORTE |= (1<<6);
 
+    init_notes();
+
+    // play_note(((double)261.6*32)*pow(2.0,(36)/12.0), 0xF);
+    // _delay_ms(50);
+
+    // play_note(((double)261.6*32)*pow(2.0,(48)/12.0), 0xF);
+    // _delay_ms(25);
+    // stop_note(((double)261.6*32)*pow(2.0,(48)/12.0));
+
+    // play_note(((double)261.6*32)*pow(2.0,(48)/12.0), 0xF);
+    // _delay_ms(25);
+    // stop_note(((double)261.6*32)*pow(2.0,(48)/12.0));
+
+
+    // stop_note(((double)261.6*32)*pow(2.0,(36)/12.0));
+
+
+    // play_note(((double)261.6*32)*pow(2.0,(62)/12.0), 0xF);
+    // _delay_ms(50);
+    // stop_note(((double)261.6*32)*pow(2.0,(62)/12.0));
+
+
+    // play_note(((double)261.6*32)*pow(2.0,(64)/12.0), 0xF);
+    // _delay_ms(50);
+    // stop_note(((double)261.6*32)*pow(2.0,(64)/12.0));
+
+
+
+
 	if (matrix_init_user) {
 		(*matrix_init_user)();
 	}
diff --git a/keyboard/planck/planck.h b/keyboard/planck/planck.h
index 4e59aef566..32c08f3b0b 100644
--- a/keyboard/planck/planck.h
+++ b/keyboard/planck/planck.h
@@ -3,8 +3,11 @@
 
 #include "matrix.h"
 #include "keymap_common.h"
-#include "backlight.h"
+// #include "backlight.h"
 #include <stddef.h>
+#ifdef MIDI_ENABLE
+	#include <keymap_midi.h>
+#endif
 
 #define PLANCK_MIT( \
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \