From 529219ee9976d88546fedd7fd6181a65c2007914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Thu, 10 Aug 2017 23:45:36 +0200 Subject: [PATCH] Init microseconds PIT counter. Can see ticks, but cannot convert them down to microseconds and milliseconds yet. --- right/src/init_peripherals.c | 2 ++ right/src/usb_protocol_handler.c | 22 ++++++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/right/src/init_peripherals.c b/right/src/init_peripherals.c index 7767ce8..fc2cee7 100644 --- a/right/src/init_peripherals.c +++ b/right/src/init_peripherals.c @@ -12,6 +12,7 @@ #include "peripherals/adc.h" #include "init_peripherals.h" #include "eeprom.h" +#include "microseconds/microseconds_pit.c" void InitI2c() { port_pin_config_t pinConfig = { @@ -63,4 +64,5 @@ void InitPeripherals(void) InitI2cWatchdog(); #endif EEPROM_Init(); + microseconds_init(); } diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c index 2d831f7..45d3a94 100644 --- a/right/src/usb_protocol_handler.c +++ b/right/src/usb_protocol_handler.c @@ -13,6 +13,7 @@ #include "peripherals/adc.h" #include "eeprom.h" #include "keymaps.h" +#include "microseconds/microseconds_pit.c" // Functions for setting error statuses @@ -200,10 +201,23 @@ void getKeyboardState(void) void getDebugInfo(void) { - GenericHidOutBuffer[1] = (I2C_Watchdog >> 0) & 0xff;; - GenericHidOutBuffer[2] = (I2C_Watchdog >> 8) & 0xff; - GenericHidOutBuffer[3] = (I2C_Watchdog >> 16) & 0xff; - GenericHidOutBuffer[4] = (I2C_Watchdog >> 24) & 0xff; + GenericHidOutBuffer[1] = I2C_Watchdog >> 0; + GenericHidOutBuffer[2] = I2C_Watchdog >> 8; + GenericHidOutBuffer[3] = I2C_Watchdog >> 16; + GenericHidOutBuffer[4] = I2C_Watchdog >> 24; + + uint64_t ticks = microseconds_get_ticks(); + uint32_t microseconds = microseconds_convert_to_microseconds(ticks); + uint32_t milliseconds = microseconds/1000; + + GenericHidOutBuffer[1] = (ticks >> 0) & 0xff;; + GenericHidOutBuffer[2] = (ticks >> 8) & 0xff; + GenericHidOutBuffer[3] = (ticks >> 16) & 0xff; + GenericHidOutBuffer[4] = (ticks >> 24) & 0xff; + GenericHidOutBuffer[5] = (ticks >> 32) & 0xff;; + GenericHidOutBuffer[6] = (ticks >> 40) & 0xff; + GenericHidOutBuffer[7] = (ticks >> 48) & 0xff; + GenericHidOutBuffer[8] = (ticks >> 56) & 0xff; } // The main protocol handler function