Skip to content

Commit c628363

Browse files
committed
sn32f2xx: fixup direct TC access in software control
1 parent ef8ea35 commit c628363

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

drivers/led/sn32f2xx.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -184,34 +184,34 @@ static const PWMConfig pwmcfg = {
184184
[0 ... PWM_CHANNELS - 1] = {.mode = PWM_OUTPUT_DISABLED},
185185
/* Enable selected channels */
186186
# if defined(SN32F2XX_ACTIVATE_PWM_CHAN_0)
187-
[0] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
187+
[0] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
188188
# endif // SN32F2XX_ACTIVATE_PWM_CHAN_0
189189
# if defined(SN32F2XX_ACTIVATE_PWM_CHAN_1)
190-
[1] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
190+
[1] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
191191
# endif // SN32F2XX_ACTIVATE_PWM_CHAN_1
192192
# if defined(SN32F2XX_ACTIVATE_PWM_CHAN_2)
193-
[2] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
193+
[2] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
194194
# endif // SN32F2XX_ACTIVATE_PWM_CHAN_2
195195
# if defined(SN32F2XX_ACTIVATE_PWM_CHAN_3)
196-
[3] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
196+
[3] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
197197
# endif // SN32F2XX_ACTIVATE_PWM_CHAN_3
198198
# if defined(SN32F2XX_ACTIVATE_PWM_CHAN_4)
199-
[4] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
199+
[4] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
200200
# endif // SN32F2XX_ACTIVATE_PWM_CHAN_4
201201
# if defined(SN32F2XX_ACTIVATE_PWM_CHAN_5)
202-
[5] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
202+
[5] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
203203
# endif // SN32F2XX_ACTIVATE_PWM_CHAN_5
204204
# if defined(SN32F2XX_ACTIVATE_PWM_CHAN_6)
205-
[6] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
205+
[6] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
206206
# endif // SN32F2XX_ACTIVATE_PWM_CHAN_6
207207
# if defined(SN32F2XX_ACTIVATE_PWM_CHAN_7)
208-
[7] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
208+
[7] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
209209
# endif // SN32F2XX_ACTIVATE_PWM_CHAN_7
210210
# if defined(SN32F2XX_ACTIVATE_PWM_CHAN_8)
211-
[8] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
211+
[8] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
212212
# endif // SN32F2XX_ACTIVATE_PWM_CHAN_8
213213
# if defined(SN32F2XX_ACTIVATE_PWM_CHAN_9)
214-
[9] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
214+
[9] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
215215
# endif // SN32F2XX_ACTIVATE_PWM_CHAN_9
216216
# if defined(SN32F2XX_ACTIVATE_PWM_CHAN_10)
217217
[10] = {.mode = SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL},
@@ -393,7 +393,7 @@ static void update_pwm_channels(PWMDriver *pwmp) {
393393
if (led_state[led_index].b > 0) enable_pwm_output |= true;
394394
if (led_state[led_index].g > 0) enable_pwm_output |= true;
395395
if (led_state[led_index].r > 0) enable_pwm_output |= true;
396-
// Update matching RGB channel PWM configuration
396+
// Update matching RGB channel PWM configuration
397397
# if (SN32F2XX_PWM_CONTROL == HARDWARE_PWM)
398398
switch (current_row % SN32F2XX_RGB_MATRIX_ROW_CHANNELS) {
399399
case 0:
@@ -490,7 +490,7 @@ static void update_pwm_channels(PWMDriver *pwmp) {
490490
if (led_state[led_index].b > 0) enable_pwm_output |= true;
491491
if (led_state[led_index].g > 0) enable_pwm_output |= true;
492492
if (led_state[led_index].r > 0) enable_pwm_output |= true;
493-
// Update matching RGB channel PWM configuration
493+
// Update matching RGB channel PWM configuration
494494
# if (SN32F2XX_PWM_CONTROL == HARDWARE_PWM)
495495
pwmEnableChannelI(pwmp, chan_row_order[(led_row_id + 0)], led_state[led_index].r);
496496
pwmEnableChannelI(pwmp, chan_row_order[(led_row_id + 1)], led_state[led_index].b);
@@ -529,7 +529,7 @@ static void rgb_callback(PWMDriver *pwmp) {
529529
#if ((SN32F2XX_PWM_CONTROL == SOFTWARE_PWM) && (SN32F2XX_PWM_DIRECTION == COL2ROW))
530530
for (uint8_t pwm_cnt = 0; pwm_cnt < (SN32F2XX_RGB_MATRIX_COLS * RGB_MATRIX_HUE_STEP); pwm_cnt++) {
531531
uint8_t pwm_index = (pwm_cnt % SN32F2XX_RGB_MATRIX_COLS);
532-
if (((uint16_t)(pwmp->ct->TC) < ((uint16_t)(led_duty_cycle[pwm_index] + periodticks))) && (led_duty_cycle[pwm_index] > 0)) {
532+
if (((uint16_t)SN32_CT_PWM_GET(pwmp, config.TC) < ((uint16_t)(led_duty_cycle[pwm_index] + periodticks))) && (led_duty_cycle[pwm_index] > 0)) {
533533
gpio_set_pin_output_push_pull(led_col_pins[pwm_index]);
534534
# if (SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL == SN32F2XX_PWM_OUTPUT_ACTIVE_LOW)
535535
gpio_write_pin_low(led_col_pins[pwm_index]);
@@ -545,7 +545,7 @@ static void rgb_callback(PWMDriver *pwmp) {
545545
#elif ((SN32F2XX_PWM_CONTROL == SOFTWARE_PWM) && (SN32F2XX_PWM_DIRECTION == ROW2COL))
546546
for (uint8_t pwm_cnt = 0; pwm_cnt < (SN32F2XX_RGB_MATRIX_ROWS_HW * RGB_MATRIX_HUE_STEP); pwm_cnt++) {
547547
uint8_t pwm_index = (pwm_cnt % SN32F2XX_RGB_MATRIX_ROWS_HW);
548-
if (((uint16_t)(pwmp->ct->TC) < ((uint16_t)(led_duty_cycle[pwm_index] + periodticks))) && (led_duty_cycle[pwm_index] > 0)) {
548+
if (((uint16_t)SN32_CT_PWM_GET(pwmp, config.TC) < ((uint16_t)(led_duty_cycle[pwm_index] + periodticks))) && (led_duty_cycle[pwm_index] > 0)) {
549549
# if (DIODE_DIRECTION != SN32F2XX_PWM_DIRECTION)
550550
gpio_set_pin_output_push_pull(led_row_pins[pwm_index]);
551551
# endif // DIODE_DIRECTION != SN32F2XX_PWM_DIRECTION

0 commit comments

Comments
 (0)