diff --git a/.gitignore b/.gitignore index 64f4b1bfbc87d72fd1cc75854abf2d0d98276b1d..0d411b1d1ce8f5b83656fc7c673eb898dc4f0e26 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ WiringPi/ +MyInclude/ *.out -*.o \ No newline at end of file +*.o diff --git a/Makefile b/Makefile index 21d3c02bb1b92146a5e2b0181a6f9863e8bd10c3..60bf0862ef3c0cfe814b80de5f6979034e8edc43 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,6 @@ compile_switch : compile_motor : gcc -o motor motor.c -lwiringPi - +.PHONY : clean clean : rm *.o \ No newline at end of file diff --git a/encoder.c b/encoder.c index fa3d97d1853a5b7812db93fdab067b0d5fb61231..89ddfe35280a43bf521cd26993b01b2145175367 100644 --- a/encoder.c +++ b/encoder.c @@ -19,6 +19,11 @@ const int SS_BAR_2 = 3; //from RASPI to FPGA -> enable encoder int main(int argc, char const *argv[]) { + if (wiringPiSetup() == -1) { + printf("WiringPiSetup failed\n"); + exit(EXIT_FAILURE); + } + pinMode(ENC_PIN_1A, INPUT); pinMode(ENC_PIN_1B, INPUT); pinMode(ENC_PIN_2A, INPUT); diff --git a/motor.c b/motor.c index 9d39b0b0bbba0ddfe6b97d2ae37564904e11dd6b..3e8fcaf8bb48589e3fd563c84c1a0275a002040c 100644 --- a/motor.c +++ b/motor.c @@ -13,7 +13,8 @@ int wheelSpeed = 600; int main(int argc, char const *argv[]) { if (wiringPiSetup() == -1) { - exit(1); + printf("WiringPiSetup failed\n"); + exit(EXIT_FAILURE); } pinMode(PWM_PIN_RIGHT, PWM_OUTPUT); pinMode(PWM_PIN_LEFT, PWM_OUTPUT); diff --git a/switch.c b/switch.c index cc2b1716fab802ae93756c222540bad62c09d333..e984600526778f66e3d4fb1777b974f5b7194ec3 100644 --- a/switch.c +++ b/switch.c @@ -1,6 +1,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdbool.h> +#include <conio.h> #include <wiringPi.h> @@ -9,8 +10,10 @@ const int PIN_SWITCH_LEFT = 29; int main(int argc, char const *argv[]) { - if (wiringPiSetup() == -1) exit(1); - + if (wiringPiSetup() == -1) { + printf("WiringPiSetup failed\n"); + exit(EXIT_FAILURE); + } pinMode(PIN_SWITCH_RIGHT, INPUT); pinMode(PIN_SWITCH_LEFT, INPUT); @@ -23,6 +26,8 @@ int main(int argc, char const *argv[]) printf("Vous avez poussé sur le uswitch gauche\n"); delay(300); } + + if () } return 0;