idk

ArendJan · Aug 10, 2016 · 31e629f · 31e629f
1 parent 388aaac
commit 31e629f
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 3 deletions.
diff --git a/ArduinoWiFi/app/src/main/java/tk/arendjan/arduinowifi/MainActivity.java b/ArduinoWiFi/app/src/main/java/tk/arendjan/arduinowifi/MainActivity.java
@@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-
+        new RequestTask().execute("http://svshizzle.com/test/getStatement.php?test=klopt", "1");
 
         //This gets the saved IP address, and puts it in the variable, if not set, then it starts the Setting activity.
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
@@ -60,6 +60,7 @@ public void onClick(View v) {
         get.setOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View v){
+                new RequestTask().execute("http://192.168.2.103/?helloworld", "1");
                 new RequestTask().execute(ip + "GET", "1"); //Change the "GET" string to a string that is checked by the Arduino.
                 //The "1" is for the correct textview, if you have more than 1,
                 // you can set the correct destination of the output, or what has to be done with it.

diff --git a/LinkItBoom/Arduino Sketch/WifiWebServerMetMuziek/WifiWebServerMetMuziek.ino b/LinkItBoom/Arduino Sketch/WifiWebServerMetMuziek/WifiWebServerMetMuziek.ino
@@ -26,6 +26,8 @@ int counter;              //for in the setup, and used also in nextsong
 boolean pauseBool = false;//If the music is paused
 void setup()
 {
+  Serial.begin(115200);
+  Serial.println("asdfasdfasdf");
   previousState = 10;//this is the variable used for storing the current audiostatus, because getStatus contains a bug....
   pinMode(13, OUTPUT);    //IDK why this doesn't work, but the led doesn't change.
   LAudio.begin();         //Start the audio
@@ -43,6 +45,7 @@ void setup()
     while (myFile.available()) {
       int i = myFile.read();  //Some voodoo to make sure the character is added to the fileread var, without this, the ascii number is added(C logic)
       char c = char(i);
+      Serial.print(c);
       fileread = fileread + c;
       if (fileread.endsWith("mp3 ")) {//Found a song ( the text file is: "asdf.mp3<space>asdf2.mp3<space>" )
         fileread.remove(fileread.length() - 1);//Remove the <space>

diff --git a/LinkItBoom/LinkItBoomMakelist/LinkItBoomMakelist/Program.cs b/LinkItBoom/LinkItBoomMakelist/LinkItBoomMakelist/Program.cs
@@ -23,8 +23,8 @@ static void Main(string[] args)
 
                 foreach (string x in filePaths)
                 {
-                    lines = lines + x.Remove(0, path.Length + 1) + " ";
-                    Console.WriteLine(x.Remove(0, path.Length + 1));
+                    lines = lines + x.Remove(0, path.Length) + " ";
+                    Console.WriteLine(x.Remove(0, path.Length).Replace("/", "").Replace("\\", ""));
 
                     //file.WriteLine(x.Remove(0, path.Length + 1));
 

diff --git a/LinkItBoom/LinkItBoomMakelist/LinkItBoomMakelist/bin/Debug/LinkItBoomMakelist.exe b/LinkItBoom/LinkItBoomMakelist/LinkItBoomMakelist/bin/Debug/LinkItBoomMakelist.exe
diff --git a/LinkItBoom/LinkItBoomMakelist/LinkItBoomMakelist/bin/Debug/LinkItBoomMakelist.pdb b/LinkItBoom/LinkItBoomMakelist/LinkItBoomMakelist/bin/Debug/LinkItBoomMakelist.pdb
diff --git a/...tBoomMakelist/LinkItBoomMakelist/obj/Debug/LinkItBoomMakelist.csproj.FileListAbsolute.txt b/...tBoomMakelist/LinkItBoomMakelist/obj/Debug/LinkItBoomMakelist.csproj.FileListAbsolute.txt
@@ -4,3 +4,9 @@ C:\Users\user\Documents\Visual Studio 2015\Projects\LinkItBoomMakelist\LinkItBoo
 C:\Users\user\Documents\Visual Studio 2015\Projects\LinkItBoomMakelist\LinkItBoomMakelist\obj\Debug\LinkItBoomMakelist.csprojResolveAssemblyReference.cache
 C:\Users\user\Documents\Visual Studio 2015\Projects\LinkItBoomMakelist\LinkItBoomMakelist\obj\Debug\LinkItBoomMakelist.exe
 C:\Users\user\Documents\Visual Studio 2015\Projects\LinkItBoomMakelist\LinkItBoomMakelist\obj\Debug\LinkItBoomMakelist.pdb
+C:\Users\user\Documents\GitHub\Projects\LinkItBoom\LinkItBoomMakelist\LinkItBoomMakelist\bin\Debug\LinkItBoomMakelist.exe.config
+C:\Users\user\Documents\GitHub\Projects\LinkItBoom\LinkItBoomMakelist\LinkItBoomMakelist\bin\Debug\LinkItBoomMakelist.exe
+C:\Users\user\Documents\GitHub\Projects\LinkItBoom\LinkItBoomMakelist\LinkItBoomMakelist\bin\Debug\LinkItBoomMakelist.pdb
+C:\Users\user\Documents\GitHub\Projects\LinkItBoom\LinkItBoomMakelist\LinkItBoomMakelist\obj\Debug\LinkItBoomMakelist.csprojResolveAssemblyReference.cache
+C:\Users\user\Documents\GitHub\Projects\LinkItBoom\LinkItBoomMakelist\LinkItBoomMakelist\obj\Debug\LinkItBoomMakelist.exe
+C:\Users\user\Documents\GitHub\Projects\LinkItBoom\LinkItBoomMakelist\LinkItBoomMakelist\obj\Debug\LinkItBoomMakelist.pdb
diff --git a/...list/LinkItBoomMakelist/obj/Debug/LinkItBoomMakelist.csprojResolveAssemblyReference.cache b/...list/LinkItBoomMakelist/obj/Debug/LinkItBoomMakelist.csprojResolveAssemblyReference.cache
diff --git a/LinkItBoom/LinkItBoomMakelist/LinkItBoomMakelist/obj/Debug/LinkItBoomMakelist.exe b/LinkItBoom/LinkItBoomMakelist/LinkItBoomMakelist/obj/Debug/LinkItBoomMakelist.exe
diff --git a/LinkItBoom/LinkItBoomMakelist/LinkItBoomMakelist/obj/Debug/LinkItBoomMakelist.pdb b/LinkItBoom/LinkItBoomMakelist/LinkItBoomMakelist/obj/Debug/LinkItBoomMakelist.pdb