Skip to content

Add --period-fix Option #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
helpvisa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add --period-fix Option #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions bin/ffbwrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

OPTIONS=$(getopt --long 'logger:,update-fix,direction-fix,duration-fix,features-hack,force-inversion,ignore-set-gain,ignore-autocenter,offset-fix,throttling,throttling-time:' -n "$0" -- "" "$@")
OPTIONS=$(getopt --long 'logger:,update-fix,direction-fix,duration-fix,features-hack,force-inversion,ignore-set-gain,ignore-autocenter,offset-fix,period-fix,throttling,throttling-time:' -n "$0" -- "" "$@")

if [ $? -ne 0 ]; then
exit 1
Expand Down Expand Up @@ -90,6 +90,11 @@ while true; do
shift
continue
;;
'--period-fix')
FFBTOOLS_PERIOD_FIX=1
shift
continue
;;
'--throttling')
FFBTOOLS_THROTTLING=1
shift
Expand Down Expand Up @@ -124,12 +129,12 @@ COMMAND="$1"
shift

if [ -z "${FFBTOOLS_DEV_MAJOR}" -o -z "${FFBTOOLS_DEV_MINOR}" -o -z "${COMMAND}" ]; then
echo "Usage: $0 [--logger=logfile] [--update-fix] [--direction-fix] [--duration-fix] [--features-hack] [--force-inversion] [--ignore-set-gain] [--ignore-autocenter] [--offset-fix] [--throttling] [--throttling-time=N] <device> -- <command>"
echo "Usage: $0 [--logger=logfile] [--update-fix] [--direction-fix] [--duration-fix] [--features-hack] [--force-inversion] [--ignore-set-gain] [--ignore-autocenter] [--offset-fix] [--period-fix] [--throttling] [--throttling-time=N] <device> -- <command>"
exit 1
fi

FFBTOOLS_DEVICE_NAME="$(eval $(udevadm info -q property -x "${DEVICE_FILE}") && echo "${ID_VENDOR} ${ID_MODEL//_/ }")"

export LD_PRELOAD FFBTOOLS_DEVICE_NAME FFBTOOLS_DEV_MAJOR FFBTOOLS_DEV_MINOR FFBTOOLS_LOGGER FFBTOOLS_LOG_FILE FFBTOOLS_UPDATE_FIX FFBTOOLS_DIRECTION_FIX FFBTOOLS_DURATION_FIX FFBTOOLS_FEATURES_HACK FFBTOOLS_FORCE_INVERSION FFBTOOLS_IGNORE_SET_GAIN FFBTOOLS_IGNORE_AUTOCENTER FFBTOOLS_OFFSET_FIX FFBTOOLS_THROTTLING
export LD_PRELOAD FFBTOOLS_DEVICE_NAME FFBTOOLS_DEV_MAJOR FFBTOOLS_DEV_MINOR FFBTOOLS_LOGGER FFBTOOLS_LOG_FILE FFBTOOLS_UPDATE_FIX FFBTOOLS_DIRECTION_FIX FFBTOOLS_DURATION_FIX FFBTOOLS_FEATURES_HACK FFBTOOLS_FORCE_INVERSION FFBTOOLS_IGNORE_SET_GAIN FFBTOOLS_IGNORE_AUTOCENTER FFBTOOLS_OFFSET_FIX FFBTOOLS_PERIOD_FIX FFBTOOLS_THROTTLING

"${COMMAND}" "$@"
66 changes: 47 additions & 19 deletions src/ffbwrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ static int enable_force_inversion = 0;
static int ignore_set_gain = 0;
static int ignore_autocenter = 0;
static int enable_offset_fix = 0;
static int enable_period_fix = 0;
static int enable_throttling = 0;
static FILE *log_file = NULL;
static char report_string[1024];
Expand Down Expand Up @@ -216,6 +217,11 @@ static void ffbt_init()
enable_offset_fix = 1;
}

const char *str_period_fix = getenv("FFBTOOLS_PERIOD_FIX");
if (str_period_fix != NULL && strcmp(str_period_fix, "1") == 0) {
enable_period_fix = 1;
}

const char *str_throttling = getenv("FFBTOOLS_THROTTLING");
if (str_throttling != NULL && strcmp(str_throttling, "0") != 0) {
int result;
Expand Down Expand Up @@ -245,11 +251,11 @@ static void ffbt_init()
report("# DEVICE_NAME=%s, UPDATE_FIX=%d, "
"DIRECTION_FIX=%d, DURATION_FIX=%d, FEATURES_HACK=%d, "
"FORCE_INVERSION=%d, IGNORE_SET_GAIN=%d, IGNORE_AUTOCENTER=%d, "
"OFFSET_FIX=%d, THROTTLING=%s",
"OFFSET_FIX=%d, PERIOD_FIX=%d, THROTTLING=%s",
getenv("FFBTOOLS_DEVICE_NAME"), enable_update_fix,
enable_direction_fix, enable_duration_fix, enable_features_hack,
enable_force_inversion, ignore_set_gain, ignore_autocenter,
enable_offset_fix,
enable_offset_fix, enable_period_fix,
str_throttling == NULL ? "0" : str_throttling);
}
}
Expand Down Expand Up @@ -426,23 +432,45 @@ int ioctl(int fd, unsigned long request, char *argp)
effect_params);
}

if (effect->type == FF_PERIODIC && enable_offset_fix) {
effect->u.periodic.offset = (int)effect->u.periodic.offset * 0x7fff / 10000;
effect->u.periodic.phase = (int)effect->u.periodic.phase * 0xffff / 35999;
snprintf(effect_params, sizeof(effect_params),
"waveform:%s, period:%u, magnitude:%d, offset:%d, phase:%u, attack_length:%u, attack_level:%u, fade_length:%u, fade_level:%u",
waveform, effect->u.periodic.period,
effect->u.periodic.magnitude,
effect->u.periodic.offset,
effect->u.periodic.phase,
effect->u.periodic.envelope.attack_length,
effect->u.periodic.envelope.attack_level,
effect->u.periodic.envelope.fade_length,
effect->u.periodic.envelope.fade_level);
report("%s> UPLOAD id:%d dir:%d length:%d delay:%d type:%s %s",
modified ? "#" : "", effect->id,
effect->direction, effect->replay.length,
effect->replay.delay, type, effect_params);
if (effect->type == FF_PERIODIC) {
if (enable_offset_fix) {
effect->u.periodic.offset = (int)effect->u.periodic.offset * 0x7fff / 10000;
effect->u.periodic.phase = (int)effect->u.periodic.phase * 0xffff / 35999;
snprintf(effect_params, sizeof(effect_params),
"waveform:%s, period:%u, magnitude:%d, offset:%d, phase:%u, attack_length:%u, attack_level:%u, fade_length:%u, fade_level:%u",
waveform, effect->u.periodic.period,
effect->u.periodic.magnitude,
effect->u.periodic.offset,
effect->u.periodic.phase,
effect->u.periodic.envelope.attack_length,
effect->u.periodic.envelope.attack_level,
effect->u.periodic.envelope.fade_length,
effect->u.periodic.envelope.fade_level);
report("%s> UPLOAD id:%d dir:%d length:%d delay:%d type:%s %s",
modified ? "#" : "", effect->id, effect->direction,
effect->replay.length, effect->replay.delay, type,
effect_params);
}
if (enable_period_fix) {
if (effect->u.periodic.period == 0) {
effect->u.periodic.period = 1;
}
snprintf(effect_params, sizeof(effect_params),
"waveform:%s, period:%u, magnitude:%d, offset:%d, phase:%u, attack_length:%u, attack_level:%u, fade_length:%u, fade_level:%u",
waveform, effect->u.periodic.period,
effect->u.periodic.magnitude,
effect->u.periodic.offset,
effect->u.periodic.phase,
effect->u.periodic.envelope.attack_length,
effect->u.periodic.envelope.attack_level,
effect->u.periodic.envelope.fade_length,
effect->u.periodic.envelope.fade_level);
report("%s> UPLOAD id:%d dir:%d length:%d delay:%d type:%s %s "
"# periodic fix",
modified ? "#" : "", effect->id, effect->direction,
effect->replay.length, effect->replay.delay, type,
effect_params);
}
}

if (enable_throttling && effect->id != -1) {
Expand Down