Merge branch 'maccel-dev'

ankostis · Mar 1, 2024 · 38e5400 · 38e5400
2 parents 8d92ac2 + ff45472
commit 38e5400
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 48 deletions.
diff --git a/maccel/maccel.c b/maccel/maccel.c
@@ -1,19 +1,6 @@
-/* Copyright 2024 burkfers (@burkfers)
- * Copyright 2024 Wimads (@wimads)
- *
- * 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 2 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/>.
- */
+// Copyright 2024 burkfers (@burkfers)
+// Copyright 2024 Wimads (@wimads)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "quantum.h" // IWYU pragma: keep
 #include "maccel.h"
@@ -136,7 +123,7 @@ report_mouse_t pointing_device_task_maccel(report_mouse_t mouse_report) {
         maccel_timer              = timer_read32();
         // get device cpi setting, only call when mouse hasn't moved since more than 200ms
         static uint16_t device_cpi = 300;
-        if (delta_time > GET_CPI_THROTTLE_MS) {
+        if (delta_time > MACCEL_CPI_THROTTLE_MS) {
             device_cpi = pointing_device_get_cpi();
         }
         // calculate dpi correction factor (for normalizing velocity range across different user dpi settings)

diff --git a/maccel/maccel.h b/maccel/maccel.h
@@ -1,19 +1,7 @@
-/* Copyright 2024 burkfers (@burkfers)
- * Copyright 2024 Wimads (@wimads)
- *
- * 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 2 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/>.
- */
+// Copyright 2024 burkfers (@burkfers)
+// Copyright 2024 Wimads (@wimads)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
 #include "action.h"

diff --git a/maccel/maccel_via.c b/maccel/maccel_via.c
@@ -1,18 +1,5 @@
-/* Copyright 2024 burkfers (@burkfers)
- *
- * 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 2 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/>.
- */
+// Copyright 2024 burkfers (@burkfers)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "maccel.h"
 #include "via.h"