Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_Linux: Led_Sysfs: small fixes

Browse Source 
- avoid trying to close fd when it's -1

  - Keep includes sorted

  - AP_HAL::panic() doesn't need \n terminator

  - %u requires unsigned type

  - #pragma once is the first thing on a header
This commit is contained in:
Lucas De Marchi 2017-01-19 08:56:32 -08:00
parent 701d91f20c
commit c27c414e5a
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/AP_HAL_Linux/Led_Sysfs.cpp
View File

@ -19,9 +19,9 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <inttypes.h>
#include <unistd.h> #include <unistd.h>
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
@ -37,7 +37,7 @@ Led_Sysfs::Led_Sysfs(const char *led_name)
Led_Sysfs::~Led_Sysfs() Led_Sysfs::~Led_Sysfs()
{ {
if (_brightness_fd) { if (_brightness_fd >= 0) {
close(_brightness_fd); close(_brightness_fd);
} }
} }
@ -48,7 +48,7 @@ bool Led_Sysfs::init()
char *max_br_path; char *max_br_path;
if (asprintf(&br_path, "/sys/class/leds/%s/brightness", _led_name) == -1) { if (asprintf(&br_path, "/sys/class/leds/%s/brightness", _led_name) == -1) {
AP_HAL::panic("LinuxLed_Sysfs : Couldn't allocate brightness path\n"); AP_HAL::panic("LinuxLed_Sysfs : Couldn't allocate brightness path");
} }
_brightness_fd = open(br_path, O_WRONLY | O_CLOEXEC); _brightness_fd = open(br_path, O_WRONLY | O_CLOEXEC);
@ -59,11 +59,11 @@ bool Led_Sysfs::init()
} }
if (asprintf(&max_br_path, "/sys/class/leds/%s/max_brightness", _led_name) == -1) { if (asprintf(&max_br_path, "/sys/class/leds/%s/max_brightness", _led_name) == -1) {
AP_HAL::panic("LinuxLed_Sysfs : Couldn't allocate max_brightness path\n"); AP_HAL::panic("LinuxLed_Sysfs : Couldn't allocate max_brightness path");
} }
if (Util::from(hal.util)->read_file(max_br_path, "%u", &_max_brightness) < 0) { if (Util::from(hal.util)->read_file(max_br_path, "%u", &_max_brightness) < 0) {
AP_HAL::panic("LinuxLed_Sysfs : Unable to read max_brightness in %s\n", AP_HAL::panic("LinuxLed_Sysfs : Unable to read max_brightness in %s",
max_br_path); max_br_path);
} }
@ -79,7 +79,7 @@ bool Led_Sysfs::set_brightness(uint8_t brightness)
return false; return false;
} }
int br = brightness * _max_brightness / UINT8_MAX; unsigned int br = brightness * _max_brightness / UINT8_MAX;
/* Don't log fails since this could spam the console */ /* Don't log fails since this could spam the console */
if (dprintf(_brightness_fd, "%u", br) < 0) { if (dprintf(_brightness_fd, "%u", br) < 0) {

3
libraries/AP_HAL_Linux/Led_Sysfs.h
View File

@ -14,14 +14,13 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#pragma once
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include "AP_HAL_Linux.h" #include "AP_HAL_Linux.h"
#include "Util.h" #include "Util.h"
#pragma once
namespace Linux { namespace Linux {
class Led_Sysfs { class Led_Sysfs {