From a29bfd4942fa9a88eda2c4f5e61d1dd479b47ffc Mon Sep 17 00:00:00 2001
From: grouille <guillaume.rouille@polytech-lille.net>
Date: Wed, 25 Mar 2020 18:15:30 +0100
Subject: [PATCH] MAJ Git

---
 codes/Tuno_to_rpi.c                          | 115 -------------------------------------------------------------------------------------------------------------------
 site/fichiersRPI/Build/Makefile              |  70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------
 site/fichiersRPI/Build/libretour/libretour.c |  73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 site/fichiersRPI/Build/libretour/libretour.h |  14 ++++++++++++++
 site/fichiersRPI/Build/main.c                | 114 ------------------------------------------------------------------------------------------------------------------
 site/fichiersRPI/script.sh                   |   3 +++
 site/fichiersRPI/toto.sh                     |   3 ---
 7 files changed, 148 insertions(+), 244 deletions(-)
 delete mode 100644 codes/Tuno_to_rpi.c
 create mode 100644 site/fichiersRPI/Build/libretour/libretour.c
 create mode 100644 site/fichiersRPI/Build/libretour/libretour.h
 delete mode 100755 site/fichiersRPI/Build/main.c
 delete mode 100755 site/fichiersRPI/toto.sh

diff --git a/codes/Tuno_to_rpi.c b/codes/Tuno_to_rpi.c
deleted file mode 100644
index 752fe7a..0000000
--- a/codes/Tuno_to_rpi.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include <avr/io.h>			// for the input/output register
-#include <avr/interrupt.h> 	
-#include <util/delay.h>  
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#define PRESCALER 1024
-#define TIME_SLOT 20
-#define BAUDRATE	103
-
-#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
-#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
-
-char Donnee[24];
-float temp;
-
-void init_serial(void)
-{
-	/* ACHTUNG : we suppose UBRR value < 0xff */
-	/* Not true in all case */
-	uint8_t baudrate = BAUDRATE;
-	/* Set baud rate */
-	UBRR0H = 0;
-	UBRR0L = baudrate;
-	/* Enable transmitter *///task_led_red();
-      //task_send_serial('A');
-	UCSR0B = (1<<TXEN0);
-	/* Set frame format */
-	UCSR0C = 0x06;
-    
-}
-
-void send_serial(unsigned char c)
-{
-	loop_until_bit_is_set(UCSR0A, UDRE0);
-	UDR0 = c;
-}
-
-
-void send_msg2(char Donnee[]){
- 
-    while (( UCSR0A & (1<<UDRE0))  == 0){};
-            
-            for (int i = 0; i < strlen(Donnee); i++){ 
-                while (( UCSR0A & (1<<UDRE0))  == 0){};
-                UDR0 = Donnee[i]; 
-                if (i == (strlen(Donnee) - 1)){
-                    send_serial('\n');
-                    send_serial('\r');
-                }
-            } 
-}
-
-void send_msg(char Donnee[]){
-        int i=0;
-      for(i=0; i<strlen(Donnee); i++){
-          if (i==strlen(Donnee)-1){
-              send_serial(Donnee[i]);
-              send_serial('\n');
-              send_serial('\r');
-        }
-          else{
-              send_serial(Donnee[i]);
-        } 
-        _delay_ms(100);
-        }
-}
-
-
-// équivalent de analogueRead()
-int analogReadNew(uint8_t pin) {
-  /*
-  // Définition de la référence de tension
-  ADMUX |= (1 << REFS0);
-  // On sélectionne notre pin
-  ADMUX |= pin & 0x07;
-  
-  // On lance la conversion
-  sbi(ADCSRA, ADSC);
-
-  // Le bit sera désactivé à la fin de la conversion
-  while(bit_is_set(ADCSRA, ADSC));
-
-  // Lire ADCL en premier est obligatoire, sinon l'ADC se bloque
-  uint8_t low = ADCL;
-
-  // Récupérer le résultat
-  return ((ADCH << 8) | low);
-  */
-  ADCSRA |= (1<<ADPS2)|(1<<ADPS1)|(1<<ADPS0);
-  ADMUX |= (1<<REFS0)|(1<<ADLAR);
-  ADMUX = (ADMUX&0xf0)|pin;
-  ADCSRA |= (1<<ADEN);
-  
-  ADCSRA |= (1<<ADSC);
-  while(bit_is_set(ADCSRA, ADSC));
-  return ADCH;
-}
-
-int main()
-{
-   int reading;
-   init_serial();
-   while(1){
-    reading=analogReadNew(0);
-    temp = reading * 1.9607843;
-    dtostrf(temp, 4, 1, Donnee);
-    send_serial('T');
-    send_serial('=');
-    send_msg2(Donnee);
-    _delay_ms(2000);
-   }
-   return 0;  
-}
-
diff --git a/site/fichiersRPI/Build/Makefile b/site/fichiersRPI/Build/Makefile
index d501813..a94ffdb 100644
--- a/site/fichiersRPI/Build/Makefile
+++ b/site/fichiersRPI/Build/Makefile
@@ -3,27 +3,35 @@ export CC = avr-gcc
 export MCU = atmega328p
 export TARGET_ARCH = -mmcu=$(MCU)
 
-export CFLAGS =  -Wall -I. -DF_CPU=16000000 -Os #-g
+export CFLAGS =  -Wall -I. -DF_CPU=16000000 -Os #-pedantic -std=c99#-g
 export LDFLAGS = -g $(TARGET_ARCH) -lm -Wl,--gc-sections #	-Os
 
-
-TARGET = blink
+TARGET = libretour
+TERM0 = /dev/ttyACM0
+TERM1 = /dev/ttyACM1
 CPPFLAGS = -mmcu=$(MCU)
-PGMERISP = -c pi_3
-ARVDUDECONF= -C ~/avrdude_gpio.conf
-export DUDE = avrdude -v -p $(MCU) $(AVRDUDECONF)
-
+#PGMER = -c stk500v1 -b 57600 -P $(TERM)
+#Dans le cas de l'upload par USB (selon le port)
+PGMERISP0 = -c stk500v1 -b 115200 -P $(TERM0)
+PGMERISP1 = -c stk500v1 -b 115200 -P $(TERM1)
+ARVDUDECONF= -C /usr/local/arduino/arduino-0021/hardware/tools/avrdude.conf
+export DUDE = /usr/bin/avrdude -F -v -p $(MCU) $(AVRDUDECONF)
+#Dans le cas de l'upload par SPI depuis la raspberry
+PGMERISP_RPI = -c pi_3
+ARVDUDECONF_RPI = -C ~/avrdude_gpio.conf
+export DUDE_RPI = avrdude -v -p $(MCU) $(AVRDUDECONF_RPI)
+
+CLIB=ar cq
 C_SRC = $(wildcard *.c)
 OBJS = $(C_SRC:.c=.o)
 
-
-all: $(TARGET).hex
+all: $(TARGET).a
 
 
 clean:
-	rm -f *.o *.hex *.elf build-uno
+	rm -f *.o *.hex *.elf *.a build-uno
 
-%.o:%.c
+$(TARGET).o: $(TARGET).c $(TARGET).h
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
 
 
@@ -34,8 +42,46 @@ $(TARGET).hex: $(TARGET).elf
 	avr-objcopy -j .text -j .data -O ihex $(TARGET).elf $(TARGET).hex
 	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex $(TARGET).elf eeprom.hex
 
+$(TARGET).a: $(TARGET).o
+	rm -rf $@
+	$(CLIB) $@ $+
+
+
+#UPLOAD CONDITIONNEL
+FOLDER = $(notdir $(CURDIR))
+
 upload: $(TARGET).hex
-	$(DUDE) $(PGMERISP) -U flash:w:$(TARGET).hex
+#CAPTEUR 1 connecté en USB
+ifeq ($(FOLDER), capteur1-0)
+
+	stty -F $(TERM0) hupcl # reset
+	#	$(DUDE) $(PGMER) -U flash:w:$(TARGET).hex
+	$(DUDE) $(PGMERISP0) -U flash:w:$(TARGET).hex
+endif
+
+#CAPTEUR 1 connecté en SPI
+ifeq ($(FOLDER), capteur1-1)
+
+	stty -F $(TERM0) hupcl # reset
+	#	$(DUDE) $(PGMER) -U flash:w:$(TARGET).hex
+	$(DUDE_RPI) $(PGMERISP_RPI) -U flash:w:$(TARGET).hex
+endif
+
+#CAPTEUR 2 connecté en USB
+ifeq ($(FOLDER), capteur2-0)
+
+	stty -F $(TERM1) hupcl # reset
+	#	$(DUDE) $(PGMER) -U flash:w:$(TARGET).hex
+	$(DUDE) $(PGMERISP1) -U flash:w:$(TARGET).hex
+endif
+
+#CAPTEUR 2 connecté en SPI
+ifeq ($(FOLDER), capteur2-1)
+
+	stty -F $(TERM1) hupcl # reset
+	#	$(DUDE) $(PGMER) -U flash:w:$(TARGET).hex
+	$(DUDE_RPI) $(PGMERISP_RPI) -U flash:w:$(TARGET).hex
+endif
 
 size: $(TARGET).elf
 	avr-size --format=avr --mcu=$(MCU) $(TARGET).elf
diff --git a/site/fichiersRPI/Build/libretour/libretour.c b/site/fichiersRPI/Build/libretour/libretour.c
new file mode 100644
index 0000000..a5541c6
--- /dev/null
+++ b/site/fichiersRPI/Build/libretour/libretour.c
@@ -0,0 +1,73 @@
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <util/delay.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+
+#define PRESCALER 1024
+#define TIME_SLOT 20
+#define BAUDRATE	103
+
+//// INIT SERIAL /////
+
+void init_serial(void)
+{
+	/* ACHTUNG : we suppose UBRR value < 0xff */
+	/* Not true in all case */
+	uint8_t baudrate = BAUDRATE;
+	/* Set baud rate */
+	UBRR0H = 0;
+	UBRR0L = baudrate;
+	
+	UCSR0B = (1<<TXEN0);
+	/* Set frame format */
+	UCSR0C = 0x06;
+    
+}
+
+//// ENVOI DE MESSAGES /////
+
+void send_serial(unsigned char c)
+{
+	loop_until_bit_is_set(UCSR0A, UDRE0);
+	UDR0 = c;
+}
+
+
+void send_msg2(char Donnee[]){
+ 
+    while (( UCSR0A & (1<<UDRE0))  == 0){};
+            
+            for (int i = 0; i < strlen(Donnee); i++){ 
+                while (( UCSR0A & (1<<UDRE0))  == 0){};
+                UDR0 = Donnee[i]; 
+                if (i == (strlen(Donnee) - 1)){
+                    send_serial('\n');
+                    send_serial('\r');
+                }
+            } 
+}
+
+void send_msg(char Donnee[]){
+        int i=0;
+      for(i=0; i<strlen(Donnee); i++){
+          if (i==strlen(Donnee)-1){
+              send_serial(Donnee[i]);
+              send_serial('\n');
+              send_serial('\r');
+        }
+          else{
+              send_serial(Donnee[i]);
+        } 
+        _delay_ms(100);
+        }
+}
+
+//////// RETOUR /////////
+void retour(char* show_a){
+        send_msg2(show_a);
+}
+  
+ 
diff --git a/site/fichiersRPI/Build/libretour/libretour.h b/site/fichiersRPI/Build/libretour/libretour.h
new file mode 100644
index 0000000..6c5c4af
--- /dev/null
+++ b/site/fichiersRPI/Build/libretour/libretour.h
@@ -0,0 +1,14 @@
+
+
+void init_serial(void);
+
+void send_serial(unsigned char);
+
+void send_msg2(char*);
+
+void send_msg(char*);
+
+void retour(char*);
+
+//////////////////////////////////////////////
+
diff --git a/site/fichiersRPI/Build/main.c b/site/fichiersRPI/Build/main.c
deleted file mode 100755
index 4ca1fe9..0000000
--- a/site/fichiersRPI/Build/main.c
+++ /dev/null
@@ -1,114 +0,0 @@
-#include <avr/io.h>			// for the input/output register
-#include <avr/interrupt.h> 	
-#include <util/delay.h>  
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#define PRESCALER 1024
-#define TIME_SLOT 20
-#define BAUDRATE	103
-
-#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
-#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
-
-char Donnee[24];
-float temp;
-
-void init_serial(void)
-{
-	/* ACHTUNG : we suppose UBRR value < 0xff */
-	/* Not true in all case */
-	uint8_t baudrate = BAUDRATE;
-	/* Set baud rate */
-	UBRR0H = 0;
-	UBRR0L = baudrate;
-	/* Enable transmitter *///task_led_red();
-      //task_send_serial('A');
-	UCSR0B = (1<<TXEN0);
-	/* Set frame format */
-	UCSR0C = 0x06;
-    
-}
-
-void send_serial(unsigned char c)
-{
-	loop_until_bit_is_set(UCSR0A, UDRE0);
-	UDR0 = c;
-}
-
-
-void send_msg2(char Donnee[]){
- 
-    while (( UCSR0A & (1<<UDRE0))  == 0){};
-            
-            for (int i = 0; i < strlen(Donnee); i++){ 
-                while (( UCSR0A & (1<<UDRE0))  == 0){};
-                UDR0 = Donnee[i]; 
-                if (i == (strlen(Donnee) - 1)){
-                    send_serial('\n');
-                    send_serial('\r');
-                }
-            } 
-}
-
-void send_msg(char Donnee[]){
-        int i=0;
-      for(i=0; i<strlen(Donnee); i++){
-          if (i==strlen(Donnee)-1){
-              send_serial(Donnee[i]);
-              send_serial('\n');
-              send_serial('\r');
-        }
-          else{
-              send_serial(Donnee[i]);
-        } 
-        _delay_ms(100);
-        }
-}
-
-
-// équivalent de analogueRead()
-int analogReadNew(uint8_t pin) {
-  /*
-  // Définition de la référence de tension
-  ADMUX |= (1 << REFS0);
-  // On sélectionne notre pin
-  ADMUX |= pin & 0x07;
-  
-  // On lance la conversion
-  sbi(ADCSRA, ADSC);
-
-  // Le bit sera désactivé à la fin de la conversion
-  while(bit_is_set(ADCSRA, ADSC));
-
-  // Lire ADCL en premier est obligatoire, sinon l'ADC se bloque
-  uint8_t low = ADCL;
-
-  // Récupérer le résultat
-  return ((ADCH << 8) | low);
-  */
-  ADCSRA |= (1<<ADPS2)|(1<<ADPS1)|(1<<ADPS0);
-  ADMUX |= (1<<REFS0)|(1<<ADLAR);
-  ADMUX = (ADMUX&0xf0)|pin;
-  ADCSRA |= (1<<ADEN);
-  
-  ADCSRA |= (1<<ADSC);
-  while(bit_is_set(ADCSRA, ADSC));
-  return ADCH;
-}
-
-int main()
-{
-   int reading;
-   init_serial();
-   while(1){
-    reading=analogReadNew(0);
-    temp = reading * 1.9607843;
-    dtostrf(temp, 4, 1, Donnee);
-    //send_serial('T');
-    //send_serial('=');
-    send_msg2(Donnee);
-    _delay_ms(2000);
-   }
-   return 0;  
-}
diff --git a/site/fichiersRPI/script.sh b/site/fichiersRPI/script.sh
index b747ffc..39734d5 100755
--- a/site/fichiersRPI/script.sh
+++ b/site/fichiersRPI/script.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+
+echo $$ > /var/run/script.pid
+
 ./load.sh
 while true
 do
diff --git a/site/fichiersRPI/toto.sh b/site/fichiersRPI/toto.sh
deleted file mode 100755
index 976c7d6..0000000
--- a/site/fichiersRPI/toto.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-sudo su
-./script.sh
--
libgit2 0.21.2