~ruther/qmk_firmware

328a8322f4134fdec2f29b8dd58501c99b4de876 — Joshua Diamond 4 years ago f1a3ce4 + 8e8b711
Merge branch 'develop' of github.com:qmk/qmk_firmware into develop
2 files changed, 5 insertions(+), 5 deletions(-)

M drivers/chibios/usbpd_stm32g4.c
M quantum/audio/driver_chibios_dac_basic.c
M drivers/chibios/usbpd_stm32g4.c => drivers/chibios/usbpd_stm32g4.c +1 -1
@@ 64,7 64,7 @@ __attribute__((weak)) usbpd_allowance_t usbpd_get_allowance(void) {
        switch (vstate_max) {
            case 0:
            case 1:
                return USBPD_500MA; // Note that this is 500mA (i.e. max USB 2.0), not 900mA, as we're not using USB 3.1 as a sink device.
                return USBPD_500MA;  // Note that this is 500mA (i.e. max USB 2.0), not 900mA, as we're not using USB 3.1 as a sink device.
            case 2:
                return USBPD_1500MA;
            case 3:

M quantum/audio/driver_chibios_dac_basic.c => quantum/audio/driver_chibios_dac_basic.c +4 -4
@@ 74,9 74,9 @@ GPTConfig gpt7cfg1 = {.frequency = AUDIO_DAC_SAMPLE_RATE,

static void gpt_audio_state_cb(GPTDriver *gptp);
GPTConfig   gptStateUpdateCfg = {.frequency = 10,
                      .callback  = gpt_audio_state_cb,
                      .cr2       = TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event.    */
                      .dier      = 0U};
                               .callback  = gpt_audio_state_cb,
                               .cr2       = TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event.    */
                               .dier      = 0U};

static const DACConfig dac_conf_ch1 = {.init = AUDIO_DAC_OFF_VALUE, .datamode = DAC_DHRM_12BIT_RIGHT};
static const DACConfig dac_conf_ch2 = {.init = AUDIO_DAC_OFF_VALUE, .datamode = DAC_DHRM_12BIT_RIGHT};


@@ 131,7 131,7 @@ void channel_2_start(void) {

void channel_2_stop(void) {
    gptStopTimer(&GPTD7);
    palSetPadMode(GPIOA, 5, PAL_MODE_OUTPUT_PUSHPULL); \
    palSetPadMode(GPIOA, 5, PAL_MODE_OUTPUT_PUSHPULL);
    palSetPad(GPIOA, 5);
}