Browse Source

Refactor some platform dependent logic (#13675)

pull/13699/head 0.13.25
Joel Challis 2 years ago
committed by GitHub
parent
commit
b5bcd5b0a1
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 65 additions and 46 deletions
  1. +2
    -8
      quantum/audio/luts.h
  2. +0
    -3
      quantum/audio/voices.h
  3. +0
    -4
      quantum/keymap_common.c
  4. +1
    -10
      quantum/quantum.h
  5. +3
    -11
      quantum/rgblight.c
  6. +1
    -4
      quantum/rgblight.h
  7. +18
    -0
      tmk_core/common/arm_atsam/platform.h
  8. +20
    -0
      tmk_core/common/avr/platform.h
  9. +19
    -0
      tmk_core/common/chibios/platform.h
  10. +1
    -1
      tmk_core/common/print.h
  11. +0
    -5
      tmk_core/common/timer.h

+ 2
- 8
quantum/audio/luts.h View File

@ -16,14 +16,8 @@
#pragma once
#if defined(__AVR__)
# include <avr/io.h>
# include <avr/interrupt.h>
# include <avr/pgmspace.h>
#else
# include <ch.h>
# include <hal.h>
#endif
#include <float.h>
#include <stdint.h>
#define VIBRATO_LUT_LENGTH 20


+ 0
- 3
quantum/audio/voices.h View File

@ -18,9 +18,6 @@
#include <stdint.h>
#include <stdbool.h>
#if defined(__AVR__)
# include <avr/io.h>
#endif
#include "wait.h"
#include "luts.h"


+ 0
- 4
quantum/keymap_common.c View File

@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "report.h"
#include "keycode.h"
#include "action_layer.h"
#if defined(__AVR__)
# include <util/delay.h>
# include <stdio.h>
#endif
#include "action.h"
#include "action_macro.h"
#include "debug.h"


+ 1
- 10
quantum/quantum.h View File

@ -15,16 +15,7 @@
*/
#pragma once
#if defined(__AVR__)
# include <avr/pgmspace.h>
# include <avr/io.h>
# include <avr/interrupt.h>
#endif
#if defined(PROTOCOL_CHIBIOS)
# include <hal.h>
# include "chibios_config.h"
#endif
#include "platform.h"
#include "wait.h"
#include "matrix.h"
#include "keymap.h"


+ 3
- 11
quantum/rgblight.c View File

@ -16,17 +16,6 @@
#include <math.h>
#include <string.h>
#include <stdlib.h>
#ifdef __AVR__
# include <avr/eeprom.h>
# include <avr/interrupt.h>
#endif
#ifdef EEPROM_ENABLE
# include "eeprom.h"
#endif
#ifdef STM32_EEPROM_ENABLE
# include <hal.h>
# include "eeprom_stm32.h"
#endif
#include "wait.h"
#include "progmem.h"
#include "sync_timer.h"
@ -35,6 +24,9 @@
#include "debug.h"
#include "led_tables.h"
#include <lib/lib8tion/lib8tion.h>
#ifdef EEPROM_ENABLE
# include "eeprom.h"
#endif
#ifdef VELOCIKEY_ENABLE
# include "velocikey.h"
#endif


+ 1
- 4
quantum/rgblight.h View File

@ -170,15 +170,12 @@ enum RGBLIGHT_EFFECT_MODE {
#include <stdint.h>
#include <stdbool.h>
#include "progmem.h"
#include "eeconfig.h"
#include "ws2812.h"
#include "color.h"
#include "rgblight_list.h"
#if defined(__AVR__)
# include <avr/pgmspace.h>
#endif
#ifdef RGBLIGHT_LAYERS
typedef struct {
uint8_t index; // The first LED to light


+ 18
- 0
tmk_core/common/arm_atsam/platform.h View File

@ -0,0 +1,18 @@
/* Copyright 2021 QMK
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
// here just to please the build

+ 20
- 0
tmk_core/common/avr/platform.h View File

@ -0,0 +1,20 @@
/* Copyright 2021 QMK
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <avr/pgmspace.h>
#include <avr/io.h>
#include <avr/interrupt.h>

+ 19
- 0
tmk_core/common/chibios/platform.h View File

@ -0,0 +1,19 @@
/* Copyright 2021 QMK
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <hal.h>
#include "chibios_config.h"

+ 1
- 1
tmk_core/common/print.h View File

@ -47,7 +47,7 @@ void print_set_sendchar(sendchar_func_t func);
# define uprintln(s) printf(s "\r\n")
# define uprintf printf
# endif /* __AVR__ / PROTOCOL_CHIBIOS / PROTOCOL_ARM_ATSAM */
# endif /* __has_include_next("_print.h") */
#else /* NO_PRINT */
# undef xprintf
// Remove print defines


+ 0
- 5
tmk_core/common/timer.h View File

@ -18,11 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include <stdint.h>
#include <stdbool.h>
#if defined(__AVR__)
# include "avr/timer_avr.h"
#endif
#define TIMER_DIFF(a, b, max) ((max == UINT8_MAX) ? ((uint8_t)((a) - (b))) : ((max == UINT16_MAX) ? ((uint16_t)((a) - (b))) : ((max == UINT32_MAX) ? ((uint32_t)((a) - (b))) : ((a) >= (b) ? (a) - (b) : (max) + 1 - (b) + (a)))))
#define TIMER_DIFF_8(a, b) TIMER_DIFF(a, b, UINT8_MAX)


Loading…
Cancel
Save