summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Palecki <[email protected]>2020-08-03 19:12:04 -0700
committerJacob Palecki <[email protected]>2020-08-03 19:12:04 -0700
commit1777a3decf6acdb836580f2c7cfe055aaee94b3e (patch)
tree3ad0e9ab09e2370e592d736043666cc87101be33
parentMerge from master (diff)
downloadrawaccel-1777a3decf6acdb836580f2c7cfe055aaee94b3e.tar.xz
rawaccel-1777a3decf6acdb836580f2c7cfe055aaee94b3e.zip
Read from driver to get graph values
-rw-r--r--wrapper/wrapper.cpp1
-rw-r--r--wrapper/wrapper_io.cpp5
2 files changed, 5 insertions, 1 deletions
diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp
index 38ac481..e29f08d 100644
--- a/wrapper/wrapper.cpp
+++ b/wrapper/wrapper.cpp
@@ -59,5 +59,6 @@ void ManagedAccel::WriteToDriver()
void ManagedAccel::ReadFromDriver()
{
+ delete modifier_instance;
modifier_instance = driverWriter->readFromDriver();
}
diff --git a/wrapper/wrapper_io.cpp b/wrapper/wrapper_io.cpp
index be3bd58..4284d60 100644
--- a/wrapper/wrapper_io.cpp
+++ b/wrapper/wrapper_io.cpp
@@ -11,5 +11,8 @@ void wrapper_io::writeToDriver(rawaccel::mouse_modifier* modifier)
rawaccel::mouse_modifier* wrapper_io::readFromDriver()
{
rawaccel::mouse_modifier modifier = rawaccel::read();
- return &(modifier);
+ rawaccel::mouse_modifier* mod_pnt = (rawaccel::mouse_modifier*)malloc(sizeof(rawaccel::mouse_modifier));
+ memcpy(mod_pnt, &modifier, sizeof(rawaccel::mouse_modifier));
+
+ return mod_pnt;
}