Signed-off-by: letherman255 <[email protected]>

Author: letherman255

Arduino USBSerial.inf

@@ -0,0 +1,106 @@
+;************************************************************
+; Windows USB CDC ACM Setup File
+; Copyright (c) 2000 Microsoft Corporation
+
+
+[Version]
+Signature="$Windows NT$"
+Class=Ports
+ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
+Provider=%MFGNAME%
+LayoutFile=layout.inf
+CatalogFile=%MFGFILENAME%.cat
+DriverVer=11/15/2007,5.1.2600.0
+
+[Manufacturer]
+%MFGNAME%=DeviceList, NTamd64
+
+[DestinationDirs]
+DefaultDestDir=12
+
+
+;------------------------------------------------------------------------------
+;  Windows 2000/XP/Vista-32bit Sections
+;------------------------------------------------------------------------------
+
+[DriverInstall.nt]
+include=mdmcpq.inf
+CopyFiles=DriverCopyFiles.nt
+AddReg=DriverInstall.nt.AddReg
+
+[DriverCopyFiles.nt]
+usbser.sys,,,0x20
+
+[DriverInstall.nt.AddReg]
+HKR,,DevLoader,,*ntkern
+HKR,,NTMPDriver,,%DRIVERFILENAME%.sys
+HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
+
+[DriverInstall.nt.Services]
+AddService=usbser, 0x00000002, DriverService.nt
+
+[DriverService.nt]
+DisplayName=%SERVICE%
+ServiceType=1
+StartType=3
+ErrorControl=1
+ServiceBinary=%12%\%DRIVERFILENAME%.sys
+
+;------------------------------------------------------------------------------
+;  Vista-64bit Sections
+;------------------------------------------------------------------------------
+
+[DriverInstall.NTamd64]
+include=mdmcpq.inf
+CopyFiles=DriverCopyFiles.NTamd64
+AddReg=DriverInstall.NTamd64.AddReg
+
+[DriverCopyFiles.NTamd64]
+%DRIVERFILENAME%.sys,,,0x20
+
+[DriverInstall.NTamd64.AddReg]
+HKR,,DevLoader,,*ntkern
+HKR,,NTMPDriver,,%DRIVERFILENAME%.sys
+HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
+
+[DriverInstall.NTamd64.Services]
+AddService=usbser, 0x00000002, DriverService.NTamd64
+
+[DriverService.NTamd64]
+DisplayName=%SERVICE%
+ServiceType=1
+StartType=3
+ErrorControl=1
+ServiceBinary=%12%\%DRIVERFILENAME%.sys
+
+
+;------------------------------------------------------------------------------
+;  Vendor and Product ID Definitions
+;------------------------------------------------------------------------------
+; When developing your USB device, the VID and PID used in the PC side
+; application program and the firmware on the microcontroller must match.
+; Modify the below line to use your VID and PID.  Use the format as shown below.
+; Note: One INF file can be used for multiple devices with different VID and PIDs.
+; For each supported device, append ",USB\VID_xxxx&PID_yyyy" to the end of the line.
+;------------------------------------------------------------------------------
+[SourceDisksFiles]
+[SourceDisksNames]
+[DeviceList]
+%DESCRIPTION%=DriverInstall, USB\VID_2341&PID_003B
+
+[DeviceList.NTamd64]
+%DESCRIPTION%=DriverInstall, USB\VID_2341&PID_003B
+
+
+;------------------------------------------------------------------------------
+;  String Definitions
+;------------------------------------------------------------------------------
+;Modify these strings to customize your device
+;------------------------------------------------------------------------------
+[Strings]
+MFGFILENAME="CDC_vista"
+DRIVERFILENAME ="usbser"
+MFGNAME="Arduino LLC (www.arduino.cc)"
+INSTDISK="Arduino USBSerial Driver Installer"
+DESCRIPTION="Arduino UNO"
+SERVICE="USB RS-232 Emulation Driver"

Programation/WebContent/WEB-INF/classes/.gitignore

@@ -0,0 +1,2 @@
+/com/
+/fr/

pro/build/classes/fr/mcnanotech/configloader/SettingsLoader.class

@@ -1,6 +1,7 @@
 package fr.mcnanotech.gpio;
 
 import java.io.IOException;
+import java.util.Random;
 
 import com.pi4j.io.i2c.I2CBus;
 import com.pi4j.io.i2c.I2CDevice;
@@ -13,23 +14,20 @@ public class I2CTransfer
     private static I2CDevice arduino;
     private static boolean isI2Cinit = false;
     private static Lcd lcd;
-
     public static void initI2C(String raspberry) throws IOException
     {
         if(raspberry.equals("true"))
         {
             final I2CBus bus = I2CFactory.getInstance(I2CBus.BUS_1);
-           
-                if(bus != null)
-                {
-                    arduino = bus.getDevice(1);
-                }
-                else
-                {
-                    System.err.println("Arduino not found on the i2c bus.");
-                }
-                isI2Cinit = true;
-            
+
+            if(bus != null)
+            {
+                arduino = bus.getDevice(10);
+            }
+            else
+            {
+                System.err.println("Arduino not found on the i2c bus.");
+            }
 
             try
             {
@@ -40,16 +38,18 @@ public static void initI2C(String raspberry) throws IOException
             {
                 e.printStackTrace();
             }
-
+            System.out.println("l'écran est null ? " + Boolean.valueOf(lcd == null));
+            isI2Cinit = true;
         }
         else
         {
             System.out.println("The server is not launched on a raspberry pi, disabling the I2C");
         }
     }
 
-    public static void setState(int arduinoAddress, int controller, boolean state) throws IOException
+    public static void setState(int offset, int controller, boolean state) throws IOException
     {
+        offset = offset * 10;
         if(isI2Cinit)
         {
             switch(controller)
@@ -58,47 +58,47 @@ public static void setState(int arduinoAddress, int controller, boolean state) t
                 {
                     if(state)
                     {
-                        arduino.write((byte)10);
+                        arduino.write((byte)(offset + 20));
                     }
                     else
                     {
-                        arduino.write((byte)0);
+                        arduino.write((byte)(offset + 21));
                     }
                     break;
                 }
                 case 1:
                 {
                     if(state)
                     {
-                        arduino.write((byte)11);
+                        arduino.write((byte)(offset + 22));
                     }
                     else
                     {
-                        arduino.write((byte)1);
+                        arduino.write((byte)(offset + 23));
                     }
                     break;
                 }
                 case 2:
                 {
                     if(state)
                     {
-                        arduino.write((byte)12);
+                        arduino.write((byte)(offset + 24));
                     }
                     else
                     {
-                        arduino.write((byte)2);
+                        arduino.write((byte)(offset + 25));
                     }
                     break;
                 }
                 case 3:
                 {
                     if(state)
                     {
-                        arduino.write((byte)13);
+                        arduino.write((byte)(offset + 26));
                     }
                     else
                     {
-                        arduino.write((byte)3);
+                        arduino.write((byte)(offset + 27));
                     }
                     break;
                 }
@@ -107,20 +107,49 @@ public static void setState(int arduinoAddress, int controller, boolean state) t
         }
     }
 
-    public static void writeName()
+    public static void initLCD()
     {
         if(isI2Cinit)
         {
+            lcd.setBacklight(Lcd.BACKLIGHT_RED);
             lcd.write("      GAM      ");
         }
     }
 
+    public static void updateSignal(SystemStatus st)
+    {
+        try
+        {
+            arduino.write((byte)10);
+        }
+        catch(IOException e)
+        {
+            e.printStackTrace();
+        }
+    }
+
     public static void updateLcd(SystemStatus st)
     {
-        // lcd.clear();
-        // lcd.write(" Utilisation :  ");
-        // lcd.setCursorPosition(0, 2);
-        // lcd.write(Integer.toString(st.getSystemUsage()));
+        lcd.setCursorHome();
+        lcd.clear();
+        lcd.write("credit : " + String.valueOf(st.getDailyCredit()));
+        lcd.setCursorPosition(1, 0);
+        lcd.write("suivant : " + String.valueOf(st.getNextSystem()));
+
+    }
 
+    public static void systemOnline()
+    {
+        if(isI2Cinit)
+        {
+            try
+            {
+                arduino.write((byte)1);
+            }
+            catch(IOException e)
+            {
+                e.printStackTrace();
+            }
+        }
     }
 }

pro/build/classes/fr/mcnanotech/dao/DAOUtil.class

@@ -31,6 +31,7 @@ public void run()
         systemparam = settingsloader.loadParams(systemparam);
         settingsloader.saveParamChanges(systemparam);
 
+        System.out.println("démarrage ....................");
         try
         {
             I2CTransfer.initI2C(systemparam.getRaspberry());
@@ -46,7 +47,9 @@ public void run()
         long t = (System.currentTimeMillis() / TIME_BASE);
         long tp = t + 1;
 
-        I2CTransfer.writeName();
+        I2CTransfer.initLCD();
+        
+        I2CTransfer.systemOnline();
 
         while(true)
         {
@@ -63,6 +66,7 @@ public void run()
                     SystemClock.fullTick(st, userDao);
                 }
                 I2CTransfer.updateLcd(st);
+                I2CTransfer.updateSignal(st);
                 tp = t + 1;
             }