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

---
 raspberry/Build/Makefile   |  42 ------------------------------------------
 raspberry/Build/main.c     | 114 ------------------------------------------------------------------------------------------------------------------
 raspberry/Rpi_to_server.py |  24 ------------------------
 raspberry/binaire.c        | 114 ------------------------------------------------------------------------------------------------------------------
 raspberry/lancer.sh        |   5 -----
 raspberry/load.sh          |  10 ----------
 raspberry/script.sh        |  10 ----------
 7 files changed, 0 insertions(+), 319 deletions(-)
 delete mode 100644 raspberry/Build/Makefile
 delete mode 100755 raspberry/Build/main.c
 delete mode 100755 raspberry/Rpi_to_server.py
 delete mode 100755 raspberry/binaire.c
 delete mode 100755 raspberry/lancer.sh
 delete mode 100755 raspberry/load.sh
 delete mode 100755 raspberry/script.sh

diff --git a/raspberry/Build/Makefile b/raspberry/Build/Makefile
deleted file mode 100644
index d501813..0000000
--- a/raspberry/Build/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-export CC = avr-gcc
-
-export MCU = atmega328p
-export TARGET_ARCH = -mmcu=$(MCU)
-
-export CFLAGS =  -Wall -I. -DF_CPU=16000000 -Os #-g
-export LDFLAGS = -g $(TARGET_ARCH) -lm -Wl,--gc-sections #	-Os
-
-
-TARGET = blink
-CPPFLAGS = -mmcu=$(MCU)
-PGMERISP = -c pi_3
-ARVDUDECONF= -C ~/avrdude_gpio.conf
-export DUDE = avrdude -v -p $(MCU) $(AVRDUDECONF)
-
-C_SRC = $(wildcard *.c)
-OBJS = $(C_SRC:.c=.o)
-
-
-all: $(TARGET).hex
-
-
-clean:
-	rm -f *.o *.hex *.elf build-uno
-
-%.o:%.c
-	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
-
-
-$(TARGET).elf: $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS)
-
-$(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
-
-upload: $(TARGET).hex
-	$(DUDE) $(PGMERISP) -U flash:w:$(TARGET).hex
-
-size: $(TARGET).elf
-	avr-size --format=avr --mcu=$(MCU) $(TARGET).elf
-
diff --git a/raspberry/Build/main.c b/raspberry/Build/main.c
deleted file mode 100755
index 4ca1fe9..0000000
--- a/raspberry/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/raspberry/Rpi_to_server.py b/raspberry/Rpi_to_server.py
deleted file mode 100755
index 836e4fd..0000000
--- a/raspberry/Rpi_to_server.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!usr/bin/env python
-
-import serial
-import requests
-import datetime
-
-date_comp = datetime.datetime.now()
-A = str(date_comp.year)
-M = str(date_comp.month)
-J = str(date_comp.day)
-h = str(date_comp.hour)
-m = str(date_comp.minute)
-s = str(date_comp.second)
-date = A + '-' + M + '-' + J + ' ' + h + ':' + m + ':' + s
-
-ser = serial.Serial("/dev/ttyACM0", 9600, timeout=1)
-value = ser.readline()
-while (value in ['\r', '', '\n']):
-      value = ser.readline()
-data = str(float(value[0:4]))
-
-params = {"ip_address":"172.26.145.111", "numero":"2", "name":"Solaris", "data": data, "date": date}
-r = requests.post("http://serveur-etu.polytech-lille.fr/~grouille/PROJET/requests.php", data = params)
-print(data)
\ No newline at end of file
diff --git a/raspberry/binaire.c b/raspberry/binaire.c
deleted file mode 100755
index 4ca1fe9..0000000
--- a/raspberry/binaire.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/raspberry/lancer.sh b/raspberry/lancer.sh
deleted file mode 100755
index 64d0921..0000000
--- a/raspberry/lancer.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-kill $(cat /var/run/script.pid)
-base=`dirname $0`
-nohup $base/script.sh &
diff --git a/raspberry/load.sh b/raspberry/load.sh
deleted file mode 100755
index 33adb61..0000000
--- a/raspberry/load.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-wget -N -P ./ http://houplin.studserv.deule.net/~grouille/PROJET/upload/binaire.c
-wget -N -P ./ http://houplin.studserv.deule.net/~grouille/PROJET/upload/sensor.xml
-
-cp binaire.c Build/main.c
-cd Build
-make clean
-make upload
-cd ..
diff --git a/raspberry/script.sh b/raspberry/script.sh
deleted file mode 100755
index 39734d5..0000000
--- a/raspberry/script.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-echo $$ > /var/run/script.pid
-
-./load.sh
-while true
-do
-	sleep 5
-	python3 Rpi_to_server.py
-done
--
libgit2 0.21.2