diff options
| author | Julian Oes <julian@oes.ch> | 2014-03-07 10:38:31 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-03-07 10:38:31 +0100 |
| commit | 873fa4cb40a8ac5b57f3212bb233027f422b92a3 (patch) | |
| tree | 530f317645a7f3293e204f37eca0172ec2d45eb0 /src/drivers/hil/hil.cpp | |
| parent | 40f2d581bffacbf214edfcadac3a57756d605196 (diff) | |
| parent | cf9fa61a39f83e6fe4611ecf9336c1fcd1faaa78 (diff) | |
| download | px4-firmware-873fa4cb40a8ac5b57f3212bb233027f422b92a3.tar.gz px4-firmware-873fa4cb40a8ac5b57f3212bb233027f422b92a3.tar.bz2 px4-firmware-873fa4cb40a8ac5b57f3212bb233027f422b92a3.zip | |
Merge remote-tracking branch 'px4/master' into bottle_drop
Conflicts:
ROMFS/px4fmu_common/init.d/rcS
Diffstat (limited to 'src/drivers/hil/hil.cpp')
| -rw-r--r-- | src/drivers/hil/hil.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/drivers/hil/hil.cpp b/src/drivers/hil/hil.cpp index b848f6c37..81c8e7b35 100644 --- a/src/drivers/hil/hil.cpp +++ b/src/drivers/hil/hil.cpp @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (C) 2012 PX4 Development Team. All rights reserved. + * Copyright (c) 2012-2014 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -193,9 +193,10 @@ HIL::~HIL() } while (_task != -1); } - /* clean up the alternate device node */ - if (_primary_pwm_device) - unregister_driver(PWM_OUTPUT_DEVICE_PATH); + // XXX already claimed with CDEV + // /* clean up the alternate device node */ + // if (_primary_pwm_device) + // unregister_driver(PWM_OUTPUT_DEVICE_PATH); g_hil = nullptr; } |