Update index.html

update few things, espcially to have a code updated to 5.2.0.3 HTML

Arduino Code/Anemometer done.ino

@@ -1,45 +1,43 @@
 #include <math.h>
-
+#define WindSensorPin (2)
-#define WindSensorPin (2) // The pin location of the anemometer sensor
 
 volatile unsigned long Rotations; // cup rotation counter used in interrupt routine
 volatile unsigned long ContactBounceTime; // Timer to avoid contact bounce in interrupt routine
-
 float WindSpeed; // speed miles per hour
 
-void setup() {
+void setup()
-Serial.begin(9600);
+{
+    Serial.begin(9600);
 
-pinMode(WindSensorPin, INPUT);
+    pinMode(WindSensorPin, INPUT);
-attachInterrupt(digitalPinToInterrupt(WindSensorPin), isr_rotation, FALLING);
+    attachInterrupt(digitalPinToInterrupt(WindSensorPin), isr_rotation, FALLING);
 
-Serial.println("Rotations\tKm/h");
+    Serial.println("Rotations\tKm/h");
 }
 
-void loop() {
+void loop()
+{
+    Rotations = 0; // Set Rotations count to 0 ready for calculations
 
-Rotations = 0; // Set Rotations count to 0 ready for calculations
+    sei(); // Enables interrupts
+    delay (3000); // Wait 3 seconds to average
+    cli(); // Disable interrupts
 
-sei(); // Enables interrupts
+    // convert to mp/h using the formula V=P(2.25/T)
-delay (3000); // Wait 3 seconds to average
+    // V = P(2.25/3) = P * 0.75
-cli(); // Disable interrupts
 
-// convert to mp/h using the formula V=P(2.25/T)
+    WindSpeed = (Rotations * 0.75) * 1.609344;
-// V = P(2.25/3) = P * 0.75
-
-WindSpeed = (Rotations * 0.75) * 1.609344;
-
-Serial.print(Rotations); Serial.print("\t\t");
-Serial.println(WindSpeed);
 
+    Serial.print(Rotations); Serial.print("\t\t");
+    Serial.println(WindSpeed);
 }
 
 // This is the function that the interrupt calls to increment the rotation count
-void isr_rotation () {
+void isr_rotation()
-
+{
-if ((millis() - ContactBounceTime) > 15 ) { // debounce the switch contact.
+    if ((millis() - ContactBounceTime) > 15 ) // debounce the switch contact.
-Rotations++;
+    {
-ContactBounceTime = millis();
+        Rotations++;
-}
+        ContactBounceTime = millis();
-
+    }
-} 
+} 

Arduino Code/FULL_PROGRAMM.ino

@@ -3,17 +3,25 @@
 #include <math.h>
 #include <Servo.h>
 #define WindSensorPin (2)
+
+
 volatile unsigned long Rotations;
-volatile unsigned long ContactBounceTime; 
+volatile unsigned long ContactBounceTime;
+
+unsigned long duration;
+
 float WindSpeed;
-byte mac[] = { 0x90, 0xA2, 0xDA, 0x0E, 0xD4, 0x22 };// @dresse MAC de votre Arduino Ethernet
+float T = 0;
-byte ip[] = {10,66,240,59};
+
-//char server[] = "spe.sin.apo.free.fr";    // nom du site
+byte mac[] = {0x90, 0xA2, 0xDA, 0x0E, 0xD4, 0x22}; // @Arduino Ethernet
-char server[] = "10.66.240.81";    // @PC en local quand on utilise WAMPSERVEUR
+byte ip[] = {10, 66, 240, 59};
+
+char server[] = "10.66.240.81"; // @PC
 
 String readString;
-Servo monServomoteur;
+boolean drapeau = false;
-boolean drapeau= false;
+
+
 int D;
 int LE;
 int LI;
@@ -21,343 +29,334 @@ int S;
 int AM;
 char c;
 int pin = 9;
-unsigned long duration;
+int position = 0;
-int position = 0 ;
+
-float T = 0;
+int F = 1 / T;
-int F = 1/T;
 int Led = 7;
 int bLed = 3;
 int gLed = 4;
 int rLed = 6;
 int ST;
-  
+
 EthernetClient client;
 
-
+void setup()
-void setup() {
+{
   pinMode(pin, INPUT);
   pinMode(bLed, OUTPUT);
   pinMode(gLed, OUTPUT);
   pinMode(rLed, OUTPUT);
   pinMode(Led, OUTPUT);
   monServomoteur.attach(8);
-   Serial.begin(9600);// mise en marche liaison série
+  Serial.begin(9600); // mise en marche liaison série
   //Ethernet.begin(mac, ip);
-  if (Ethernet.begin(mac) == 0) {
+  if (Ethernet.begin(mac) == 0)
+  {
     Serial.println("Failed to configure Ethernet using DHCP");
     // no point in carrying on, so do nothing forevermore:
-    for(;;);}
+    for (;;)
-     delay(2000);
+      ;
-     Serial.println("connecting...");
+  }
-   }
+  delay(2000);
-
+  Serial.println("connecting...");
-void loop(){
-//Luxmetre 
-delay(500);
-duration = pulseIn(pin, HIGH);
-T = 2*duration;
-Serial.print("Luminosite (lux): ");
-F = 1000000*1/T;
-Serial.println(F, DEC);
-  //Anemometre 
-Rotations = 0;
-sei();
-delay (3000);
-cli();
-WindSpeed = (Rotations * 0.75) * 1.609344;
-Serial.print(Rotations); Serial.print("\t\t");
-Serial.println(WindSpeed);
-
-envoieBDD();
-LectureBDD();
-Traitement();
 }
-void isr_rotation () {
 
-if ((millis() - ContactBounceTime) > 15 ) { // debounce the switch contact.
+void loop()
-Rotations++;
+{
-ContactBounceTime = millis();
+  //Luxmetre
+  delay(500);
+  duration = pulseIn(pin, HIGH);
+  T = 2 * duration;
+  Serial.print("Luminosite (lux): ");
+  F = 1000000 * 1 / T;
+  Serial.println(F, DEC);
+  //Anemometre
+  Rotations = 0;
+  sei();
+  delay(3000);
+  cli();
+  WindSpeed = (Rotations * 0.75) * 1.609344;
+  Serial.print(Rotations);
+  Serial.print("\t\t");
+  Serial.println(WindSpeed);
+
+  envoieBDD();
+  LectureBDD();
+  Traitement();
 }
+
+void isr_rotation()
+{
+
+  if ((millis() - ContactBounceTime) > 15)
+  { // debounce the switch contact.
+    Rotations++;
+    ContactBounceTime = millis();
+  }
 }
+
 void envoieBDD()
 {
-  if (client.connect(server, 80)) {
+  if (client.connect(server, 80))
+  {
     Serial.println("connected");
-     client.print("GET /SLEGPI/ecriture.php?lux=");         
+    client.print("GET /SLEGPI/ecriture.php?lux=");
-     client.print(F); 
+    client.print(F);
-     client.println(" HTTP/1.1");
+    client.println(" HTTP/1.1");
-     client.println("Host: 10.66.240.81");
+    client.println("Host: 10.66.240.81");
-     Serial.println(F); 
+    Serial.println(F);
-    Serial.println( "Connection: close" );
+    Serial.println("Connection: close");
     client.println();
-    client.stop();    
+    client.stop();
     client.println();
   }
-  else {
+  else
+  {
     Serial.println("connection failed");
   }
-  
+
-   if (client.connect(server, 80)) {
+  if (client.connect(server, 80))
+  {
     Serial.println("connected");
-     client.print("GET /SLEGPI/ecriture.php?vent="); 
+    client.print("GET /SLEGPI/ecriture.php?vent=");
-     client.print(WindSpeed);
+    client.print(WindSpeed);
-     client.println(" HTTP/1.1");
+    client.println(" HTTP/1.1");
-     client.println("Host: 10.66.240.81"); 
+    client.println("Host: 10.66.240.81");
-     //Serial.println(F);  
+    //Serial.println(F);
-   Serial.println( "Connection: close" );
+    Serial.println("Connection: close");
     client.println();
-    client.stop();   
+    client.stop();
     client.println();
   }
-   else {
+  else
+  {
     Serial.println("connection failed");
   }
-  
+}
-  }
 
 void LectureBDD()
 {
- EthernetServer server(80);
+  EthernetServer server(80);
- server.available();
+  server.available();
-EthernetClient client = server.available(); 
+  EthernetClient client = server.available();
   if (client)
   {
-  Serial.println("attente serveur");
+    Serial.println("attente serveur");
-    while (client.connected()) 
+    while (client.connected())
     {
-    client.println("z");  //pour la connexion      
+      client.println("z");       //pour la connexion
-       while (client.available()) // Not if - you want to read all the data
+      while (client.available()) // Not if - you want to read all the data
-       {  
+      {
-       char c = client.read();//lecture caractère par caractère 
+        char c = client.read(); //lecture caractère par caractère
-       //on concatène les caractères et on ne sélectionne qu'un string total de longueur < 40
+        //on concatène les caractères et on ne sélectionne qu'un string total de longueur < 40
-       if (readString.length()<40 ) readString.concat(c);
+        if (readString.length() < 40)
-       // détection de fin de ligne
+          readString.concat(c);
-       if (c == '\n' ) 
+        // détection de fin de ligne
-          {
+        if (c == '\n')
-           Serial.println (readString);//écriture des 40 caractères dans le terminal série                                 
+        {
-           // index des recherches des mots "ON" et "OUV" dans la chaine readString
+          Serial.println(readString); //écriture des 40 caractères dans le terminal série
-           // si absent alors =-1
+          // index des recherches des mots "ON" et "OUV" dans la chaine readString
-           LI = readString.indexOf('Y');  
+          // si absent alors =-1
-           LE = readString.indexOf('Z');
+          LI = readString.indexOf('Y');
-           S = readString.indexOf('OUV');
+          LE = readString.indexOf('Z');
-           AM = readString.indexOf('WW');
+          S = readString.indexOf('OUV');
-           readString="";//initialisation de la variable chaîne readString
+          AM = readString.indexOf('WW');
-           client.stop();//deconnection de l'arduino
+          readString = ""; //initialisation de la variable chaîne readString
-           Serial.println();  
+          client.stop();   //deconnection de l'arduino
-                                             
+          Serial.println();
-          
+        }
-       }
       }
+    }
   }
 }
-}
 
 void Traitement()
 {
-           if(AM >0){
+  if (AM > 0)
-           Serial.println("Mode automatique");
+  {
+    Serial.println("Mode automatique");
 
-           if(F <1000){
+    if (F < 1000)
-             digitalWrite(bLed, HIGH);
+    {
-             digitalWrite(gLed, HIGH);
+      digitalWrite(bLed, HIGH);
-             digitalWrite(rLed, HIGH);
+      digitalWrite(gLed, HIGH);
-             digitalWrite(Led, LOW);
+      digitalWrite(rLed, HIGH);
-                 if (drapeau==true)
+      digitalWrite(Led, LOW);
-                 {
+      if (drapeau == true)
-                   drapeau=false;
+      {
-                   position=0;
+        drapeau = false;
-                   monServomoteur.write(position);
+        position = 0;
-                   delay(15);
+        monServomoteur.write(position);
-                  }
+        delay(15);
-             D=1;
-             ST=0;
-             //allumer
-           
-if (client.connect(server, 80)) {
-    Serial.println("connected");
-    Serial.println("toto");
-     client.print("GET /SLEGPI/ecriture.php?eInt=");         
-     client.print(D); 
-     Serial.println(D);
-     client.println(" HTTP/1.1");
-     client.println("Host: 10.66.240.81");
-     Serial.println(F); 
-    Serial.println( "Connection: close" );
-    client.println();
-    client.stop();    
-    client.println();
-  }
-  else {
-    Serial.println("connection failed");
-  }
-      if (client.connect(server, 80)) {
-    Serial.println("connected");
-     client.print("GET /SLEGPI/ecriture.php?eExt=");         
-     client.print(D); 
-     client.println(" HTTP/1.1");
-     client.println("Host: 10.66.240.81");
-     Serial.println(1); 
-    Serial.println( "Connection: close" );
-    client.println();
-    client.stop();    
-    client.println();
       }
-           if (client.connect(server, 80)) {
+      D = 1;
-    Serial.println("connected");
+      ST = 0;
-     client.print("GET /SLEGPI/ecriture.php?Store=");         
+      //allumer
-     client.print(ST); 
+
-     client.println(" HTTP/1.1");
+      if (client.connect(server, 80))
-     client.println("Host: 10.66.240.81");
+      {
-     Serial.println(1); 
+        Serial.println("connected");
-    Serial.println( "Connection: close" );
+        Serial.println("toto");
-    client.println();
+        client.print("GET /SLEGPI/ecriture.php?eInt=");
-    client.stop();    
+        client.print(D);
-    client.println();
+        Serial.println(D);
+        client.println(" HTTP/1.1");
+        client.println("Host: 10.66.240.81");
+        Serial.println(F);
+        Serial.println("Connection: close");
+        client.println();
+        client.stop();
+        client.println();
       }
-  }
+      else
-  
+      {
-  
+        Serial.println("connection failed");
-           
+      }
-           if(F >1000){
+      if (client.connect(server, 80))
-             digitalWrite(bLed, LOW);
+      {
-             digitalWrite(gLed, LOW);
+        Serial.println("connected");
-             digitalWrite(rLed, LOW);
+        client.print("GET /SLEGPI/ecriture.php?eExt=");
-             digitalWrite(Led, HIGH);
+        client.print(D);
-                 if (drapeau==false)
+        client.println(" HTTP/1.1");
-                 {
+        client.println("Host: 10.66.240.81");
-                 drapeau=true;
+        Serial.println(1);
-                 for (int position = 0; position <= 180; position++) 
+        Serial.println("Connection: close");
-                {
+        client.println();
-                monServomoteur.write(position);
+        client.stop();
-               delay(15);
+        client.println();
-                }
+      }
-                }
+      if (client.connect(server, 80))
-             D=0;
+      {
-             ST=1;
+        Serial.println("connected");
-             //et
+        client.print("GET /SLEGPI/ecriture.php?Store=");
-             if (client.connect(server, 80)) {
+        client.print(ST);
-    Serial.println("connected");
+        client.println(" HTTP/1.1");
-    Serial.println("toto");
+        client.println("Host: 10.66.240.81");
-     client.print("GET /SLEGPI/ecriture.php?eInt=");         
+        Serial.println(1);
-     client.print(D); 
+        Serial.println("Connection: close");
-     Serial.println(D);
+        client.println();
-     client.println(" HTTP/1.1");
+        client.stop();
-     client.println("Host: 10.66.240.81");
+        client.println();
-     Serial.println(F); 
-    Serial.println( "Connection: close" );
-    client.println();
-    client.stop();    
-    client.println();
-  }
-  else {
-    Serial.println("connection failed");
-  }
-      if (client.connect(server, 80)) {
-    Serial.println("connected");
-     client.print("GET /SLEGPI/ecriture.php?eExt=");         
-     client.print(D); 
-     client.println(" HTTP/1.1");
-     client.println("Host: 10.66.240.81");
-     Serial.println(1); 
-    Serial.println( "Connection: close" );
-    client.println();
-    client.stop();    
-    client.println();
       }
-      if (client.connect(server, 80)) {
-    Serial.println("connected");
-    Serial.println("toto");
-     client.print("GET /SLEGPI/ecriture.php?Store=");         
-     client.print(ST); 
-     Serial.println(D);
-     client.println(" HTTP/1.1");
-     client.println("Host: 10.66.240.81");
-     Serial.println(F); 
-    Serial.println( "Connection: close" );
-    client.println();
-    client.stop();    
-    client.println();
-  }
-             }
-           } //Allumer les lumieres exterieurs 
-          else{
-            Serial.println("Mode manuel");
-                     //Eteindre les lumieres exterieurs       
-
-
-           
-           if(LI >0){
-           digitalWrite(Led, LOW);
-                     }//Allumer les lumieres exterieurs 
-            else{
-            digitalWrite(Led, HIGH);
-                     }//Eteindre les lumieres exterieurs
-
-
-           
-           if(LE >0){
-             digitalWrite(bLed, HIGH);
-             digitalWrite(gLed, HIGH);
-             digitalWrite(rLed, HIGH);
-                     }//Allumer les lumieres exterieurs 
-            else{
-             digitalWrite(bLed, LOW);
-             digitalWrite(gLed, LOW);
-             digitalWrite(rLed, LOW);
-                     }//Eteindre les lumieres exterieurs
-
-
-           
-          if(S >0){
-                if (drapeau==false)
-                {
-                  drapeau=true;
-                   for (int position = 0; position <= 180; position++) 
-                {
-                  monServomoteur.write(position);
-                  delay(15);
-                }
-            }
-            
-            }
-                     //Monter le Store
-            else{
-
-               if (drapeau==true)
-                {
-                drapeau=false;
-                position=0;
-                monServomoteur.write(position);
-                delay(15);
     }
-    }
-                     }//Baisser le Store
 
+    if (F > 1000)
+    {
+      digitalWrite(bLed, LOW);
+      digitalWrite(gLed, LOW);
+      digitalWrite(rLed, LOW);
+      digitalWrite(Led, HIGH);
+      if (drapeau == false)
+      {
+        drapeau = true;
+        for (int position = 0; position <= 180; position++)
+        {
+          monServomoteur.write(position);
+          delay(15);
+        }
+      }
+      D = 0;
+      ST = 1;
+      //et
+      if (client.connect(server, 80))
+      {
+        Serial.println("connected");
+        Serial.println("toto");
+        client.print("GET /SLEGPI/ecriture.php?eInt=");
+        client.print(D);
+        Serial.println(D);
+        client.println(" HTTP/1.1");
+        client.println("Host: 10.66.240.81");
+        Serial.println(F);
+        Serial.println("Connection: close");
+        client.println();
+        client.stop();
+        client.println();
+      }
+      else
+      {
+        Serial.println("connection failed");
+      }
+      if (client.connect(server, 80))
+      {
+        Serial.println("connected");
+        client.print("GET /SLEGPI/ecriture.php?eExt=");
+        client.print(D);
+        client.println(" HTTP/1.1");
+        client.println("Host: 10.66.240.81");
+        Serial.println(1);
+        Serial.println("Connection: close");
+        client.println();
+        client.stop();
+        client.println();
+      }
+      if (client.connect(server, 80))
+      {
+        Serial.println("connected");
+        Serial.println("toto");
+        client.print("GET /SLEGPI/ecriture.php?Store=");
+        client.print(ST);
+        Serial.println(D);
+        client.println(" HTTP/1.1");
+        client.println("Host: 10.66.240.81");
+        Serial.println(F);
+        Serial.println("Connection: close");
+        client.println();
+        client.stop();
+        client.println();
+      }
+    }
+  } //Allumer les lumieres exterieurs
+  else
+  {
+    Serial.println("Mode manuel");
+    //Eteindre les lumieres exterieurs
+
+    if (LI > 0)
+    {
+      digitalWrite(Led, LOW);
+    } //Allumer les lumieres exterieurs
+    else
+    {
+      digitalWrite(Led, HIGH);
+    } //Eteindre les lumieres exterieurs
+
+    if (LE > 0)
+    {
+      digitalWrite(bLed, HIGH);
+      digitalWrite(gLed, HIGH);
+      digitalWrite(rLed, HIGH);
+    } //Allumer les lumieres exterieurs
+    else
+    {
+      digitalWrite(bLed, LOW);
+      digitalWrite(gLed, LOW);
+      digitalWrite(rLed, LOW);
+    } //Eteindre les lumieres exterieurs
+
+    if (S > 0)
+    {
+      if (drapeau == false)
+      {
+        drapeau = true;
+        for (int position = 0; position <= 180; position++)
+        {
+          monServomoteur.write(position);
+          delay(15);
+        }
+      }
+    }
+    //Monter le Store
+    else
+    {
+
+      if (drapeau == true)
+      {
+        drapeau = false;
+        position = 0;
+        monServomoteur.write(position);
+        delay(15);
+      }
+    }
+  } //Baisser le Store
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-

Arduino Code/Luxmeter.ino

@@ -1,17 +1,14 @@
-int pin = 10;
 unsigned long duration;
 float T = 0;
+
+int pin = 10;
 int F = 1/T;
 int led = 9;
 int BLUE = 6;                   
 int GREEN = 3; 
 int RED = 5; 
-int brightness1 = 200;
+int lum1 = 255;
-int brightness2 = 255;
+int lum0 = 0;
-int brightness3 = 255;
-int brightness4 = 0;
-int brightness5 = 0;
-int brightness6 = 0;
 
 void setup()
 {
@@ -25,24 +22,23 @@ void loop()
 {
   delay(1000);
   duration = pulseIn(pin, HIGH);
-T = 2*duration;
+  T = 2*duration;
-Serial.print("Luminosite (lux): ");
+  Serial.print("Luminosite (lux): ");
-F = 1000000*1/T;
+  F = 1000000*1/T;
-Serial.println(F, DEC);
+  Serial.println(F, DEC);
 
-if (F >= 500)
+  if (F >= 500)
-{
+  {
-  digitalWrite(led, HIGH);
+    digitalWrite(led, HIGH);
-  analogWrite(RED, brightness4);
+    analogWrite(RED, lum0);
-  analogWrite(GREEN, brightness5);
+    analogWrite(GREEN, lum0);
-  analogWrite(BLUE, brightness6);
+    analogWrite(BLUE, lum0);
-}
+  }
-else
+  else
-{
+  {
-  digitalWrite(led, LOW);
+    digitalWrite(led, LOW);
-  analogWrite(RED, brightness1);
+    analogWrite(RED, lum1);
-  analogWrite(GREEN, brightness2);
+    analogWrite(GREEN, lum1);
-  analogWrite(BLUE, brightness3);
+    analogWrite(BLUE, lum1);
-}
+  }
-}
+}
-

Arduino Code/Motor.ino

@@ -2,12 +2,16 @@
 #include <Ethernet.h>
 #include <math.h>
 #define WindSensorPin (2)
+
+
 volatile unsigned long Rotations;
 volatile unsigned long ContactBounceTime; 
 float WindSpeed; 
-int pin = 9;
+
 unsigned long duration;
 float T = 0;
+
+int pin = 9;
 int F = 1/T;
 int led = 8;
 int BLUE = 6;                   
@@ -19,102 +23,113 @@ int brightness3 = 255;
 int brightness4 = 0;
 int brightness5 = 0;
 int brightness6 = 0;
- EthernetClient client;
+
+EthernetClient client;
 byte mac[] = { 0x90, 0xA2, 0xDA, 0x0E, 0xD4, 0x22 }; 
 byte ip[] = { 192, 168, 1, 102 }; //ip arduino
+
 char server[] = "192.168.1.101"; //ip raspberry
 
-void setup() { 
+void setup()
+{
 
-    pinMode(WindSensorPin, INPUT);
+  pinMode(WindSensorPin, INPUT);
-attachInterrupt(digitalPinToInterrupt(WindSensorPin), isr_rotation, FALLING);
+  attachInterrupt(digitalPinToInterrupt(WindSensorPin), isr_rotation, FALLING);
 
-Serial.println("Rotations\tKm/h");
+  Serial.println("Rotations\tKm/h");
 
-   pinMode(led, OUTPUT);
+  pinMode(led, OUTPUT);
-   pinMode(pin, INPUT);
+  pinMode(pin, INPUT);
-   Serial.begin(9600);
+  Serial.begin(9600);
-   digitalWrite(led, LOW);
+  digitalWrite(led, LOW);
 
-  if (Ethernet.begin(mac) == 0) {
+  if (Ethernet.begin(mac) == 0)
+  {
     Serial.println("Failed to configure Ethernet using DHCP");
-    for(;;)
+    for (;;)
       ;
   }
   delay(500);
   Serial.println("connecting...");
 }
 
-void loop() {
+void loop()
-  
+{
+
   //luxmetre
   delay(500);
   duration = pulseIn(pin, HIGH);
-T = 2*duration;
+  T = 2 * duration;
-Serial.print("Luminosite (lux): ");
+  Serial.print("Luminosite (lux): ");
-F = 1000000*1/T;
+  F = 1000000 * 1 / T;
-Serial.println(F, DEC);
+  Serial.println(F, DEC);
-if (F >= 1000)
+  if (F >= 1000)
-{
+  {
-  digitalWrite(led, HIGH);
+    digitalWrite(led, HIGH);
-  analogWrite(RED, brightness4);
+    analogWrite(RED, brightness4);
-  analogWrite(GREEN, brightness5);
+    analogWrite(GREEN, brightness5);
-  analogWrite(BLUE, brightness6);
+    analogWrite(BLUE, brightness6);
-}
+  }
-else
+  else
-{
+  {
-  digitalWrite(led, LOW);
+    digitalWrite(led, LOW);
-  analogWrite(RED, brightness1);
+    analogWrite(RED, brightness1);
-  analogWrite(GREEN, brightness2);
+    analogWrite(GREEN, brightness2);
-  analogWrite(BLUE, brightness3);
+    analogWrite(BLUE, brightness3);
-}
+  }
-  
+
-  if (client.connect(server, 80)) {
+  if (client.connect(server, 80))
+  {
     Serial.println("connected");
-     client.print("GET /SLEGPI/ecriture.php?lux="); 
+    client.print("GET /SLEGPI/ecriture.php?lux=");
-     client.print(F);
+    client.print(F);
-     client.println(" HTTP/1.1");
+    client.println(" HTTP/1.1");
-     client.println("Host: 192.168.1.101"); 
+    client.println("Host: 192.168.1.101");
-     //Serial.println(F);  
+    //Serial.println(F);
-   Serial.println( "Connection: close" );
+    Serial.println("Connection: close");
     client.println();
-    client.stop();   
+    client.stop();
     client.println();
   }
-  else {
+  else
+  {
     Serial.println("connection failed");
   }
-delay(500);
+  delay(500);
 
   //anémometre
-Rotations = 0;
+  Rotations = 0;
-sei();
+  sei();
-delay (3000);
+  delay(3000);
-cli();
+  cli();
-WindSpeed = (Rotations * 0.75) * 1.609344;
+  WindSpeed = (Rotations * 0.75) * 1.609344;
-Serial.print(Rotations); Serial.print("\t\t");
+  Serial.print(Rotations);
-Serial.println(WindSpeed);
+  Serial.print("\t\t");
+  Serial.println(WindSpeed);
 
-  if (client.connect(server, 80)) {
+  if (client.connect(server, 80))
+  {
     Serial.println("connected");
-     client.print("GET /SLEGPI/ecriture.php?vent="); 
+    client.print("GET /SLEGPI/ecriture.php?vent=");
-     client.print(WindSpeed);
+    client.print(WindSpeed);
-     client.println(" HTTP/1.1");
+    client.println(" HTTP/1.1");
-     client.println("Host: 192.168.1.101"); 
+    client.println("Host: 192.168.1.101");
-     //Serial.println(F);  
+    //Serial.println(F);
-   Serial.println( "Connection: close" );
+    Serial.println("Connection: close");
     client.println();
-    client.stop();   
+    client.stop();
     client.println();
   }
-   else {
+  else
+  {
     Serial.println("connection failed");
   }
+}
+void isr_rotation ()
+{
+  if ((millis() - ContactBounceTime) > 15)
+  { // debounce the switch contact.
+    Rotations++;
+    ContactBounceTime = millis();
   }
-void isr_rotation () {
-
-if ((millis() - ContactBounceTime) > 15 ) { // debounce the switch contact.
-Rotations++;
-ContactBounceTime = millis();
-}
 }

Arduino Code/Outdoor_Lights.ino

@@ -1,12 +1,14 @@
+unsigned long duration;
+float T = 0;
+
 int bLed = 3;
 int gLed = 4;
 int rLed = 6;
 int pin = 9;
-unsigned long duration;
-float T = 0;
 int F = 1/T;
 
-void setup() {
+void setup()
+{
   // put your setup code here, to run once:
   pinMode(pin, INPUT);
   Serial.begin(9600);
@@ -15,28 +17,29 @@ void setup() {
   pinMode(rLed, OUTPUT);
 }
 
-void loop() {
+void loop()
+{
   // put your main code here, to run repeatedly:
   delay(1000);
   duration = pulseIn(pin, HIGH);
-  T = 2*duration;
+  T = 2 * duration;
   Serial.print("F: ");
-  F = 1000000*1/T;
+  F = 1000000 * 1 / T;
   Serial.println(F, DEC);
 
-if (F<1000)
+  if (F < 1000)
-{  
+  {
-  digitalWrite(bLed, HIGH);
+    digitalWrite(bLed, HIGH);
-  digitalWrite(gLed, HIGH);
+    digitalWrite(gLed, HIGH);
-  digitalWrite(rLed, HIGH);
+    digitalWrite(rLed, HIGH);
-  delay(1000);
+    delay(1000);
-}
+  }
 
-if (F>1000)
+  if (F > 1000)
-{
+  {
-  digitalWrite(bLed, LOW);
+    digitalWrite(bLed, LOW);
-  digitalWrite(gLed, LOW);
+    digitalWrite(gLed, LOW);
-  digitalWrite(rLed, LOW);
+    digitalWrite(rLed, LOW);
-  delay(1000);
+    delay(1000);
+  }
 }
-}

Arduino Code/_config.yml

@@ -1 +0,0 @@
-theme: jekyll-theme-cayman

Website Source Code/_config.yml

@@ -1 +0,0 @@
-theme: jekyll-theme-cayman

docs/README.md

@@ -1,2 +1,2 @@
 # SLEGPI
-This is a repositories to get a short url like : https://junkjumper.github.io/slegpi
+This is a repositories to get a short url like : https://junkjumper.github.io/SLEGPI

docs/about.html

@@ -21,23 +21,26 @@
       </div>
       <nav>
         <ul>
-          <li class="active">
+          <li>
             <a href="index.html">Homepage</a>
           </li>
           <li>
-            <a href="" class="active">About</a>
+            <a href="about.html" class="active">About</a>
           </li>
           <li>
             <a href="story.html">Story</a>
           </li>
+          <li>
+            <a href="license.html">License</a>
+          </li>
           <li>
             <a href="https://www.junkjumper-projects.com/_Project/slegpi/">Demo</a>
           </li>
           <li>
-            <a href="#">License</a>
+            <a href="https://github.com/JunkJumper/SLEGPI">Download on Github</a>
           </li>
           <li class="last">
-            <a href="https://github.com/JunkJumper/SLEGPI">Download on Github</a>
+            <a href="https://www.junkjumper-projects.com/#projects">Back to Projects List</a>
           </li>
         </ul>
       </nav>
@@ -53,47 +56,60 @@
         <section>
           <article>
             <h1>About the project</h1>
-            <p>Welcome on the About page of the project. SLEGPI is my project for my exams of june 2018. I have work on it from
+            <p>Welcome on the About page of the project. SLEGPI is my project for my exams of june 2018. I have work on
-              October 2017 to May 2018. The goal of SLEGPI was to make me discover numeric and electronic aspect by considering
+              it from
+              October 2017 to May 2018. The goal of SLEGPI was to make me discover numeric and electronic aspect by
+              considering
               a lot the substainable developpement.
               <br />
-              <br /> When I start the project, I receive from my professor a contract notice with all the instruction that I must
+              <br /> When I start the project, I receive from my professor a contract notice with all the instruction
+              that I must
               to respect.
               <br />
-              <br /> On the contract, was written that i must use a Raspebrry Pi 3, an Arduino Card, and try to respect the substainable
+              <br /> On the contract, was written that i must use a Raspebrry Pi 3, an Arduino Card, and try to respect
+              the substainable
               developpement.
               <br />
               <br />
             </p>
 
             <h2 id="How">How the project works ?</h2>
-            <p>The project works by setting up a connection between a server hosted on a Raspebrry Pi 3 and the Arduino Card.
+            <p>The project works by setting up a connection between a server hosted on a Raspebrry Pi 3 and the Arduino
+              Card.
               To do that, the Arduino card and the Raspebrry Pi 3 need to b connected to the same network.
               <br />
               <br /> Firstly, the
-              <a href="https://en.wikipedia.org/wiki/LAMP_(software_bundle)" target="_blank">LAMP server</a> need to be configured with the
+              <a href="https://en.wikipedia.org/wiki/LAMP_(software_bundle)" target="_blank">LAMP server</a> need to be
-              <a href="http://php.net/manual/en/book.pdo.php" target="_blank">PDO</a> function. Without it, all the connection between the databse and the website is deleted. When we use
+              configured with the
-              the website to send an action to do to our Arduino card, we are in server mode. So we are asking to the Arduino
+              <a href="http://php.net/manual/en/book.pdo.php" target="_blank">PDO</a> function. Without it, all the
+              connection between the databse and the website is deleted. When we use
+              the website to send an action to do to our Arduino card, we are in server mode. So we are asking to the
+              Arduino
               Card to "display" a page with an URL like :
               <xmp>ip-adress/action=what_we_want</xmp>
               And our Arduino Card understand what to do.
               <br />
-              <br /> When the Arduino Card is receiving data from our anemometer or from the luxmeter, it sending informations
+              <br /> When the Arduino Card is receiving data from our anemometer or from the luxmeter, it sending
-              to the website in client mode. And the website is understanding what Arduino send by using a file called "get_sql.php".
+              informations
-              <br
+              to the website in client mode. And the website is understanding what Arduino send by using a file called
-              />
+              "get_sql.php".
+              <br />
               <br />
             </p>
 
             <h2 id="Exam">How was the exam with this project ?</h2>
-            <p>The Exam is separated in two parts. One is a continuous assessment and the grade is given by the professor who
+            <p>The Exam is separated in two parts. One is a continuous assessment and the grade is given by the
-              follow the project from the begining to the end. And the second one is given by a jury of two professors who
+              professor who
+              follow the project from the begining to the end. And the second one is given by a jury of two professors
+              who
               don't know anything about us or about our project (exept maybe the name of our project).
               <br />
-              <br /> Personally, I get 20/20 for the continuous assessment and 18/20 from the jury. So I get 19/20 for the project
+              <br /> Personally, I get 20/20 for the continuous assessment and 18/20 from the jury. So I get 19/20 for
+              the project
               (coefficient 12).
               <br />
-              <br /> For the continuous assessment, we just have to seriously work. For the jury part, we have to do a slide show
+              <br /> For the continuous assessment, we just have to seriously work. For the jury part, we have to do a
+              slide show
               to project on a screen. We must do a general and personal recap into a .docx file.
             </p>
 
@@ -115,7 +131,7 @@
               <a href="#Exam">How was the exam with this project ?</a>
             </li>
             <li class="last">
-              <a href="#">Download the latest release !</a>
+              <a href="https://github.com/JunkJumper/SLEGPI/releases" target="_blank">Download the latest release !</a>
             </li>
           </ul>
         </nav>
@@ -129,16 +145,18 @@
     <footer id="footer" class="clear">
       <p class="fl_left">
         <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">
-          <img alt="Licence Creative Commons" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" />
+          <img alt="Licence Creative Commons" style="border-width:0"
+            src="https://i.creativecommons.org/l/by/4.0/88x31.png" />
         </a>
         <img src="img/footer.png" />This page is available under the terms of the
-        <a rel="license" href="http://creativecommons.org/licenses/by/4.0/"> Creative Commons Attribution 4.0 International License</a>.</p>
+        <a rel="license" href="http://creativecommons.org/licenses/by/4.0/"> Creative Commons Attribution 4.0
+          International License</a>.</p>
       <br />
       <p class="fl_right">Website made by
-        <a target="_blank" href="https://junkjumper.github.io/" title="Free Website Templates">JunkJumper</a>
+        <a target="_blank" href="https://junkjumper.github.io/">JunkJumper</a>
       </p>
     </footer>
   </div>
 </body>
 
-</html>
+</html>

docs/index.html

@@ -14,13 +14,13 @@
     <header id="header" class="clear">
       <div id="hgroup">
         <a href="">
-          <img src="img/logo_slegpi.png" width="20%" />
+          <img src="img/logo_slegpi.png" width="20%" alt="logo" />
         </a>
       </div>
 <nav>
         <ul>
-          <li class="active">
+          <li>
-            <a href="" class="active">Homepage</a>
+            <a href="index.html" class="active">Homepage</a>
           </li>
           <li>
             <a href="about.html">About</a>
@@ -28,14 +28,17 @@
           <li>
             <a href="story.html">Story</a>
           </li>
+          <li>
+            <a href="license.html">License</a>
+          </li>
           <li>
             <a href="https://www.junkjumper-projects.com/_Project/slegpi/">Demo</a>
           </li>
           <li>
-            <a href="#">License</a>
+            <a href="https://github.com/JunkJumper/SLEGPI">Download on Github</a>
           </li>
           <li class="last">
-            <a href="https://github.com/JunkJumper/SLEGPI">Download on Github</a>
+            <a href="https://www.junkjumper-projects.com/#projects">Back to Projects List</a>
           </li>
         </ul>
       </nav>
@@ -71,7 +74,7 @@
               <br />
               <br />You don't want to miss them, alright ? ;)</p>
             <footer class="more">
-              <a href="#">Read More &raquo;</a>
+              <a href="story.html">Read More &raquo;</a>
             </footer>
           </article>
           <!-- Download the source code -->
@@ -82,7 +85,7 @@
               check them on the appropriate page.</p>
             <br />
             <footer class="more">
-              <a href="#">Read More &raquo;</a>
+              <a href="https://github.com/JunkJumper/SLEGPI">Read More &raquo;</a>
             </footer>
           </article>
         </section>
@@ -91,11 +94,10 @@
         <section class="fl_left1">
           <article class="clear">
             <figure>
-              <img src="img/profilepicture.jpg" />
+              <img src="https://www.junkjumper-projects.com/PPs/top-R_revertCADRE1.jpg" />
               <figcaption>
                 <br /><h2>Project of JunkJumper</h2>
-                <p>I'm a 18 years old student in informatic developpement. I like to tap anything on my keyboard to create something
+                <p>Hello ! I am JunkJumper, a 18 years old IT student and a brony. Bronies are supposed to overreact to anything, so i can success to everything to work. I have created this website to organise my github projects and showcase them.</p>
-                  new ! 👍</p>
               </figcaption>
             </figure>
           </article>
@@ -110,12 +112,12 @@
         <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">
           <img alt="Licence Creative Commons" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" />
         </a>
-        <img src="img/footer.png" />This page is available under the terms of the
+        <img src="img/footer.png" alt="footer"/>This page is available under the terms of the
         <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">
         Creative Commons Attribution 4.0 International License</a>.</p>
       <br />
       <p class="fl_right">Website made by
-        <a target="_blank" href="https://junkjumper.github.io/" title="Free Website Templates">JunkJumper</a>
+        <a target="_blank" href="https://junkjumper.github.io/">JunkJumper</a>
       </p>
     </footer>
   </div>

docs/license.html

@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html lang="en" dir="ltr">
+
+<head>
+  <title>SLEGPI</title>
+  <meta charset="UTF-8">
+  <link rel="stylesheet" href="styles/layout.css" type="text/css">
+  <link rel="stylesheet" href="styles/style.css" type="text/css">
+  <link rel="shortcut icon" href="/favicons/slegpi.ico" type="image/x-icon">
+  <link rel="icon" href="/favicons/slegpi.ico" type="image/x-icon">
+</head>
+
+<body>
+
+  <div class="wrapper row1">
+    <header id="header" class="clear">
+      <div id="hgroup">
+        <a href="index.html">
+          <img src="img/logo_slegpi.png" width="20%" />
+        </a>
+      </div>
+      <nav>
+        <ul>
+          <li>
+            <a href="index.html">Homepage</a>
+          </li>
+          <li>
+            <a href="about.html">About</a>
+          </li>
+          <li>
+            <a href="story.html">Story</a>
+          </li>
+          <li>
+            <a href="license.html" class="active">License</a>
+          </li>
+          <li>
+            <a href="https://www.junkjumper-projects.com/_Project/slegpi/">Demo</a>
+          </li>
+          <li>
+            <a href="https://github.com/JunkJumper/SLEGPI">Download on Github</a>
+          </li>
+          <li class="last">
+            <a href="https://www.junkjumper-projects.com/#projects">Back to Projects List</a>
+          </li>
+        </ul>
+      </nav>
+    </header>
+  </div>
+
+  <div class="wrapper row2">
+    <div id="container" class="clear">
+      <section id="slider">
+        <img src="img/website-resized.png" alt="wbesite" width="960px" height="360px" id="About">
+      </section>
+      <div id="content">
+        <section>
+          <article>
+            <h1>License</h1>
+            <p>The project was created using some softwares, here is the dedicated page to mention them.</p><br /><br />
+            <center>
+              <a href="https://en.wikipedia.org/wiki/HTML" target="_blank"><img src="img/icons/html5-plain.png" alt="Html 5" width="200px"></a>
+              <a href="https://en.wikipedia.org/wiki/Cascading_Style_Sheets" target="_blank"><img src="img/icons/css3-plain.png" alt="Css 3" width="200px"></a>
+              <a href="https://en.wikipedia.org/wiki/JavaScript" target="_blank"><img src="img/icons/javascript-original.png" alt="JavaScript" width="200px"></a><br /><br />
+              <a href="https://www.arduino.cc/" target="_blank"><img src="img/icons/Arduino_Logo.png" alt="Arduino" width="200px"></a>
+            </center>
+          </article>
+        </section>
+      </div>
+    </div>
+  </div>
+  <!-- Copyright -->
+  <div class="wrapper row4">
+    <footer id="footer" class="clear">
+      <p class="fl_left">
+        <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">
+          <img alt="Licence Creative Commons" style="border-width:0"
+            src="https://i.creativecommons.org/l/by/4.0/88x31.png" />
+        </a>
+        <img src="img/footer.png" alt="footer" />This page is available under the terms of the
+        <a rel="license" href="http://creativecommons.org/licenses/by/4.0/"> Creative Commons Attribution 4.0
+          International License</a>.</p>
+      <br />
+      <p class="fl_right">Website made by
+        <a target="_blank" href="https://junkjumper.github.io/">JunkJumper</a>
+      </p>
+    </footer>
+  </div>
+</body>
+
+</html>

docs/story.html

@@ -21,23 +21,26 @@
       </div>
       <nav>
         <ul>
-          <li class="active">
+          <li>
             <a href="index.html">Homepage</a>
           </li>
           <li>
             <a href="about.html">About</a>
           </li>
           <li>
-            <a href="" class="active">Story</a>
+            <a href="story.html" class="active">Story</a>
+          </li>
+          <li>
+            <a href="license.html">License</a>
           </li>
           <li>
             <a href="https://www.junkjumper-projects.com/_Project/slegpi/">Demo</a>
           </li>
           <li>
-            <a href="#">License</a>
+            <a href="https://github.com/JunkJumper/SLEGPI">Download on Github</a>
           </li>
           <li class="last">
-            <a href="https://github.com/JunkJumper/SLEGPI">Download on Github</a>
+            <a href="https://www.junkjumper-projects.com/#projects">Back to Projects List</a>
           </li>
         </ul>
       </nav>
@@ -74,7 +77,7 @@
         <a rel="license" href="http://creativecommons.org/licenses/by/4.0/"> Creative Commons Attribution 4.0 International License</a>.</p>
       <br />
       <p class="fl_right">Website made by
-        <a target="_blank" href="https://junkjumper.github.io/" title="Free Website Templates">JunkJumper</a>
+        <a target="_blank" href="https://junkjumper.github.io/">JunkJumper</a>
       </p>
     </footer>
   </div>