gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-22 03:19:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

BugFixes: Typing, switch to RP2040 & sprintf

Browse Source 
- The angle of -30 was not displaying correctly with unsigned type
- Explicitly cast a result to a double for consistent typing
- The code without snprintf didn't work. Revert to snprintf, but also
  switch to RP2040 which has room for it.
This commit is contained in:
Mark Stosberg 2024-07-17 09:49:45 -04:00
parent b2ab70d23a
commit 8d6b3409cc
No known key found for this signature in database
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
keyboards/aki27/cocot46plus/cocot46plus.c
View File

@ -52,10 +52,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
cocot_config_t cocot_config;
uint16_t cpi_array[] = COCOT_CPI_OPTIONS;
uint16_t scrl_div_array[] = COCOT_SCROLL_DIVIDERS;
uint16_t angle_array[] = COCOT_ROTATION_ANGLE;
int8_t angle_array[] = COCOT_ROTATION_ANGLE;
#define CPI_OPTION_SIZE (sizeof(cpi_array) / sizeof(uint16_t))
#define SCRL_DIV_SIZE (sizeof(scrl_div_array) / sizeof(uint16_t))
#define ANGLE_SIZE (sizeof(angle_array) / sizeof(uint16_t))
#define ANGLE_SIZE (sizeof(angle_array) / sizeof(int8_t))
// Trackball State
@ -75,7 +75,7 @@ void pointing_device_init_kb(void) {
report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
double rad = angle_array[cocot_config.rotation_angle] * (M_PI / 180) * -1;
double rad = (double)angle_array[cocot_config.rotation_angle] * (M_PI / 180) * -1;
int8_t x_rev = + mouse_report.x * cos(rad) - mouse_report.y * sin(rad);
int8_t y_rev = + mouse_report.x * sin(rad) + mouse_report.y * cos(rad);
@ -261,16 +261,19 @@ void oled_write_layer_state(void) {
oled_write_P(PSTR("C"), false);
}
int cpi = cpi_array[cocot_config.cpi_idx];
int scroll_div = scrl_div_array[cocot_config.scrl_div];
int angle = angle_array[cocot_config.rotation_angle];
char cpi[5];
char scroll_div[3];
char angle[4];
snprintf(cpi, 5, "%4d", cpi_array[cocot_config.cpi_idx]);
snprintf(scroll_div, 3, "%2d", scrl_div_array[cocot_config.scrl_div]);
snprintf(angle, 4, "%3d", angle_array[cocot_config.rotation_angle]);
oled_write_P(PSTR("/"), false);
oled_write(get_u16_str(cpi,' '), false);
oled_write(cpi, false);
oled_write_P(PSTR("/"), false);
oled_write(get_u8_str(scroll_div,' '), false);
oled_write(scroll_div, false);
oled_write_P(PSTR("/"), false);
oled_write(get_u16_str(angle,' '), false);
oled_write(angle, false);
}
#endif

2
keyboards/aki27/cocot46plus/readme.md
View File

@ -6,7 +6,7 @@
cocot46plus is a column-staggered keyboard with 46 keys, a 34mm-trackball and a rotary encoder.
- Keyboard Maintainer: [markstos](https://github.com/markstos)
- Hardware Supported: cocot46plus PCB, ProMicro
- Hardware Supported: cocot46plus PCB, SparkFun Pro Micro - RP2040
- Hardware Availability: [Yushakobo.jp](https://shop.yushakobo.jp/en/products/6955)
Detailed information is available from the links below:

4
keyboards/aki27/cocot46plus/rules.mk
View File

@ -1,5 +1,7 @@
SRC += matrix.c
CUSTOM_MATRIX = lite
POINTING_DEVICE_DRIVER = adns5050
# NO room in firmware
SPACE_CADET_ENABLE = no
# A regular Pro Micro may work if this line is removed
# but some features may need to be disabled for the firmware to fit in the storage.
CONVERT_TO=promicro_rp2040