diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-10 18:14:25 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-10 18:14:25 +0100 |
| commit | 41629e0ddb44a52ce3eee676d113cf41cfee699d (patch) | |
| tree | f2b9e3e6013b7df493dd98dc6f5c1128d3411126 /apps/drivers/hil/hil.cpp | |
| parent | ee5abb0745908c1dca78d8468b3fba34d5eab42c (diff) | |
| download | px4-firmware-41629e0ddb44a52ce3eee676d113cf41cfee699d.tar.gz px4-firmware-41629e0ddb44a52ce3eee676d113cf41cfee699d.tar.bz2 px4-firmware-41629e0ddb44a52ce3eee676d113cf41cfee699d.zip | |
Operational mixing and outputs in hil
Diffstat (limited to 'apps/drivers/hil/hil.cpp')
| -rw-r--r-- | apps/drivers/hil/hil.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/apps/drivers/hil/hil.cpp b/apps/drivers/hil/hil.cpp index dd5463d4e..a8cb31f0a 100644 --- a/apps/drivers/hil/hil.cpp +++ b/apps/drivers/hil/hil.cpp @@ -211,8 +211,9 @@ HIL::init() if (ret != OK) return ret; - /* try to claim the generic PWM output device node as well - it's OK if we fail at this */ - ret = register_driver(PWM_OUTPUT_DEVICE_PATH, &fops, 0666, (void *)this); + // XXX already claimed with CDEV + ///* try to claim the generic PWM output device node as well - it's OK if we fail at this */ + //ret = register_driver(PWM_OUTPUT_DEVICE_PATH, &fops, 0666, (void *)this); if (ret == OK) { log("default PWM output device"); _primary_pwm_device = true; @@ -821,12 +822,12 @@ hil_main(int argc, char *argv[]) if (strcmp(argv[i], "-u") == 0 || strcmp(argv[i], "--update-rate") == 0) { // if (new_mode == PORT1_FULL_PWM || new_mode == PORT1_PWM_AND_GPIO) { // XXX all modes have PWM settings - if (argc > i + 1) { - pwm_update_rate_in_hz = atoi(argv[i + 1]); - } else { - fprintf(stderr, "missing argument for pwm update rate (-u)\n"); - return 1; - } + if (argc > i + 1) { + pwm_update_rate_in_hz = atoi(argv[i + 1]); + } else { + fprintf(stderr, "missing argument for pwm update rate (-u)\n"); + return 1; + } // } else { // fprintf(stderr, "pwm update rate currently only supported for mode_pwm, mode_pwm_gpio\n"); // } |