Rearranged libs directory

salvestrini · Mar 22, 2011 · 0e8929b · 0e8929b
1 parent 4d83c58
commit 0e8929b
Show file tree

Hide file tree

Showing 151 changed files with 129 additions and 135 deletions.
diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
@@ -1,4 +1,14 @@
 message(STATUS "Including ${CMAKE_CURRENT_LIST_FILE}")
 
-add_subdirectory(core)
-add_subdirectory(libraries)
+add_subdirectory(Core)
+add_subdirectory(EEPROM)
+add_subdirectory(Ethernet)
+add_subdirectory(Firmata)
+add_subdirectory(LiquidCrystal)
+add_subdirectory(Matrix)
+add_subdirectory(SPI)
+add_subdirectory(Servo)
+add_subdirectory(SoftwareSerial)
+add_subdirectory(Sprite)
+add_subdirectory(Stepper)
+add_subdirectory(Wire)
diff --git a/libs/core/.gitignore → libs/Core/.gitignore b/libs/core/.gitignore → libs/Core/.gitignore
diff --git a/libs/core/CMakeLists.txt → libs/Core/CMakeLists.txt b/libs/core/CMakeLists.txt → libs/Core/CMakeLists.txt
@@ -6,8 +6,8 @@ check_include_file(util/delay.h HAVE_UTIL_DELAY_H)
 check_include_file(avr/delay.h  HAVE_AVR_DELAY_H)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
-include_directories(${ArduinoCode_SOURCE_DIR}/libs/core)
-include_directories(${ArduinoCode_BINARY_DIR}/libs/core)
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/Core)
+include_directories(${ArduinoCode_BINARY_DIR}/libs/Core)
 
 add_library(core STATIC
   HardwareSerial.cpp

diff --git a/libs/core/HardwareSerial.cpp → libs/Core/HardwareSerial.cpp b/libs/core/HardwareSerial.cpp → libs/Core/HardwareSerial.cpp
diff --git a/libs/core/HardwareSerial.h → libs/Core/HardwareSerial.h b/libs/core/HardwareSerial.h → libs/Core/HardwareSerial.h
diff --git a/libs/core/Print.cpp → libs/Core/Print.cpp b/libs/core/Print.cpp → libs/Core/Print.cpp
diff --git a/libs/core/Print.h → libs/Core/Print.h b/libs/core/Print.h → libs/Core/Print.h
diff --git a/libs/core/Stream.h → libs/Core/Stream.h b/libs/core/Stream.h → libs/Core/Stream.h
diff --git a/libs/core/Tone.cpp → libs/Core/Tone.cpp b/libs/core/Tone.cpp → libs/Core/Tone.cpp
diff --git a/libs/core/WConstants.h → libs/Core/WConstants.h b/libs/core/WConstants.h → libs/Core/WConstants.h
diff --git a/libs/core/WInterrupts.c → libs/Core/WInterrupts.c b/libs/core/WInterrupts.c → libs/Core/WInterrupts.c
diff --git a/libs/core/WMath.cpp → libs/Core/WMath.cpp b/libs/core/WMath.cpp → libs/Core/WMath.cpp
diff --git a/libs/core/WProgram.h → libs/Core/WProgram.h b/libs/core/WProgram.h → libs/Core/WProgram.h
diff --git a/libs/core/WString.cpp → libs/Core/WString.cpp b/libs/core/WString.cpp → libs/Core/WString.cpp
diff --git a/libs/core/WString.h → libs/Core/WString.h b/libs/core/WString.h → libs/Core/WString.h
diff --git a/libs/core/binary.h → libs/Core/binary.h b/libs/core/binary.h → libs/Core/binary.h
diff --git a/libs/core/config.h.in → libs/Core/config.h.in b/libs/core/config.h.in → libs/Core/config.h.in
diff --git a/libs/core/main.cpp → libs/Core/main.cpp b/libs/core/main.cpp → libs/Core/main.cpp
diff --git a/libs/core/pins_arduino.c → libs/Core/pins_arduino.c b/libs/core/pins_arduino.c → libs/Core/pins_arduino.c
diff --git a/libs/core/pins_arduino.h → libs/Core/pins_arduino.h b/libs/core/pins_arduino.h → libs/Core/pins_arduino.h
diff --git a/libs/core/wiring.c → libs/Core/wiring.c b/libs/core/wiring.c → libs/Core/wiring.c
diff --git a/libs/core/wiring.h → libs/Core/wiring.h b/libs/core/wiring.h → libs/Core/wiring.h
diff --git a/libs/core/wiring_analog.c → libs/Core/wiring_analog.c b/libs/core/wiring_analog.c → libs/Core/wiring_analog.c
diff --git a/libs/core/wiring_digital.c → libs/Core/wiring_digital.c b/libs/core/wiring_digital.c → libs/Core/wiring_digital.c
diff --git a/libs/core/wiring_private.h → libs/Core/wiring_private.h b/libs/core/wiring_private.h → libs/Core/wiring_private.h
diff --git a/libs/core/wiring_pulse.c → libs/Core/wiring_pulse.c b/libs/core/wiring_pulse.c → libs/Core/wiring_pulse.c
diff --git a/libs/core/wiring_shift.c → libs/Core/wiring_shift.c b/libs/core/wiring_shift.c → libs/Core/wiring_shift.c
diff --git a/libs/EEPROM/CMakeLists.txt b/libs/EEPROM/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/libraries/EEPROM/EEPROM.cpp → libs/EEPROM/EEPROM.cpp b/libs/libraries/EEPROM/EEPROM.cpp → libs/EEPROM/EEPROM.cpp
diff --git a/libs/libraries/EEPROM/EEPROM.h → libs/EEPROM/EEPROM.h b/libs/libraries/EEPROM/EEPROM.h → libs/EEPROM/EEPROM.h
diff --git a/...OM/examples/eeprom_clear/eeprom_clear.pde → ...OM/examples/eeprom_clear/eeprom_clear.pde b/...OM/examples/eeprom_clear/eeprom_clear.pde → ...OM/examples/eeprom_clear/eeprom_clear.pde
diff --git a/...PROM/examples/eeprom_read/eeprom_read.pde → ...PROM/examples/eeprom_read/eeprom_read.pde b/...PROM/examples/eeprom_read/eeprom_read.pde → ...PROM/examples/eeprom_read/eeprom_read.pde
diff --git a/...OM/examples/eeprom_write/eeprom_write.pde → ...OM/examples/eeprom_write/eeprom_write.pde b/...OM/examples/eeprom_write/eeprom_write.pde → ...OM/examples/eeprom_write/eeprom_write.pde
diff --git a/libs/libraries/EEPROM/keywords.txt → libs/EEPROM/keywords.txt b/libs/libraries/EEPROM/keywords.txt → libs/EEPROM/keywords.txt
diff --git a/libs/Ethernet/CMakeLists.txt b/libs/Ethernet/CMakeLists.txt
@@ -0,0 +1,13 @@
+message(STATUS "Including ${CMAKE_CURRENT_LIST_FILE}")
+
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/Core)
+include_directories(${ArduinoCode_BINARY_DIR}/libs/Core)
+
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/SPI)
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/Ethernet/utility)
+
+add_library(Ethernet STATIC
+  Client.cpp
+  Server.cpp
+  Udp.cpp
+)
diff --git a/libs/libraries/Ethernet/Client.cpp → libs/Ethernet/Client.cpp b/libs/libraries/Ethernet/Client.cpp → libs/Ethernet/Client.cpp
diff --git a/libs/libraries/Ethernet/Client.h → libs/Ethernet/Client.h b/libs/libraries/Ethernet/Client.h → libs/Ethernet/Client.h
diff --git a/libs/libraries/Ethernet/Ethernet.cpp → libs/Ethernet/Ethernet.cpp b/libs/libraries/Ethernet/Ethernet.cpp → libs/Ethernet/Ethernet.cpp
diff --git a/libs/libraries/Ethernet/Ethernet.h → libs/Ethernet/Ethernet.h b/libs/libraries/Ethernet/Ethernet.h → libs/Ethernet/Ethernet.h
diff --git a/libs/libraries/Ethernet/Server.cpp → libs/Ethernet/Server.cpp b/libs/libraries/Ethernet/Server.cpp → libs/Ethernet/Server.cpp
diff --git a/libs/libraries/Ethernet/Server.h → libs/Ethernet/Server.h b/libs/libraries/Ethernet/Server.h → libs/Ethernet/Server.h
diff --git a/libs/libraries/Ethernet/Udp.cpp → libs/Ethernet/Udp.cpp b/libs/libraries/Ethernet/Udp.cpp → libs/Ethernet/Udp.cpp
diff --git a/libs/libraries/Ethernet/Udp.h → libs/Ethernet/Udp.h b/libs/libraries/Ethernet/Udp.h → libs/Ethernet/Udp.h
diff --git a/...WebServer/BarometricPressureWebServer.pde → ...WebServer/BarometricPressureWebServer.pde b/...WebServer/BarometricPressureWebServer.pde → ...WebServer/BarometricPressureWebServer.pde
diff --git a/...hernet/examples/ChatServer/ChatServer.pde → ...hernet/examples/ChatServer/ChatServer.pde b/...hernet/examples/ChatServer/ChatServer.pde → ...hernet/examples/ChatServer/ChatServer.pde
diff --git a/.../examples/PachubeClient/PachubeClient.pde → .../examples/PachubeClient/PachubeClient.pde b/.../examples/PachubeClient/PachubeClient.pde → .../examples/PachubeClient/PachubeClient.pde
diff --git a/...chubeClientString/PachubeClientString.pde → ...chubeClientString/PachubeClientString.pde b/...chubeClientString/PachubeClientString.pde → ...chubeClientString/PachubeClientString.pde
diff --git a/...et/examples/TelnetClient/TelnetClient.pde → ...et/examples/TelnetClient/TelnetClient.pde b/...et/examples/TelnetClient/TelnetClient.pde → ...et/examples/TelnetClient/TelnetClient.pde
diff --git a/...endReceiveString/UDPSendReceiveString.pde → ...endReceiveString/UDPSendReceiveString.pde b/...endReceiveString/UDPSendReceiveString.pde → ...endReceiveString/UDPSendReceiveString.pde
diff --git a/...et/examples/UdpNtpClient/UdpNtpClient.pde → ...et/examples/UdpNtpClient/UdpNtpClient.pde b/...et/examples/UdpNtpClient/UdpNtpClient.pde → ...et/examples/UdpNtpClient/UdpNtpClient.pde
diff --git a/...Ethernet/examples/WebClient/WebClient.pde → ...Ethernet/examples/WebClient/WebClient.pde b/...Ethernet/examples/WebClient/WebClient.pde → ...Ethernet/examples/WebClient/WebClient.pde
diff --git a/...Ethernet/examples/WebServer/WebServer.pde → ...Ethernet/examples/WebServer/WebServer.pde b/...Ethernet/examples/WebServer/WebServer.pde → ...Ethernet/examples/WebServer/WebServer.pde
diff --git a/libs/libraries/Ethernet/keywords.txt → libs/Ethernet/keywords.txt b/libs/libraries/Ethernet/keywords.txt → libs/Ethernet/keywords.txt
diff --git a/libs/libraries/Ethernet/utility/socket.cpp → libs/Ethernet/utility/socket.cpp b/libs/libraries/Ethernet/utility/socket.cpp → libs/Ethernet/utility/socket.cpp
diff --git a/libs/libraries/Ethernet/utility/socket.h → libs/Ethernet/utility/socket.h b/libs/libraries/Ethernet/utility/socket.h → libs/Ethernet/utility/socket.h
diff --git a/libs/libraries/Ethernet/utility/w5100.cpp → libs/Ethernet/utility/w5100.cpp b/libs/libraries/Ethernet/utility/w5100.cpp → libs/Ethernet/utility/w5100.cpp
diff --git a/libs/libraries/Ethernet/utility/w5100.h → libs/Ethernet/utility/w5100.h b/libs/libraries/Ethernet/utility/w5100.h → libs/Ethernet/utility/w5100.h
diff --git a/libs/libraries/Firmata/Boards.h → libs/Firmata/Boards.h b/libs/libraries/Firmata/Boards.h → libs/Firmata/Boards.h
diff --git a/libs/Firmata/CMakeLists.txt b/libs/Firmata/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(Firmata STATIC
+  Firmata.cpp
+)
diff --git a/libs/libraries/Firmata/Firmata.cpp → libs/Firmata/Firmata.cpp b/libs/libraries/Firmata/Firmata.cpp → libs/Firmata/Firmata.cpp
diff --git a/libs/libraries/Firmata/Firmata.h → libs/Firmata/Firmata.h b/libs/libraries/Firmata/Firmata.h → libs/Firmata/Firmata.h
diff --git a/libs/libraries/Firmata/LICENSE.txt → libs/Firmata/LICENSE.txt b/libs/libraries/Firmata/LICENSE.txt → libs/Firmata/LICENSE.txt
diff --git a/libs/libraries/Firmata/TODO.txt → libs/Firmata/TODO.txt b/libs/libraries/Firmata/TODO.txt → libs/Firmata/TODO.txt
diff --git a/...les/AllInputsFirmata/AllInputsFirmata.pde → ...les/AllInputsFirmata/AllInputsFirmata.pde b/...les/AllInputsFirmata/AllInputsFirmata.pde → ...les/AllInputsFirmata/AllInputsFirmata.pde
diff --git a/.../examples/AnalogFirmata/AnalogFirmata.pde → .../examples/AnalogFirmata/AnalogFirmata.pde b/.../examples/AnalogFirmata/AnalogFirmata.pde → .../examples/AnalogFirmata/AnalogFirmata.pde
diff --git a/...s/Firmata/examples/AnalogFirmata/Makefile → libs/Firmata/examples/AnalogFirmata/Makefile b/...s/Firmata/examples/AnalogFirmata/Makefile → libs/Firmata/examples/AnalogFirmata/Makefile
diff --git a/...irmata/examples/EchoString/EchoString.pde → ...irmata/examples/EchoString/EchoString.pde b/...irmata/examples/EchoString/EchoString.pde → ...irmata/examples/EchoString/EchoString.pde
diff --git a/...ries/Firmata/examples/EchoString/Makefile → libs/Firmata/examples/EchoString/Makefile b/...ries/Firmata/examples/EchoString/Makefile → libs/Firmata/examples/EchoString/Makefile
diff --git a/...irmata/examples/I2CFirmata/I2CFirmata.pde → ...irmata/examples/I2CFirmata/I2CFirmata.pde b/...irmata/examples/I2CFirmata/I2CFirmata.pde → ...irmata/examples/I2CFirmata/I2CFirmata.pde
diff --git a/...a/examples/OldStandardFirmata/LICENSE.txt → ...a/examples/OldStandardFirmata/LICENSE.txt b/...a/examples/OldStandardFirmata/LICENSE.txt → ...a/examples/OldStandardFirmata/LICENSE.txt
diff --git a/...OldStandardFirmata/OldStandardFirmata.pde → ...OldStandardFirmata/OldStandardFirmata.pde b/...OldStandardFirmata/OldStandardFirmata.pde → ...OldStandardFirmata/OldStandardFirmata.pde
diff --git a/...es/Firmata/examples/ServoFirmata/Makefile → libs/Firmata/examples/ServoFirmata/Makefile b/...es/Firmata/examples/ServoFirmata/Makefile → libs/Firmata/examples/ServoFirmata/Makefile
diff --git a/...ta/examples/ServoFirmata/ServoFirmata.pde → ...ta/examples/ServoFirmata/ServoFirmata.pde b/...ta/examples/ServoFirmata/ServoFirmata.pde → ...ta/examples/ServoFirmata/ServoFirmata.pde
diff --git a/...ata/examples/SimpleAnalogFirmata/Makefile → ...ata/examples/SimpleAnalogFirmata/Makefile b/...ata/examples/SimpleAnalogFirmata/Makefile → ...ata/examples/SimpleAnalogFirmata/Makefile
diff --git a/...mpleAnalogFirmata/SimpleAnalogFirmata.pde → ...mpleAnalogFirmata/SimpleAnalogFirmata.pde b/...mpleAnalogFirmata/SimpleAnalogFirmata.pde → ...mpleAnalogFirmata/SimpleAnalogFirmata.pde
diff --git a/...ta/examples/SimpleDigitalFirmata/Makefile → ...ta/examples/SimpleDigitalFirmata/Makefile b/...ta/examples/SimpleDigitalFirmata/Makefile → ...ta/examples/SimpleDigitalFirmata/Makefile
diff --git a/...leDigitalFirmata/SimpleDigitalFirmata.pde → ...leDigitalFirmata/SimpleDigitalFirmata.pde b/...leDigitalFirmata/SimpleDigitalFirmata.pde → ...leDigitalFirmata/SimpleDigitalFirmata.pde
diff --git a/...mata/examples/StandardFirmata/LICENSE.txt → ...mata/examples/StandardFirmata/LICENSE.txt b/...mata/examples/StandardFirmata/LICENSE.txt → ...mata/examples/StandardFirmata/LICENSE.txt
diff --git a/...Firmata/examples/StandardFirmata/Makefile → ...Firmata/examples/StandardFirmata/Makefile b/...Firmata/examples/StandardFirmata/Makefile → ...Firmata/examples/StandardFirmata/Makefile
diff --git a/...mples/StandardFirmata/StandardFirmata.pde → ...mples/StandardFirmata/StandardFirmata.pde b/...mples/StandardFirmata/StandardFirmata.pde → ...mples/StandardFirmata/StandardFirmata.pde
diff --git a/libs/libraries/Firmata/keywords.txt → libs/Firmata/keywords.txt b/libs/libraries/Firmata/keywords.txt → libs/Firmata/keywords.txt
diff --git a/libs/LiquidCrystal/CMakeLists.txt b/libs/LiquidCrystal/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(LiquidCrystal STATIC
+  LiquidCrystal.cpp
+)
diff --git a/...libraries/LiquidCrystal/LiquidCrystal.cpp → libs/LiquidCrystal/LiquidCrystal.cpp b/...libraries/LiquidCrystal/LiquidCrystal.cpp → libs/LiquidCrystal/LiquidCrystal.cpp
diff --git a/libs/libraries/LiquidCrystal/LiquidCrystal.h → libs/LiquidCrystal/LiquidCrystal.h b/libs/libraries/LiquidCrystal/LiquidCrystal.h → libs/LiquidCrystal/LiquidCrystal.h
diff --git a/...rystal/examples/Autoscroll/Autoscroll.pde → ...rystal/examples/Autoscroll/Autoscroll.pde b/...rystal/examples/Autoscroll/Autoscroll.pde → ...rystal/examples/Autoscroll/Autoscroll.pde
diff --git a/...es/LiquidCrystal/examples/Blink/Blink.pde → libs/LiquidCrystal/examples/Blink/Blink.pde b/...es/LiquidCrystal/examples/Blink/Blink.pde → libs/LiquidCrystal/examples/Blink/Blink.pde
diff --git a/.../LiquidCrystal/examples/Cursor/Cursor.pde → .../LiquidCrystal/examples/Cursor/Cursor.pde b/.../LiquidCrystal/examples/Cursor/Cursor.pde → .../LiquidCrystal/examples/Cursor/Cursor.pde
diff --git a/...iquidCrystal/examples/Display/Display.pde → ...iquidCrystal/examples/Display/Display.pde b/...iquidCrystal/examples/Display/Display.pde → ...iquidCrystal/examples/Display/Display.pde
diff --git a/...rystal/examples/HelloWorld/HelloWorld.pde → ...rystal/examples/HelloWorld/HelloWorld.pde b/...rystal/examples/HelloWorld/HelloWorld.pde → ...rystal/examples/HelloWorld/HelloWorld.pde
diff --git a/.../LiquidCrystal/examples/Scroll/Scroll.pde → .../LiquidCrystal/examples/Scroll/Scroll.pde b/.../LiquidCrystal/examples/Scroll/Scroll.pde → .../LiquidCrystal/examples/Scroll/Scroll.pde
diff --git a/.../examples/SerialDisplay/SerialDisplay.pde → .../examples/SerialDisplay/SerialDisplay.pde b/.../examples/SerialDisplay/SerialDisplay.pde → .../examples/SerialDisplay/SerialDisplay.pde
diff --git a/.../examples/TextDirection/TextDirection.pde → .../examples/TextDirection/TextDirection.pde b/.../examples/TextDirection/TextDirection.pde → .../examples/TextDirection/TextDirection.pde
diff --git a/...dCrystal/examples/setCursor/setCursor.pde → ...dCrystal/examples/setCursor/setCursor.pde b/...dCrystal/examples/setCursor/setCursor.pde → ...dCrystal/examples/setCursor/setCursor.pde
diff --git a/libs/libraries/LiquidCrystal/keywords.txt → libs/LiquidCrystal/keywords.txt b/libs/libraries/LiquidCrystal/keywords.txt → libs/LiquidCrystal/keywords.txt
diff --git a/libs/Matrix/CMakeLists.txt b/libs/Matrix/CMakeLists.txt
@@ -0,0 +1,10 @@
+message(STATUS "Including ${CMAKE_CURRENT_LIST_FILE}")
+
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/Core)
+include_directories(${ArduinoCode_BINARY_DIR}/libs/Core)
+
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/Sprite)
+
+add_library(Matrix STATIC
+  Matrix.cpp
+)
diff --git a/libs/libraries/Matrix/Matrix.cpp → libs/Matrix/Matrix.cpp b/libs/libraries/Matrix/Matrix.cpp → libs/Matrix/Matrix.cpp
diff --git a/libs/libraries/Matrix/Matrix.h → libs/Matrix/Matrix.h b/libs/libraries/Matrix/Matrix.h → libs/Matrix/Matrix.h
diff --git a/...ix/examples/hello_matrix/hello_matrix.pde → ...ix/examples/hello_matrix/hello_matrix.pde b/...ix/examples/hello_matrix/hello_matrix.pde → ...ix/examples/hello_matrix/hello_matrix.pde
diff --git a/...les/sprite_animation/sprite_animation.pde → ...les/sprite_animation/sprite_animation.pde b/...les/sprite_animation/sprite_animation.pde → ...les/sprite_animation/sprite_animation.pde
diff --git a/libs/libraries/Matrix/keywords.txt → libs/Matrix/keywords.txt b/libs/libraries/Matrix/keywords.txt → libs/Matrix/keywords.txt
diff --git a/libs/SPI/CMakeLists.txt b/libs/SPI/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(SPI STATIC
+  SPI.cpp
+)
diff --git a/libs/libraries/SPI/SPI.cpp → libs/SPI/SPI.cpp b/libs/libraries/SPI/SPI.cpp → libs/SPI/SPI.cpp
diff --git a/libs/libraries/SPI/SPI.h → libs/SPI/SPI.h b/libs/libraries/SPI/SPI.h → libs/SPI/SPI.h
diff --git a/...essureSensor/BarometricPressureSensor.pde → ...essureSensor/BarometricPressureSensor.pde b/...essureSensor/BarometricPressureSensor.pde → ...essureSensor/BarometricPressureSensor.pde
diff --git a/...essureSensor/BarometricPressureSensor.pde → ...essureSensor/BarometricPressureSensor.pde b/...essureSensor/BarometricPressureSensor.pde → ...essureSensor/BarometricPressureSensor.pde
diff --git a/...s/DigitalPotControl/DigitalPotControl.pde → ...s/DigitalPotControl/DigitalPotControl.pde b/...s/DigitalPotControl/DigitalPotControl.pde → ...s/DigitalPotControl/DigitalPotControl.pde
diff --git a/libs/libraries/SPI/keywords.txt → libs/SPI/keywords.txt b/libs/libraries/SPI/keywords.txt → libs/SPI/keywords.txt
diff --git a/libs/Servo/CMakeLists.txt b/libs/Servo/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(Servo STATIC
+  Servo.cpp
+)
diff --git a/libs/libraries/Servo/Servo.cpp → libs/Servo/Servo.cpp b/libs/libraries/Servo/Servo.cpp → libs/Servo/Servo.cpp
diff --git a/libs/libraries/Servo/Servo.h → libs/Servo/Servo.h b/libs/libraries/Servo/Servo.h → libs/Servo/Servo.h
diff --git a/libs/libraries/Servo/examples/Knob/Knob.pde → libs/Servo/examples/Knob/Knob.pde b/libs/libraries/Servo/examples/Knob/Knob.pde → libs/Servo/examples/Knob/Knob.pde
diff --git a/.../libraries/Servo/examples/Sweep/Sweep.pde → libs/Servo/examples/Sweep/Sweep.pde b/.../libraries/Servo/examples/Sweep/Sweep.pde → libs/Servo/examples/Sweep/Sweep.pde
diff --git a/libs/libraries/Servo/keywords.txt → libs/Servo/keywords.txt b/libs/libraries/Servo/keywords.txt → libs/Servo/keywords.txt
diff --git a/libs/libraries/SoftwareSerial/CMakeLists.txt → libs/SoftwareSerial/CMakeLists.txt b/libs/libraries/SoftwareSerial/CMakeLists.txt → libs/SoftwareSerial/CMakeLists.txt
@@ -1,7 +1,7 @@
 message(STATUS "Including ${CMAKE_CURRENT_LIST_FILE}")
 
-include_directories(${ArduinoCode_SOURCE_DIR}/libs/core)
-include_directories(${ArduinoCode_BINARY_DIR}/libs/core)
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/Core)
+include_directories(${ArduinoCode_BINARY_DIR}/libs/Core)
 
 add_library(SoftwareSerial STATIC
   SoftwareSerial.cpp

diff --git a/...braries/SoftwareSerial/SoftwareSerial.cpp → libs/SoftwareSerial/SoftwareSerial.cpp b/...braries/SoftwareSerial/SoftwareSerial.cpp → libs/SoftwareSerial/SoftwareSerial.cpp
diff --git a/...libraries/SoftwareSerial/SoftwareSerial.h → libs/SoftwareSerial/SoftwareSerial.h b/...libraries/SoftwareSerial/SoftwareSerial.h → libs/SoftwareSerial/SoftwareSerial.h
diff --git a/libs/libraries/SoftwareSerial/keywords.txt → libs/SoftwareSerial/keywords.txt b/libs/libraries/SoftwareSerial/keywords.txt → libs/SoftwareSerial/keywords.txt
diff --git a/libs/Sprite/CMakeLists.txt b/libs/Sprite/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(Sprite STATIC
+  Sprite.cpp
+)
diff --git a/libs/libraries/Sprite/Sprite.cpp → libs/Sprite/Sprite.cpp b/libs/libraries/Sprite/Sprite.cpp → libs/Sprite/Sprite.cpp
diff --git a/libs/libraries/Sprite/Sprite.h → libs/Sprite/Sprite.h b/libs/libraries/Sprite/Sprite.h → libs/Sprite/Sprite.h
diff --git a/libs/libraries/Sprite/binary.h → libs/Sprite/binary.h b/libs/libraries/Sprite/binary.h → libs/Sprite/binary.h
diff --git a/libs/libraries/Sprite/keywords.txt → libs/Sprite/keywords.txt b/libs/libraries/Sprite/keywords.txt → libs/Sprite/keywords.txt
diff --git a/libs/Stepper/CMakeLists.txt b/libs/Stepper/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(Stepper STATIC
+  Stepper.cpp
+)
diff --git a/libs/libraries/Stepper/Stepper.cpp → libs/Stepper/Stepper.cpp b/libs/libraries/Stepper/Stepper.cpp → libs/Stepper/Stepper.cpp
diff --git a/libs/libraries/Stepper/Stepper.h → libs/Stepper/Stepper.h b/libs/libraries/Stepper/Stepper.h → libs/Stepper/Stepper.h
diff --git a/.../Stepper/examples/MotorKnob/MotorKnob.pde → .../Stepper/examples/MotorKnob/MotorKnob.pde b/.../Stepper/examples/MotorKnob/MotorKnob.pde → .../Stepper/examples/MotorKnob/MotorKnob.pde
diff --git a/libs/libraries/Stepper/keywords.txt → libs/Stepper/keywords.txt b/libs/libraries/Stepper/keywords.txt → libs/Stepper/keywords.txt
diff --git a/libs/Wire/CMakeLists.txt b/libs/Wire/CMakeLists.txt
@@ -0,0 +1,10 @@
+message(STATUS "Including ${CMAKE_CURRENT_LIST_FILE}")
+
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/Core)
+include_directories(${ArduinoCode_BINARY_DIR}/libs/Core)
+
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/Wire/utility)
+
+add_library(Wire STATIC
+  Wire.cpp
+)
diff --git a/libs/libraries/Wire/Wire.cpp → libs/Wire/Wire.cpp b/libs/libraries/Wire/Wire.cpp → libs/Wire/Wire.cpp
diff --git a/libs/libraries/Wire/Wire.h → libs/Wire/Wire.h b/libs/libraries/Wire/Wire.h → libs/Wire/Wire.h
diff --git a/...les/SFRRanger_reader/SFRRanger_reader.pde → ...les/SFRRanger_reader/SFRRanger_reader.pde b/...les/SFRRanger_reader/SFRRanger_reader.pde → ...les/SFRRanger_reader/SFRRanger_reader.pde
diff --git a/...l_potentiometer/digital_potentiometer.pde → ...l_potentiometer/digital_potentiometer.pde b/...l_potentiometer/digital_potentiometer.pde → ...l_potentiometer/digital_potentiometer.pde
diff --git a/.../examples/master_reader/master_reader.pde → .../examples/master_reader/master_reader.pde b/.../examples/master_reader/master_reader.pde → .../examples/master_reader/master_reader.pde
diff --git a/.../examples/master_writer/master_writer.pde → .../examples/master_writer/master_writer.pde b/.../examples/master_writer/master_writer.pde → .../examples/master_writer/master_writer.pde
diff --git a/...xamples/slave_receiver/slave_receiver.pde → ...xamples/slave_receiver/slave_receiver.pde b/...xamples/slave_receiver/slave_receiver.pde → ...xamples/slave_receiver/slave_receiver.pde
diff --git a/...re/examples/slave_sender/slave_sender.pde → ...re/examples/slave_sender/slave_sender.pde b/...re/examples/slave_sender/slave_sender.pde → ...re/examples/slave_sender/slave_sender.pde
diff --git a/libs/libraries/Wire/keywords.txt → libs/Wire/keywords.txt b/libs/libraries/Wire/keywords.txt → libs/Wire/keywords.txt
diff --git a/libs/libraries/Wire/utility/twi.c → libs/Wire/utility/twi.c b/libs/libraries/Wire/utility/twi.c → libs/Wire/utility/twi.c
diff --git a/libs/libraries/Wire/utility/twi.h → libs/Wire/utility/twi.h b/libs/libraries/Wire/utility/twi.h → libs/Wire/utility/twi.h
diff --git a/libs/libraries/CMakeLists.txt b/libs/libraries/CMakeLists.txt
diff --git a/libs/libraries/EEPROM/CMakeLists.txt b/libs/libraries/EEPROM/CMakeLists.txt
diff --git a/libs/libraries/Ethernet/CMakeLists.txt b/libs/libraries/Ethernet/CMakeLists.txt
diff --git a/libs/libraries/Firmata/CMakeLists.txt b/libs/libraries/Firmata/CMakeLists.txt
diff --git a/libs/libraries/LiquidCrystal/CMakeLists.txt b/libs/libraries/LiquidCrystal/CMakeLists.txt
diff --git a/libs/libraries/Matrix/CMakeLists.txt b/libs/libraries/Matrix/CMakeLists.txt
diff --git a/libs/libraries/SPI/CMakeLists.txt b/libs/libraries/SPI/CMakeLists.txt
diff --git a/libs/libraries/Servo/CMakeLists.txt b/libs/libraries/Servo/CMakeLists.txt
diff --git a/libs/libraries/Sprite/CMakeLists.txt b/libs/libraries/Sprite/CMakeLists.txt
diff --git a/libs/libraries/Stepper/CMakeLists.txt b/libs/libraries/Stepper/CMakeLists.txt
diff --git a/libs/libraries/Wire/CMakeLists.txt b/libs/libraries/Wire/CMakeLists.txt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -3,44 +3,41 @@ message(STATUS "Including ${CMAKE_CURRENT_LIST_FILE}")
 #
 # Core libraries
 #
-include_directories(${ArduinoCode_SOURCE_DIR}/libs/core)
-link_directories(${ArduinoCode_BINARY_DIR}/libs/core)
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/Core)
+link_directories(${ArduinoCode_BINARY_DIR}/libs/Core)
 
-#
-# External libraries
-#
-include_directories(${ArduinoCode_SOURCE_DIR}/libs/libraries/Matrix)
-link_directories(${ArduinoCode_BINARY_DIR}/libs/libraries/Matrix)
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/Matrix)
+link_directories(${ArduinoCode_BINARY_DIR}/libs/Matrix)
 
-include_directories(${ArduinoCode_SOURCE_DIR}/libs/libraries/Ethernet)
-link_directories(${ArduinoCode_BINARY_DIR}/libs/libraries/Ethernet)
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/Ethernet)
+link_directories(${ArduinoCode_BINARY_DIR}/libs/Ethernet)
 
-include_directories(${ArduinoCode_SOURCE_DIR}/libs/libraries/Stepper)
-link_directories(${ArduinoCode_BINARY_DIR}/libs/libraries/Stepper)
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/Stepper)
+link_directories(${ArduinoCode_BINARY_DIR}/libs/Stepper)
 
-include_directories(${ArduinoCode_SOURCE_DIR}/libs/libraries/Sprite)
-link_directories(${ArduinoCode_BINARY_DIR}/libs/libraries/Sprite)
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/Sprite)
+link_directories(${ArduinoCode_BINARY_DIR}/libs/Sprite)
 
-include_directories(${ArduinoCode_SOURCE_DIR}/libs/libraries/Firmata)
-link_directories(${ArduinoCode_BINARY_DIR}/libs/libraries/Firmata)
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/Firmata)
+link_directories(${ArduinoCode_BINARY_DIR}/libs/Firmata)
 
-include_directories(${ArduinoCode_SOURCE_DIR}/libs/libraries/LiquidCrystal)
-link_directories(${ArduinoCode_BINARY_DIR}/libs/libraries/LiquidCrystal)
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/LiquidCrystal)
+link_directories(${ArduinoCode_BINARY_DIR}/libs/LiquidCrystal)
 
-include_directories(${ArduinoCode_SOURCE_DIR}/libs/libraries/Wire)
-link_directories(${ArduinoCode_BINARY_DIR}/libs/libraries/Wire)
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/Wire)
+link_directories(${ArduinoCode_BINARY_DIR}/libs/Wire)
 
-include_directories(${ArduinoCode_SOURCE_DIR}/libs/libraries/EEPROM)
-link_directories(${ArduinoCode_BINARY_DIR}/libs/libraries/EEPROM)
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/EEPROM)
+link_directories(${ArduinoCode_BINARY_DIR}/libs/EEPROM)
 
-include_directories(${ArduinoCode_SOURCE_DIR}/libs/libraries/Servo)
-link_directories(${ArduinoCode_BINARY_DIR}/libs/libraries/Servo)
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/Servo)
+link_directories(${ArduinoCode_BINARY_DIR}/libs/Servo)
 
-include_directories(${ArduinoCode_SOURCE_DIR}/libs/libraries/SPI)
-link_directories(${ArduinoCode_BINARY_DIR}/libs/libraries/SPI)
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/SPI)
+link_directories(${ArduinoCode_BINARY_DIR}/libs/SPI)
 
-include_directories(${ArduinoCode_SOURCE_DIR}/libs/libraries/SoftwareSerial)
-link_directories(${ArduinoCode_BINARY_DIR}/libs/libraries/SoftwareSerial)
+include_directories(${ArduinoCode_SOURCE_DIR}/libs/SoftwareSerial)
+link_directories(${ArduinoCode_BINARY_DIR}/libs/SoftwareSerial)
 
 #
 # Third parties