Browse Source

removes extra voices, updates .hex files

pull/292/head preonic-1.0
Jack Humbert 8 years ago
parent
commit
66e0323881
7 changed files with 6370 additions and 6393 deletions
  1. +1
    -1
      keyboard/planck/keymaps/default/keymap.c
  2. +1588
    -1571
      keyboard/planck/planck_pcb_r4.hex
  3. +1588
    -1571
      keyboard/planck/planck_pcb_r4_w_bootloader.hex
  4. +1
    -1
      keyboard/preonic/keymaps/default/keymap.c
  5. +1627
    -1701
      keyboard/preonic/preonic_pcb_r1.hex
  6. +1544
    -1527
      keyboard/preonic/preonic_pcb_r1_w_bootloader.hex
  7. +21
    -21
      quantum/audio/voices.c

+ 1
- 1
keyboard/planck/keymaps/default/keymap.c View File

@ -365,7 +365,7 @@ void play_goodbye_tone()
}
uint8_t starting_note = 0x0C;
int offset = 7;
int offset = 0;
void process_action_user(keyrecord_t *record) {


+ 1588
- 1571
keyboard/planck/planck_pcb_r4.hex
File diff suppressed because it is too large
View File


+ 1588
- 1571
keyboard/planck/planck_pcb_r4_w_bootloader.hex
File diff suppressed because it is too large
View File


+ 1
- 1
keyboard/preonic/keymaps/default/keymap.c View File

@ -319,7 +319,7 @@ void matrix_init_user(void) {
#ifdef AUDIO_ENABLE
uint8_t starting_note = 0x0C;
int offset = 7;
int offset = 0;
void process_action_user(keyrecord_t *record) {


+ 1627
- 1701
keyboard/preonic/preonic_pcb_r1.hex
File diff suppressed because it is too large
View File


+ 1544
- 1527
keyboard/preonic/preonic_pcb_r1_w_bootloader.hex
File diff suppressed because it is too large
View File


+ 21
- 21
quantum/audio/voices.c View File

@ -54,28 +54,28 @@ float voice_envelope(float frequency) {
}
break;
case octave_crunch:
polyphony_rate = 0;
switch (compensated_index) {
case 0 ... 9:
case 20 ... 24:
case 30 ... 32:
frequency = frequency / 2;
note_timbre = TIMBRE_12;
break;
case 10 ... 19:
case 25 ... 29:
case 33 ... 35:
frequency = frequency * 2;
note_timbre = TIMBRE_12;
break;
// case octave_crunch:
// polyphony_rate = 0;
// switch (compensated_index) {
// case 0 ... 9:
// case 20 ... 24:
// case 30 ... 32:
// frequency = frequency / 2;
// note_timbre = TIMBRE_12;
// break;
// case 10 ... 19:
// case 25 ... 29:
// case 33 ... 35:
// frequency = frequency * 2;
// note_timbre = TIMBRE_12;
// break;
default:
note_timbre = TIMBRE_12;
break;
}
break;
// default:
// note_timbre = TIMBRE_12;
// break;
// }
// break;
case duty_osc:
// This slows the loop down a substantial amount, so higher notes may freeze


Loading…
Cancel
Save