Moved newly introduced directory in its proper directory

salvestrini · Apr 17, 2011 · d1e7609 · d1e7609
1 parent c1da27d
commit d1e7609
Show file tree

Hide file tree

Showing 20 changed files with 12 additions and 4 deletions.
diff --git a/libs/Core/WString.cpp b/libs/Core/WString.cpp
@@ -417,7 +417,7 @@ String String::trim() const
   return temp.substring( i, j + 1);
 }
 
-void String::getBytes(unsigned char *buf, unsigned int bufsize)
+void String::getBytes(unsigned char *buf, unsigned int bufsize) const
 {
   if (!bufsize || !buf) return;
   unsigned int len = bufsize - 1;
@@ -426,7 +426,7 @@ void String::getBytes(unsigned char *buf, unsigned int bufsize)
   buf[len] = 0;
 }
 
-void String::toCharArray(char *buf, unsigned int bufsize)
+void String::toCharArray(char *buf, unsigned int bufsize) const
 {
   if (!bufsize || !buf) return;
   unsigned int len = bufsize - 1;

diff --git a/libs/Core/WString.h b/libs/Core/WString.h
@@ -76,8 +76,8 @@ class String
     String toLowerCase( ) const;
     String toUpperCase( ) const;
     String trim( ) const;
-    void getBytes(unsigned char *buf, unsigned int bufsize);
-    void toCharArray(char *buf, unsigned int bufsize);
+    void getBytes(unsigned char *buf, unsigned int bufsize) const;
+    void toCharArray(char *buf, unsigned int bufsize) const;
     const String& concat( const String &str );
     String replace( char oldChar, char newChar );
     String replace( const String& match, const String& replace );

diff --git a/src/USBHost/CMakeLists.txt b/src/USBHost/CMakeLists.txt
@@ -0,0 +1,8 @@
+message(STATUS "Including ${CMAKE_CURRENT_LIST_FILE}")
+
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/Core)
+include_directories(${ArduinoCode_BINARY_DIR}/libs/Core)
+
+add_library(EEPROM STATIC
+  EEPROM.cpp
+)
diff --git a/libs/USBHost/Max3421e.cpp → src/USBHost/Max3421e.cpp b/libs/USBHost/Max3421e.cpp → src/USBHost/Max3421e.cpp
diff --git a/libs/USBHost/Max3421e.h → src/USBHost/Max3421e.h b/libs/USBHost/Max3421e.h → src/USBHost/Max3421e.h
diff --git a/libs/USBHost/Max3421e_constants.h → src/USBHost/Max3421e_constants.h b/libs/USBHost/Max3421e_constants.h → src/USBHost/Max3421e_constants.h
diff --git a/libs/USBHost/Max_LCD.cpp → src/USBHost/Max_LCD.cpp b/libs/USBHost/Max_LCD.cpp → src/USBHost/Max_LCD.cpp
diff --git a/libs/USBHost/Max_LCD.h → src/USBHost/Max_LCD.h b/libs/USBHost/Max_LCD.h → src/USBHost/Max_LCD.h
diff --git a/libs/USBHost/README → src/USBHost/README b/libs/USBHost/README → src/USBHost/README
diff --git a/libs/USBHost/Usb.cpp → src/USBHost/Usb.cpp b/libs/USBHost/Usb.cpp → src/USBHost/Usb.cpp
diff --git a/libs/USBHost/Usb.h → src/USBHost/Usb.h b/libs/USBHost/Usb.h → src/USBHost/Usb.h
diff --git a/libs/USBHost/ch9.h → src/USBHost/ch9.h b/libs/USBHost/ch9.h → src/USBHost/ch9.h
diff --git a/libs/USBHost/examples/LCDkbd.pde → src/USBHost/examples/LCDkbd.pde b/libs/USBHost/examples/LCDkbd.pde → src/USBHost/examples/LCDkbd.pde
diff --git a/libs/USBHost/examples/PS3LCD.pde → src/USBHost/examples/PS3LCD.pde b/libs/USBHost/examples/PS3LCD.pde → src/USBHost/examples/PS3LCD.pde
diff --git a/libs/USBHost/examples/arm_mouse.pde → src/USBHost/examples/arm_mouse.pde b/libs/USBHost/examples/arm_mouse.pde → src/USBHost/examples/arm_mouse.pde
diff --git a/.../USBHost/examples/board_test/board_test.h → src/USBHost/examples/board_test/board_test.h b/.../USBHost/examples/board_test/board_test.h → src/USBHost/examples/board_test/board_test.h
diff --git a/...SBHost/examples/board_test/board_test.pde → ...SBHost/examples/board_test/board_test.pde b/...SBHost/examples/board_test/board_test.pde → ...SBHost/examples/board_test/board_test.pde
diff --git a/libs/USBHost/examples/conf_descr_dump.pde → src/USBHost/examples/conf_descr_dump.pde b/libs/USBHost/examples/conf_descr_dump.pde → src/USBHost/examples/conf_descr_dump.pde
diff --git a/...les/descriptor_parser/descriptor_parser.h → ...les/descriptor_parser/descriptor_parser.h b/...les/descriptor_parser/descriptor_parser.h → ...les/descriptor_parser/descriptor_parser.h
diff --git a/...s/descriptor_parser/descriptor_parser.pde → ...s/descriptor_parser/descriptor_parser.pde b/...s/descriptor_parser/descriptor_parser.pde → ...s/descriptor_parser/descriptor_parser.pde