Archives/opentrackpadcontroller
2
0
Fork 0
mirror of https://github.com/NepEgor/OpenTrackpadController.git synced 2024-11-15 18:12:46 +00:00
Code Issues Projects Releases Wiki Activity

removed gyro int; fixed with ps/2 update

Browse Source
This commit is contained in:
NepEgor 2022-05-14 22:19:56 +06:00
parent b4dcb63d84
commit c8cd5cd8df
4 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/input_mapper.h
View File

@ -9,7 +9,10 @@ namespace InputMapper
void mapTrackpad(uint8_t id, uint8_t fid, int32_t x, int32_t y, int32_t dx, int32_t dy, uint32_t time);
void update(uint32_t time, bool &gyro_ready);
bool gyroEnabled();
void gyroUpdate();
void update(uint32_t time);
void mapTriggers(uint32_t value[2]);

15
src/gyro.cpp
View File

@ -53,9 +53,9 @@ void Gyro::init()
y_filter.init(filter_size);
z_filter.init(filter_size);
mpu.setIntDataReadyEnabled(1);
//mpu.setIntDataReadyEnabled(1);
mpu.setDLPFMode(MPU6050_DLPF_BW_5);
//mpu.setDLPFMode(MPU6050_DLPF_BW_5);
_Enabled = [] { return false; };
}
@ -67,12 +67,9 @@ void Gyro::setEnabledCallback(bool (*Enabled)())
void Gyro::update()
{
if (Enabled())
{
mpu.getRotation(&x, &y, &z);
mpu.getRotation(&x, &y, &z);
x = x_filter.filter(x);
y = y_filter.filter(y);
z = z_filter.filter(z);
}
x = x_filter.filter(x);
y = y_filter.filter(y);
z = z_filter.filter(z);
}

22
src/input_mapper.cpp
View File

@ -175,8 +175,8 @@ namespace InputMapper
}
gyro.init();
//gyro.setEnabledCallback([]{ return tjoystick_right.getTouching() > TouchControl::CT_NONE; });
gyro.setEnabledCallback([]{ return xinput_counter[USB_Device::BUMPER_RIGHT] > 0; });
gyro.setEnabledCallback([]{ return tjoystick_right.getTouching() > TouchControl::CT_NONE; });
//gyro.setEnabledCallback([]{ return xinput_counter[USB_Device::BUMPER_RIGHT] > 0; });
device.begin();
}
@ -254,7 +254,17 @@ namespace InputMapper
}
}
void update(uint32_t time, bool &gyro_ready)
bool gyroEnabled()
{
return gyro.Enabled();
}
void gyroUpdate()
{
gyro.update();
}
void update(uint32_t time)
{
for (uint8_t id = 0; id < 2; ++id)
{
@ -276,12 +286,6 @@ namespace InputMapper
}
}
if (gyro_ready)
{
gyro.update();
gyro_ready = false;
}
}
void mapTriggers(uint32_t value[2])

22
src/main.cpp
View File

@ -31,11 +31,6 @@ TrackPad trackpad[2]; // 0 - left, 1 - right
int32_t trackpad_maxX, trackpad_maxY;
bool mpuInterrupt = false;
void dmpDataReady() {
mpuInterrupt = true;
}
void setup()
{
// Turn on LED
@ -63,8 +58,6 @@ void setup()
trackpad_maxX = trackpad[0].getMaxX();
trackpad_maxY = trackpad[0].getMaxY();
attachInterrupt(gyro_int, dmpDataReady, RISING);
InputMapper::begin();
// Turn off LED
@ -123,7 +116,7 @@ void loop()
}
}
}
uint32_t triggers[] = {analogRead(pin_trigger[0]), analogRead(pin_trigger[1])};
InputMapper::mapTriggers(triggers);
@ -139,7 +132,18 @@ void loop()
}
}
InputMapper::update(micros(), mpuInterrupt);
static uint32_t gyro_start = micros();
if (InputMapper::gyroEnabled())
{
uint32_t gyro_now = micros();
if (gyro_now - gyro_start > 1000)
{
gyro_start = gyro_now;
InputMapper::gyroUpdate();
}
}
InputMapper::update(micros());
InputMapper::sendReport();
}