Skip to content
Snippets Groups Projects
Commit d32e29f8 authored by fortissBot's avatar fortissBot
Browse files

fixed lrf init device selection bug

refs 7890
parent ded6ee7b
No related branches found
No related tags found
No related merge requests found
...@@ -12,7 +12,7 @@ void gpio_init(GPIO_PIN_T pin) { ...@@ -12,7 +12,7 @@ void gpio_init(GPIO_PIN_T pin) {
// TODO initialize... // TODO initialize...
} }
void gp_term() { void gpio_term(GPIO_PIN_T pin) {
// important, since all pins are accessing the same method // important, since all pins are accessing the same method
if(gpio_terminated) return; if(gpio_terminated) return;
......
...@@ -3,11 +3,14 @@ ...@@ -3,11 +3,14 @@
// init, terminate // init, terminate
void lrf_init() { void lrf_init() {
char port[] = "/dev/????????"; //char port[] = "/dev/????????";
char port[100];
FILE* fp = popen("dmesg | grep -A 3 \"Arduino Uno\" | grep -o \"ttyACM.\" | tail -n 1","r");
fgets(port+5, sizeof(port)-6, fp); //FILE* fp = popen("dmesg | grep -A 3 \"Arduino Uno\" | grep -o \"ttyACM.\" | tail -n 1","r");
printf("Port: %s\n", port); FILE* fp = popen("ls -d /dev/serial/by-id/* | grep \"Arduino\" | tr -d \"\n"\"", "r");
//fgets(port+5, sizeof(port)-6, fp);
fgets(port, sizeof(port), fp);
printf("lrf port=%s\n", port);
pclose(fp); pclose(fp);
uart_setup(port); uart_setup(port);
......
...@@ -41,7 +41,7 @@ void* pwm_worker(void* pt_args) { ...@@ -41,7 +41,7 @@ void* pwm_worker(void* pt_args) {
} }
close(fd); close(fd);
return NULL; return NULL;
} }
...@@ -57,13 +57,13 @@ void pwm_init(PWM_CHANNEL_T channel) { ...@@ -57,13 +57,13 @@ void pwm_init(PWM_CHANNEL_T channel) {
pwm_initialized = true; pwm_initialized = true;
} }
pwm_channel_enabled[channel] = true; pwm_channel_enabled[channel] = true;
} }
void pwm_term(PWM_CHANNEL_T channel) { void pwm_term(PWM_CHANNEL_T channel) {
// important, since all pwms are accessing the same method // important, since all pwms are accessing the same method
if(!pwm_terminated) return; if(pwm_terminated) return;
free(pwm_channel_values); free(pwm_channel_values);
free(pwm_channel_enabled); free(pwm_channel_enabled);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment