shinys000114/klipper
1
0
Fork 0
mirror of git://soft.sys114.com/klipper synced 2026-02-04 14:50:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ODROID-C5: analog: fix for ODROID-C5"

Browse Source 
This reverts commit 4a66eefe5d.
This commit is contained in:
YoungSoo Shin
2025-07-02 09:58:38 +09:00
parent a18ccdeea9
commit 7c07bdc08c
2 changed files with 8 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/linux/analog.c
View File

@@ -14,54 +14,30 @@
#include "sched.h" // sched_shutdown #include "sched.h" // sched_shutdown
// ODROID-C5 // ODROID-C5
DECL_CONSTANT("ADC_MAX", 1800); DECL_CONSTANT("ADC_MAX", 1800); // Assume 12bit adc
#define ANALOG_START (1<<12) #define ANALOG_START (1<<12)
DECL_ENUMERATION_RANGE("pin", "analog0", ANALOG_START, 8); DECL_ENUMERATION_RANGE("pin", "analog0", ANALOG_START, 8);
// ODROID-C5 // ODROID-C5
#define IIO_PATH "/sys/bus/iio/devices/iio:device0/in_voltage0_raw" #define IIO_PATH "/sys/bus/iio/devices/iio:device0/in_voltage%d_input"
#define SCALE_PATH "/sys/bus/iio/devices/iio:device0/in_voltage_scale"
#define OFFSET_PATH "/sys/bus/iio/devices/iio:device0/in_voltage_offset"
struct gpio_adc struct gpio_adc
gpio_adc_setup(uint32_t pin) gpio_adc_setup(uint32_t pin)
{ {
struct gpio_adc g; char fname[256];
int fd; snprintf(fname, sizeof(fname), IIO_PATH, pin-ANALOG_START);
char buf[64];
int ret;
fd = open(SCALE_PATH, O_RDONLY); int fd = open(fname, O_RDONLY|O_CLOEXEC);
ret = read(fd, buf, sizeof(buf)-1);
if (ret <= 0) {
goto fail;
}
buf[ret] = '\0';
g.scale = atof(buf) * 1000;
close(fd);
fd = open(OFFSET_PATH, O_RDONLY);
ret = read(fd, buf, sizeof(buf)-1);
if (ret <= 0) {
goto fail;
}
buf[ret] = '\0';
g.offset = atoi(buf);
close(fd);
fd = open(IIO_PATH, O_RDONLY|O_CLOEXEC);
if (fd < 0) { if (fd < 0) {
report_errno("analog open", fd); report_errno("analog open", fd);
goto fail; goto fail;
} }
ret = set_non_blocking(fd); int ret = set_non_blocking(fd);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
return (struct gpio_adc){ .fd = fd };
g.fd = fd;
return g;
fail: fail:
if (fd >= 0) if (fd >= 0)
close(fd); close(fd);
@@ -78,7 +54,6 @@ uint16_t
gpio_adc_read(struct gpio_adc g) gpio_adc_read(struct gpio_adc g)
{ {
char buf[64]; char buf[64];
int voltage;
int ret = pread(g.fd, buf, sizeof(buf)-1, 0); int ret = pread(g.fd, buf, sizeof(buf)-1, 0);
if (ret <= 0) { if (ret <= 0) {
report_errno("analog read", ret); report_errno("analog read", ret);
@@ -86,14 +61,7 @@ gpio_adc_read(struct gpio_adc g)
return 0; return 0;
} }
buf[ret] = '\0'; buf[ret] = '\0';
return atoi(buf);
voltage = atoi(buf) + g.offset;
voltage = voltage > 0 ? voltage : 0;
voltage = voltage * g.scale;
voltage = voltage < 1800000 ? voltage : 1800000;
voltage /= 1000;
return voltage;
} }
void void

2
src/linux/gpio.h
View File

@@ -20,8 +20,6 @@ void gpio_in_reset(struct gpio_in g, int8_t pull_up);
uint8_t gpio_in_read(struct gpio_in g); uint8_t gpio_in_read(struct gpio_in g);
struct gpio_adc { struct gpio_adc {
int scale;
int offset;
int fd; int fd;
}; };
struct gpio_adc gpio_adc_setup(uint32_t pin); struct gpio_adc gpio_adc_setup(uint32_t pin);