diff --git a/drv/drv_di.c b/drv/drv_di.c index 504c47a..da1c2c2 100644 --- a/drv/drv_di.c +++ b/drv/drv_di.c @@ -1,6 +1,4 @@ #include "drv_di.h" - -void di_open() -{ - -} \ No newline at end of file +#include +#include +#include diff --git a/drv/drv_di.h b/drv/drv_di.h index d5e6700..4d07625 100644 --- a/drv/drv_di.h +++ b/drv/drv_di.h @@ -1,6 +1,15 @@ #ifndef __DRV_DI_H_ #define __DRV_DI_H_ -void di_open(); +#define DRV_DI1 "/sys/class/gpio-input/DIN1/state" +#define DRV_DI2 "/sys/class/gpio-input/DIN2/state" +#define DRV_DI3 "/sys/class/gpio-input/DIN3/state" +#define DRV_DI4 "/sys/class/gpio-input/DIN4/state" +#define DRV_DI5 "/sys/class/gpio-input/DIN5/state" +#define DRV_DI6 "/sys/class/gpio-input/DIN6/state" +#define DRV_DI7 "/sys/class/gpio-input/DIN7/state" +#define DRV_DI8 "/sys/class/gpio-input/DIN8/state" + +#define DRV_KEY "sys/class/gpio-input/FWn/state" #endif \ No newline at end of file diff --git a/drv/drv_do.c b/drv/drv_do.c index dd55eb7..6e8ee92 100644 --- a/drv/drv_do.c +++ b/drv/drv_do.c @@ -1,164 +1,16 @@ -#include "drv_do.h" -#include -#include -#include -#include +#include"drv_do.h" #include -#include -#include -#include +#include +#include - - -// 设置GPIO引脚为输出模式 -int gpio_export(int gpio_num) { - int fd; - char buf[64]; - - // 导出GPIO，写入对应的GPIO编号 - fd = open(GPIO_PATH "/export", O_WRONLY); - if (fd == -1) { - perror("Failed to open export file"); - return -1; - } - - snprintf(buf, sizeof(buf), "%d", gpio_num); - if (write(fd, buf, strlen(buf)) == -1) { - perror("Failed to export GPIO"); - close(fd); - return -1; - } - - close(fd); - return 0; -} - -// 设置GPIO引脚方向 -int gpio_set_direction(int gpio_num, const char *direction) { - int fd; - char buf[64]; - - // 设置GPIO方向 - snprintf(buf, sizeof(buf), GPIO_PATH "/gpio%d/direction", gpio_num); - fd = open(buf, O_WRONLY); - if (fd == -1) { - perror("Failed to open GPIO direction file"); - return -1; - } - - if (write(fd, direction, strlen(direction)) == -1) { - perror("Failed to set GPIO direction"); - close(fd); - return -1; - } - - close(fd); - return 0; -} - -// 读取GPIO引脚值 -int gpio_read_value(int gpio_num) { - int fd; - char buf[64]; - char value; - - // 打开GPIO值文件 - snprintf(buf, sizeof(buf), GPIO_PATH "/gpio%d/value", gpio_num); - fd = open(buf, O_RDONLY); - if (fd == -1) { - perror("Failed to open GPIO value file"); - return -1; - } - - // 读取GPIO值 - if (read(fd, &value, 1) == -1) { - perror("Failed to read GPIO value"); - close(fd); - return -1; - } - - close(fd); - return (value == '1') ? 1 : 0; -} - -// 设置GPIO引脚值 -int gpio_write_value(int gpio_num, int value) { - int fd; - char buf[64]; - - // 打开GPIO值文件 - snprintf(buf, sizeof(buf), GPIO_PATH "/gpio%d/value", gpio_num); - fd = open(buf, O_WRONLY); - if (fd == -1) { - perror("Failed to open GPIO value file"); - return -1; - } - - // 写入GPIO值 - if (write(fd, (value ? "1" : "0"), 1) == -1) { - perror("Failed to write GPIO value"); - close(fd); - return -1; - } - - close(fd); - return 0; -} - -// 取消导出GPIO -int gpio_unexport(int gpio_num) { - int fd; - char buf[64]; - - // 取消导出GPIO - fd = open(GPIO_PATH "/unexport", O_WRONLY); - if (fd == -1) { - perror("Failed to open unexport file"); - return -1; - } - - snprintf(buf, sizeof(buf), "%d", gpio_num); - if (write(fd, buf, strlen(buf)) == -1) { - perror("Failed to unexport GPIO"); - close(fd); - return -1; - } - - close(fd); - return 0; -} - - -void do_open() +void drv_do_write(char *dev, char *value) { - int gpio_num = 24; // 需要操作的GPIO引脚编号 - - // 导出GPIO - if (gpio_export(gpio_num) == -1) { - return -1; + int devFd = open(dev, O_RDWR); + if(devFd == -1) { + printf("open device failed[%s]\n", dev); } - - // 设置GPIO为输出模式 - if (gpio_set_direction(gpio_num, "out") == -1) { - gpio_unexport(gpio_num); - return -1; - } - - // 设置GPIO值为1 (高电平) - if (gpio_write_value(gpio_num, 1) == -1) { - gpio_unexport(gpio_num); - return -1; - } - - // 读取GPIO值 - int value = gpio_read_value(gpio_num); - if (value != -1) { - printf("GPIO %d value: %d\n", gpio_num, value); - } - - // 设置GPIO值为0 (低电平) - if (gpio_write_value(gpio_num, 0) == -1) { - gpio_unexport(gpio_num); - return -1; + else { + write(devFd, value, sizeof(value)); } + close(devFd); } \ No newline at end of file diff --git a/drv/drv_do.h b/drv/drv_do.h index 63c5874..f95206e 100644 --- a/drv/drv_do.h +++ b/drv/drv_do.h @@ -1,8 +1,20 @@ #ifndef __DRV_DO_H_ #define __DRV_DO_H_ -#define GPIO_PATH "/sys/class/gpio" +#define DRV_DO1 "/sys/class/leds/do1/brightness" +#define DRV_DO2 "/sys/class/leds/do2/brightness" +#define DRV_DO3 "/sys/class/leds/do3/brightness" +#define DRV_DO4 "/sys/class/leds/do4/brightness" +#define DRV_DO5 "/sys/class/leds/do5/brightness" +#define DRV_DO6 "/sys/class/leds/do6/brightness" +#define DRV_LED1 "/sys/class/leds/can0/brightness" +#define DRV_LED2 "/sys/class/leds/can1/brightness" +#define DRV_LED3 "/sys/class/leds/led1/brightness" +#define DRV_LED4 "/sys/class/leds/led2/brightness" -void do_open(); +#define DO_H "1" +#define DO_L "0" + +void drv_do_write(char *dev, char *value); #endif \ No newline at end of file diff --git a/kit/kit_logger.c b/kit/kit_logger.c index b320b41..8b378e0 100644 --- a/kit/kit_logger.c +++ b/kit/kit_logger.c @@ -284,7 +284,7 @@ void _log_fatal(const char *file, const char *func, const int line, const char * vsprintf(log_content, format, args1); sprintf(log_str, "%s %s [%d][%d] [%s %s:%d] [FATAL] %s\n", __DATE__, __TIME__, pid, tid, file, func, line, log_content); - + printf("%s", log_str); pthread_mutex_lock(&mutex); fprintf(log_config->file_cur, "%s", log_str); fflush(log_config->file_cur); @@ -318,7 +318,7 @@ void _log_error(const char *file, const char *func, const int line, const char * vsprintf(log_content, format, args1); sprintf(log_str, "%s %s [%d][%d] [%s %s:%d] [ERROR] %s\n", __DATE__, __TIME__, pid, tid, file, func, line, log_content); - + printf("%s", log_str); pthread_mutex_lock(&mutex); fprintf(log_config->file_cur, "%s", log_str); @@ -354,7 +354,7 @@ void _log_warn(const char *file, const char *func, const int line, const char *f vsprintf(log_content, format, args1); sprintf(log_str, "%s %s [%d][%d] [%s %s:%d] [WARN] %s\n", __DATE__, __TIME__, pid, tid, file, func, line, log_content); - + printf("%s", log_str); pthread_mutex_lock(&mutex); fprintf(log_config->file_cur, "%s", log_str); diff --git a/test/test.c b/test/test.c index 782c57f..9e12c33 100644 --- a/test/test.c +++ b/test/test.c @@ -5,13 +5,12 @@ #include "drv_di.h" #include "drv_do.h" - void runTest() { printf("runTest...\n"); + testDO(); + testDI(); testCreatThreadTask(); - // testDI(); - // testDO(); } void testCreatThreadTask() @@ -26,20 +25,29 @@ void testCreatThreadTask() void *testLoggerThread(void *arg) { - printf("testLoggerThread\n"); - logger_level_printf(LOGGER_DEBUG_LEVEL, "this an debug"); logger_level_printf(LOGGER_INFO_LEVEL, "this an info"); logger_level_printf(LOGGER_WARN_LEVEL, "this an warn"); logger_level_printf(LOGGER_ERROR_LEVEL, "this an error"); + logger_level_printf(LOGGER_FATAL_LEVEL, "this an fatal"); } void testDI() { - di_open(); + } void testDO() { - do_open(); + printf("test do\n"); + drv_do_write(DRV_LED1, DO_L); + drv_do_write(DRV_LED2, DO_L); + drv_do_write(DRV_LED3, DO_L); + drv_do_write(DRV_LED4, DO_L); + drv_do_write(DRV_DO1, DO_L); + drv_do_write(DRV_DO2, DO_L); + drv_do_write(DRV_DO3, DO_L); + drv_do_write(DRV_DO4, DO_L); + drv_do_write(DRV_DO5, DO_L); + drv_do_write(DRV_DO6, DO_L); } \ No newline at end of file