diff --git a/CMakeLists.txt b/CMakeLists.txt index ff6b50406a..7025762792 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,5 +35,5 @@ endif() include_directories("build") add_subdirectory(simulation/gz_msgs) -add_subdirectory(wpilibc/simulation) +add_subdirectory(wpilibc/sim) add_subdirectory(simulation/frc_gazebo_plugins) diff --git a/hal/build.gradle b/hal/build.gradle index d40903e6fa..dd0096dbef 100644 --- a/hal/build.gradle +++ b/hal/build.gradle @@ -1,6 +1,6 @@ // There are two hal libraries that are built -// - Desktop which is used by simulation (gcc/msvc) -// - Athena which is used by the roborio (arm) +// - desktop which is used by simulation (gcc/msvc) +// - athena which is used by the roborio (arm) apply plugin: 'cpp' @@ -14,17 +14,17 @@ model { sources { cpp { source { - srcDirs = ["lib/Athena", "lib/Athena/FRC_FPGA_ChipObject", "lib/Shared"] + srcDirs = ["lib/athena", "lib/athena/FRC_FPGA_ChipObject", "lib/shared"] includes = ["**/*.cpp"] } exportedHeaders { - srcDirs = ["include", "lib/Athena", "lib/Athena/FRC_FPGA_ChipObject", "lib/Shared"] + srcDirs = ["include", "lib/athena", "lib/athena/FRC_FPGA_ChipObject", "lib/shared"] } } } } -// HALDesktop(NativeLibrarySpec) { +// HALSim(NativeLibrarySpec) { // binaries.all { // if (toolChain in Gcc){ // cppCompiler.args "-std=c++1y" @@ -34,11 +34,11 @@ model { // sources { // cpp { // source { -// srcDirs = ["lib/Desktop", "lib/Shared"] +// srcDirs = ["lib/sim", "lib/shared"] // includes = ["**/*.cpp"] // } // exportedHeaders { -// srcDirs = ["include", "lib/Desktop", "lib/Shared"] +// srcDirs = ["include", "lib/sim", "lib/shared"] // } // } // } diff --git a/hal/lib/Athena/Accelerometer.cpp b/hal/lib/athena/Accelerometer.cpp similarity index 100% rename from hal/lib/Athena/Accelerometer.cpp rename to hal/lib/athena/Accelerometer.cpp diff --git a/hal/lib/Athena/Analog.cpp b/hal/lib/athena/Analog.cpp similarity index 100% rename from hal/lib/Athena/Analog.cpp rename to hal/lib/athena/Analog.cpp diff --git a/hal/lib/Athena/ChipObject.h b/hal/lib/athena/ChipObject.h similarity index 100% rename from hal/lib/Athena/ChipObject.h rename to hal/lib/athena/ChipObject.h diff --git a/hal/lib/Athena/Compressor.cpp b/hal/lib/athena/Compressor.cpp similarity index 100% rename from hal/lib/Athena/Compressor.cpp rename to hal/lib/athena/Compressor.cpp diff --git a/hal/lib/Athena/Digital.cpp b/hal/lib/athena/Digital.cpp similarity index 100% rename from hal/lib/Athena/Digital.cpp rename to hal/lib/athena/Digital.cpp diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/FRC_FPGA_ChipObject_Aliases.h b/hal/lib/athena/FRC_FPGA_ChipObject/FRC_FPGA_ChipObject_Aliases.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/FRC_FPGA_ChipObject_Aliases.h rename to hal/lib/athena/FRC_FPGA_ChipObject/FRC_FPGA_ChipObject_Aliases.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h b/hal/lib/athena/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h rename to hal/lib/athena/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/fpgainterfacecapi/NiFpga.h b/hal/lib/athena/FRC_FPGA_ChipObject/fpgainterfacecapi/NiFpga.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/fpgainterfacecapi/NiFpga.h rename to hal/lib/athena/FRC_FPGA_ChipObject/fpgainterfacecapi/NiFpga.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/nInterfaceGlobals.h b/hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/nInterfaceGlobals.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/nInterfaceGlobals.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/nInterfaceGlobals.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tAI.h b/hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tAI.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tAI.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tAI.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tGlobal.h b/hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tGlobal.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tGlobal.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tGlobal.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tLoadOut.h b/hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tLoadOut.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tLoadOut.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nInvariantFPGANamespace/tLoadOut.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/nInterfaceGlobals.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/nInterfaceGlobals.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/nInterfaceGlobals.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/nInterfaceGlobals.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAI.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAI.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAI.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAI.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAccumulator.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAccumulator.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAccumulator.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAccumulator.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAlarm.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAlarm.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAlarm.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAlarm.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAnalogTrigger.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAnalogTrigger.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAnalogTrigger.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tAnalogTrigger.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tCounter.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tCounter.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tCounter.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tCounter.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tDIO.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tDIO.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tDIO.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tDIO.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tDMA.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tDMA.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tDMA.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tDMA.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tEncoder.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tEncoder.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tEncoder.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tEncoder.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tGlobal.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tGlobal.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tGlobal.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tGlobal.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tInterrupt.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tInterrupt.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tInterrupt.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tInterrupt.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSPI.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSPI.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSPI.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSPI.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSolenoid.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSolenoid.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSolenoid.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSolenoid.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSysWatchdog.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSysWatchdog.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSysWatchdog.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tSysWatchdog.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tWatchdog.h b/hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tWatchdog.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tWatchdog.h rename to hal/lib/athena/FRC_FPGA_ChipObject/nRuntimeFPGANamespace/tWatchdog.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/printFpgaVersion.h b/hal/lib/athena/FRC_FPGA_ChipObject/printFpgaVersion.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/printFpgaVersion.h rename to hal/lib/athena/FRC_FPGA_ChipObject/printFpgaVersion.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/tDMAChannelDescriptor.h b/hal/lib/athena/FRC_FPGA_ChipObject/tDMAChannelDescriptor.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/tDMAChannelDescriptor.h rename to hal/lib/athena/FRC_FPGA_ChipObject/tDMAChannelDescriptor.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/tDMAManager.h b/hal/lib/athena/FRC_FPGA_ChipObject/tDMAManager.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/tDMAManager.h rename to hal/lib/athena/FRC_FPGA_ChipObject/tDMAManager.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/tInterruptManager.h b/hal/lib/athena/FRC_FPGA_ChipObject/tInterruptManager.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/tInterruptManager.h rename to hal/lib/athena/FRC_FPGA_ChipObject/tInterruptManager.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/tSystem.h b/hal/lib/athena/FRC_FPGA_ChipObject/tSystem.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/tSystem.h rename to hal/lib/athena/FRC_FPGA_ChipObject/tSystem.h diff --git a/hal/lib/Athena/FRC_FPGA_ChipObject/tSystemInterface.h b/hal/lib/athena/FRC_FPGA_ChipObject/tSystemInterface.h similarity index 100% rename from hal/lib/Athena/FRC_FPGA_ChipObject/tSystemInterface.h rename to hal/lib/athena/FRC_FPGA_ChipObject/tSystemInterface.h diff --git a/hal/lib/Athena/FRC_NetworkCommunication/AICalibration.h b/hal/lib/athena/FRC_NetworkCommunication/AICalibration.h similarity index 100% rename from hal/lib/Athena/FRC_NetworkCommunication/AICalibration.h rename to hal/lib/athena/FRC_NetworkCommunication/AICalibration.h diff --git a/hal/lib/Athena/FRC_NetworkCommunication/CANInterfacePlugin.h b/hal/lib/athena/FRC_NetworkCommunication/CANInterfacePlugin.h similarity index 100% rename from hal/lib/Athena/FRC_NetworkCommunication/CANInterfacePlugin.h rename to hal/lib/athena/FRC_NetworkCommunication/CANInterfacePlugin.h diff --git a/hal/lib/Athena/FRC_NetworkCommunication/CANSessionMux.h b/hal/lib/athena/FRC_NetworkCommunication/CANSessionMux.h similarity index 100% rename from hal/lib/Athena/FRC_NetworkCommunication/CANSessionMux.h rename to hal/lib/athena/FRC_NetworkCommunication/CANSessionMux.h diff --git a/hal/lib/Athena/FRC_NetworkCommunication/FRCComm.h b/hal/lib/athena/FRC_NetworkCommunication/FRCComm.h similarity index 100% rename from hal/lib/Athena/FRC_NetworkCommunication/FRCComm.h rename to hal/lib/athena/FRC_NetworkCommunication/FRCComm.h diff --git a/hal/lib/Athena/FRC_NetworkCommunication/LoadOut.h b/hal/lib/athena/FRC_NetworkCommunication/LoadOut.h similarity index 100% rename from hal/lib/Athena/FRC_NetworkCommunication/LoadOut.h rename to hal/lib/athena/FRC_NetworkCommunication/LoadOut.h diff --git a/hal/lib/Athena/FRC_NetworkCommunication/UsageReporting.h b/hal/lib/athena/FRC_NetworkCommunication/UsageReporting.h similarity index 100% rename from hal/lib/Athena/FRC_NetworkCommunication/UsageReporting.h rename to hal/lib/athena/FRC_NetworkCommunication/UsageReporting.h diff --git a/hal/lib/Athena/HALAthena.cpp b/hal/lib/athena/HALAthena.cpp similarity index 100% rename from hal/lib/Athena/HALAthena.cpp rename to hal/lib/athena/HALAthena.cpp diff --git a/hal/lib/Athena/Interrupts.cpp b/hal/lib/athena/Interrupts.cpp similarity index 100% rename from hal/lib/Athena/Interrupts.cpp rename to hal/lib/athena/Interrupts.cpp diff --git a/hal/lib/Athena/Notifier.cpp b/hal/lib/athena/Notifier.cpp similarity index 100% rename from hal/lib/Athena/Notifier.cpp rename to hal/lib/athena/Notifier.cpp diff --git a/hal/lib/Athena/PDP.cpp b/hal/lib/athena/PDP.cpp similarity index 100% rename from hal/lib/Athena/PDP.cpp rename to hal/lib/athena/PDP.cpp diff --git a/hal/lib/Athena/Power.cpp b/hal/lib/athena/Power.cpp similarity index 100% rename from hal/lib/Athena/Power.cpp rename to hal/lib/athena/Power.cpp diff --git a/hal/lib/Athena/Semaphore.cpp b/hal/lib/athena/Semaphore.cpp similarity index 100% rename from hal/lib/Athena/Semaphore.cpp rename to hal/lib/athena/Semaphore.cpp diff --git a/hal/lib/Athena/SerialPort.cpp b/hal/lib/athena/SerialPort.cpp similarity index 100% rename from hal/lib/Athena/SerialPort.cpp rename to hal/lib/athena/SerialPort.cpp diff --git a/hal/lib/Athena/Solenoid.cpp b/hal/lib/athena/Solenoid.cpp similarity index 100% rename from hal/lib/Athena/Solenoid.cpp rename to hal/lib/athena/Solenoid.cpp diff --git a/hal/lib/Athena/Task.cpp b/hal/lib/athena/Task.cpp similarity index 100% rename from hal/lib/Athena/Task.cpp rename to hal/lib/athena/Task.cpp diff --git a/hal/lib/Athena/Utilities.cpp b/hal/lib/athena/Utilities.cpp similarity index 100% rename from hal/lib/Athena/Utilities.cpp rename to hal/lib/athena/Utilities.cpp diff --git a/hal/lib/Athena/cpp/Resource.cpp b/hal/lib/athena/cpp/Resource.cpp similarity index 100% rename from hal/lib/Athena/cpp/Resource.cpp rename to hal/lib/athena/cpp/Resource.cpp diff --git a/hal/lib/Athena/cpp/Semaphore.cpp b/hal/lib/athena/cpp/Semaphore.cpp similarity index 100% rename from hal/lib/Athena/cpp/Semaphore.cpp rename to hal/lib/athena/cpp/Semaphore.cpp diff --git a/hal/lib/Athena/cpp/priority_mutex.cpp b/hal/lib/athena/cpp/priority_mutex.cpp similarity index 100% rename from hal/lib/Athena/cpp/priority_mutex.cpp rename to hal/lib/athena/cpp/priority_mutex.cpp diff --git a/hal/lib/Athena/ctre/CanTalonSRX.cpp b/hal/lib/athena/ctre/CanTalonSRX.cpp similarity index 100% rename from hal/lib/Athena/ctre/CanTalonSRX.cpp rename to hal/lib/athena/ctre/CanTalonSRX.cpp diff --git a/hal/lib/Athena/ctre/CtreCanNode.cpp b/hal/lib/athena/ctre/CtreCanNode.cpp similarity index 100% rename from hal/lib/Athena/ctre/CtreCanNode.cpp rename to hal/lib/athena/ctre/CtreCanNode.cpp diff --git a/hal/lib/Athena/ctre/PCM.cpp b/hal/lib/athena/ctre/PCM.cpp similarity index 100% rename from hal/lib/Athena/ctre/PCM.cpp rename to hal/lib/athena/ctre/PCM.cpp diff --git a/hal/lib/Athena/ctre/PDP.cpp b/hal/lib/athena/ctre/PDP.cpp similarity index 100% rename from hal/lib/Athena/ctre/PDP.cpp rename to hal/lib/athena/ctre/PDP.cpp diff --git a/hal/lib/Athena/frccansae/CANDeviceInterface.h b/hal/lib/athena/frccansae/CANDeviceInterface.h similarity index 100% rename from hal/lib/Athena/frccansae/CANDeviceInterface.h rename to hal/lib/athena/frccansae/CANDeviceInterface.h diff --git a/hal/lib/Athena/i2clib/i2c-lib.h b/hal/lib/athena/i2clib/i2c-lib.h similarity index 100% rename from hal/lib/Athena/i2clib/i2c-lib.h rename to hal/lib/athena/i2clib/i2c-lib.h diff --git a/hal/lib/Athena/spilib/spi-lib.h b/hal/lib/athena/spilib/spi-lib.h similarity index 100% rename from hal/lib/Athena/spilib/spi-lib.h rename to hal/lib/athena/spilib/spi-lib.h diff --git a/hal/lib/Athena/visa/visa.h b/hal/lib/athena/visa/visa.h similarity index 100% rename from hal/lib/Athena/visa/visa.h rename to hal/lib/athena/visa/visa.h diff --git a/hal/lib/Athena/visa/visatype.h b/hal/lib/athena/visa/visatype.h similarity index 100% rename from hal/lib/Athena/visa/visatype.h rename to hal/lib/athena/visa/visatype.h diff --git a/hal/lib/Shared/FRC_NetworkCommunication/FRCComm.h b/hal/lib/shared/FRC_NetworkCommunication/FRCComm.h similarity index 100% rename from hal/lib/Shared/FRC_NetworkCommunication/FRCComm.h rename to hal/lib/shared/FRC_NetworkCommunication/FRCComm.h diff --git a/hal/lib/Shared/HAL.cpp b/hal/lib/shared/HAL.cpp similarity index 100% rename from hal/lib/Shared/HAL.cpp rename to hal/lib/shared/HAL.cpp diff --git a/hal/lib/Desktop/HALDesktop.cpp b/hal/lib/sim/HALDesktop.cpp similarity index 100% rename from hal/lib/Desktop/HALDesktop.cpp rename to hal/lib/sim/HALDesktop.cpp diff --git a/wpilibc/athena.gradle b/wpilibc/athena.gradle index a32ef0dc2f..0d63ae7a12 100644 --- a/wpilibc/athena.gradle +++ b/wpilibc/athena.gradle @@ -126,7 +126,7 @@ if (checkDoxygen()) { source file("$ntSourceDir/src") source file("$ntSourceDir/include") source file("$halLocation/shared") - source file("$halLocation/Athena") + source file("$halLocation/athena") source file("$halLocation/include") // template file('cpp.doxy') exclude 'nivision.h' diff --git a/wpilibc/Athena/include/ADXL345_I2C.h b/wpilibc/athena/include/ADXL345_I2C.h similarity index 100% rename from wpilibc/Athena/include/ADXL345_I2C.h rename to wpilibc/athena/include/ADXL345_I2C.h diff --git a/wpilibc/Athena/include/ADXL345_SPI.h b/wpilibc/athena/include/ADXL345_SPI.h similarity index 100% rename from wpilibc/Athena/include/ADXL345_SPI.h rename to wpilibc/athena/include/ADXL345_SPI.h diff --git a/wpilibc/Athena/include/ADXL362.h b/wpilibc/athena/include/ADXL362.h similarity index 100% rename from wpilibc/Athena/include/ADXL362.h rename to wpilibc/athena/include/ADXL362.h diff --git a/wpilibc/Athena/include/ADXRS450_Gyro.h b/wpilibc/athena/include/ADXRS450_Gyro.h similarity index 100% rename from wpilibc/Athena/include/ADXRS450_Gyro.h rename to wpilibc/athena/include/ADXRS450_Gyro.h diff --git a/wpilibc/Athena/include/AnalogAccelerometer.h b/wpilibc/athena/include/AnalogAccelerometer.h similarity index 100% rename from wpilibc/Athena/include/AnalogAccelerometer.h rename to wpilibc/athena/include/AnalogAccelerometer.h diff --git a/wpilibc/Athena/include/AnalogGyro.h b/wpilibc/athena/include/AnalogGyro.h similarity index 100% rename from wpilibc/Athena/include/AnalogGyro.h rename to wpilibc/athena/include/AnalogGyro.h diff --git a/wpilibc/Athena/include/AnalogInput.h b/wpilibc/athena/include/AnalogInput.h similarity index 100% rename from wpilibc/Athena/include/AnalogInput.h rename to wpilibc/athena/include/AnalogInput.h diff --git a/wpilibc/Athena/include/AnalogOutput.h b/wpilibc/athena/include/AnalogOutput.h similarity index 100% rename from wpilibc/Athena/include/AnalogOutput.h rename to wpilibc/athena/include/AnalogOutput.h diff --git a/wpilibc/Athena/include/AnalogPotentiometer.h b/wpilibc/athena/include/AnalogPotentiometer.h similarity index 100% rename from wpilibc/Athena/include/AnalogPotentiometer.h rename to wpilibc/athena/include/AnalogPotentiometer.h diff --git a/wpilibc/Athena/include/AnalogTrigger.h b/wpilibc/athena/include/AnalogTrigger.h similarity index 100% rename from wpilibc/Athena/include/AnalogTrigger.h rename to wpilibc/athena/include/AnalogTrigger.h diff --git a/wpilibc/Athena/include/AnalogTriggerOutput.h b/wpilibc/athena/include/AnalogTriggerOutput.h similarity index 100% rename from wpilibc/Athena/include/AnalogTriggerOutput.h rename to wpilibc/athena/include/AnalogTriggerOutput.h diff --git a/wpilibc/Athena/include/BuiltInAccelerometer.h b/wpilibc/athena/include/BuiltInAccelerometer.h similarity index 100% rename from wpilibc/Athena/include/BuiltInAccelerometer.h rename to wpilibc/athena/include/BuiltInAccelerometer.h diff --git a/wpilibc/Athena/include/CAN/can_proto.h b/wpilibc/athena/include/CAN/can_proto.h similarity index 100% rename from wpilibc/Athena/include/CAN/can_proto.h rename to wpilibc/athena/include/CAN/can_proto.h diff --git a/wpilibc/Athena/include/CANJaguar.h b/wpilibc/athena/include/CANJaguar.h similarity index 100% rename from wpilibc/Athena/include/CANJaguar.h rename to wpilibc/athena/include/CANJaguar.h diff --git a/wpilibc/Athena/include/CANSpeedController.h b/wpilibc/athena/include/CANSpeedController.h similarity index 100% rename from wpilibc/Athena/include/CANSpeedController.h rename to wpilibc/athena/include/CANSpeedController.h diff --git a/wpilibc/Athena/include/CANTalon.h b/wpilibc/athena/include/CANTalon.h similarity index 100% rename from wpilibc/Athena/include/CANTalon.h rename to wpilibc/athena/include/CANTalon.h diff --git a/wpilibc/Athena/include/CameraServer.h b/wpilibc/athena/include/CameraServer.h similarity index 100% rename from wpilibc/Athena/include/CameraServer.h rename to wpilibc/athena/include/CameraServer.h diff --git a/wpilibc/Athena/include/Compressor.h b/wpilibc/athena/include/Compressor.h similarity index 100% rename from wpilibc/Athena/include/Compressor.h rename to wpilibc/athena/include/Compressor.h diff --git a/wpilibc/Athena/include/ControllerPower.h b/wpilibc/athena/include/ControllerPower.h similarity index 100% rename from wpilibc/Athena/include/ControllerPower.h rename to wpilibc/athena/include/ControllerPower.h diff --git a/wpilibc/Athena/include/Counter.h b/wpilibc/athena/include/Counter.h similarity index 100% rename from wpilibc/Athena/include/Counter.h rename to wpilibc/athena/include/Counter.h diff --git a/wpilibc/Athena/include/CounterBase.h b/wpilibc/athena/include/CounterBase.h similarity index 100% rename from wpilibc/Athena/include/CounterBase.h rename to wpilibc/athena/include/CounterBase.h diff --git a/wpilibc/Athena/include/DigitalGlitchFilter.h b/wpilibc/athena/include/DigitalGlitchFilter.h similarity index 100% rename from wpilibc/Athena/include/DigitalGlitchFilter.h rename to wpilibc/athena/include/DigitalGlitchFilter.h diff --git a/wpilibc/Athena/include/DigitalInput.h b/wpilibc/athena/include/DigitalInput.h similarity index 100% rename from wpilibc/Athena/include/DigitalInput.h rename to wpilibc/athena/include/DigitalInput.h diff --git a/wpilibc/Athena/include/DigitalOutput.h b/wpilibc/athena/include/DigitalOutput.h similarity index 100% rename from wpilibc/Athena/include/DigitalOutput.h rename to wpilibc/athena/include/DigitalOutput.h diff --git a/wpilibc/Athena/include/DigitalSource.h b/wpilibc/athena/include/DigitalSource.h similarity index 100% rename from wpilibc/Athena/include/DigitalSource.h rename to wpilibc/athena/include/DigitalSource.h diff --git a/wpilibc/Athena/include/DoubleSolenoid.h b/wpilibc/athena/include/DoubleSolenoid.h similarity index 100% rename from wpilibc/Athena/include/DoubleSolenoid.h rename to wpilibc/athena/include/DoubleSolenoid.h diff --git a/wpilibc/Athena/include/DriverStation.h b/wpilibc/athena/include/DriverStation.h similarity index 100% rename from wpilibc/Athena/include/DriverStation.h rename to wpilibc/athena/include/DriverStation.h diff --git a/wpilibc/Athena/include/Encoder.h b/wpilibc/athena/include/Encoder.h similarity index 100% rename from wpilibc/Athena/include/Encoder.h rename to wpilibc/athena/include/Encoder.h diff --git a/wpilibc/Athena/include/GearTooth.h b/wpilibc/athena/include/GearTooth.h similarity index 100% rename from wpilibc/Athena/include/GearTooth.h rename to wpilibc/athena/include/GearTooth.h diff --git a/wpilibc/Athena/include/I2C.h b/wpilibc/athena/include/I2C.h similarity index 100% rename from wpilibc/Athena/include/I2C.h rename to wpilibc/athena/include/I2C.h diff --git a/wpilibc/Athena/include/Internal/HardwareHLReporting.h b/wpilibc/athena/include/Internal/HardwareHLReporting.h similarity index 100% rename from wpilibc/Athena/include/Internal/HardwareHLReporting.h rename to wpilibc/athena/include/Internal/HardwareHLReporting.h diff --git a/wpilibc/Athena/include/InterruptableSensorBase.h b/wpilibc/athena/include/InterruptableSensorBase.h similarity index 100% rename from wpilibc/Athena/include/InterruptableSensorBase.h rename to wpilibc/athena/include/InterruptableSensorBase.h diff --git a/wpilibc/Athena/include/IterativeRobot.h b/wpilibc/athena/include/IterativeRobot.h similarity index 100% rename from wpilibc/Athena/include/IterativeRobot.h rename to wpilibc/athena/include/IterativeRobot.h diff --git a/wpilibc/Athena/include/Jaguar.h b/wpilibc/athena/include/Jaguar.h similarity index 100% rename from wpilibc/Athena/include/Jaguar.h rename to wpilibc/athena/include/Jaguar.h diff --git a/wpilibc/Athena/include/Joystick.h b/wpilibc/athena/include/Joystick.h similarity index 100% rename from wpilibc/Athena/include/Joystick.h rename to wpilibc/athena/include/Joystick.h diff --git a/wpilibc/Athena/include/MotorSafety.h b/wpilibc/athena/include/MotorSafety.h similarity index 100% rename from wpilibc/Athena/include/MotorSafety.h rename to wpilibc/athena/include/MotorSafety.h diff --git a/wpilibc/Athena/include/MotorSafetyHelper.h b/wpilibc/athena/include/MotorSafetyHelper.h similarity index 100% rename from wpilibc/Athena/include/MotorSafetyHelper.h rename to wpilibc/athena/include/MotorSafetyHelper.h diff --git a/wpilibc/Athena/include/NIIMAQdx.h b/wpilibc/athena/include/NIIMAQdx.h similarity index 100% rename from wpilibc/Athena/include/NIIMAQdx.h rename to wpilibc/athena/include/NIIMAQdx.h diff --git a/wpilibc/Athena/include/NetworkCommunication/AICalibration.h b/wpilibc/athena/include/NetworkCommunication/AICalibration.h similarity index 100% rename from wpilibc/Athena/include/NetworkCommunication/AICalibration.h rename to wpilibc/athena/include/NetworkCommunication/AICalibration.h diff --git a/wpilibc/Athena/include/NetworkCommunication/CANInterfacePlugin.h b/wpilibc/athena/include/NetworkCommunication/CANInterfacePlugin.h similarity index 100% rename from wpilibc/Athena/include/NetworkCommunication/CANInterfacePlugin.h rename to wpilibc/athena/include/NetworkCommunication/CANInterfacePlugin.h diff --git a/wpilibc/Athena/include/NetworkCommunication/CANSessionMux.h b/wpilibc/athena/include/NetworkCommunication/CANSessionMux.h similarity index 100% rename from wpilibc/Athena/include/NetworkCommunication/CANSessionMux.h rename to wpilibc/athena/include/NetworkCommunication/CANSessionMux.h diff --git a/wpilibc/Athena/include/NetworkCommunication/FRCComm.h b/wpilibc/athena/include/NetworkCommunication/FRCComm.h similarity index 100% rename from wpilibc/Athena/include/NetworkCommunication/FRCComm.h rename to wpilibc/athena/include/NetworkCommunication/FRCComm.h diff --git a/wpilibc/Athena/include/NetworkCommunication/LoadOut.h b/wpilibc/athena/include/NetworkCommunication/LoadOut.h similarity index 100% rename from wpilibc/Athena/include/NetworkCommunication/LoadOut.h rename to wpilibc/athena/include/NetworkCommunication/LoadOut.h diff --git a/wpilibc/Athena/include/NetworkCommunication/symModuleLink.h b/wpilibc/athena/include/NetworkCommunication/symModuleLink.h similarity index 100% rename from wpilibc/Athena/include/NetworkCommunication/symModuleLink.h rename to wpilibc/athena/include/NetworkCommunication/symModuleLink.h diff --git a/wpilibc/Athena/include/Notifier.h b/wpilibc/athena/include/Notifier.h similarity index 100% rename from wpilibc/Athena/include/Notifier.h rename to wpilibc/athena/include/Notifier.h diff --git a/wpilibc/Athena/include/PWM.h b/wpilibc/athena/include/PWM.h similarity index 100% rename from wpilibc/Athena/include/PWM.h rename to wpilibc/athena/include/PWM.h diff --git a/wpilibc/Athena/include/PWMSpeedController.h b/wpilibc/athena/include/PWMSpeedController.h similarity index 100% rename from wpilibc/Athena/include/PWMSpeedController.h rename to wpilibc/athena/include/PWMSpeedController.h diff --git a/wpilibc/Athena/include/PowerDistributionPanel.h b/wpilibc/athena/include/PowerDistributionPanel.h similarity index 100% rename from wpilibc/Athena/include/PowerDistributionPanel.h rename to wpilibc/athena/include/PowerDistributionPanel.h diff --git a/wpilibc/Athena/include/Preferences.h b/wpilibc/athena/include/Preferences.h similarity index 100% rename from wpilibc/Athena/include/Preferences.h rename to wpilibc/athena/include/Preferences.h diff --git a/wpilibc/Athena/include/Relay.h b/wpilibc/athena/include/Relay.h similarity index 100% rename from wpilibc/Athena/include/Relay.h rename to wpilibc/athena/include/Relay.h diff --git a/wpilibc/Athena/include/RobotBase.h b/wpilibc/athena/include/RobotBase.h similarity index 100% rename from wpilibc/Athena/include/RobotBase.h rename to wpilibc/athena/include/RobotBase.h diff --git a/wpilibc/Athena/include/RobotDrive.h b/wpilibc/athena/include/RobotDrive.h similarity index 100% rename from wpilibc/Athena/include/RobotDrive.h rename to wpilibc/athena/include/RobotDrive.h diff --git a/wpilibc/Athena/include/SD540.h b/wpilibc/athena/include/SD540.h similarity index 100% rename from wpilibc/Athena/include/SD540.h rename to wpilibc/athena/include/SD540.h diff --git a/wpilibc/Athena/include/SPI.h b/wpilibc/athena/include/SPI.h similarity index 100% rename from wpilibc/Athena/include/SPI.h rename to wpilibc/athena/include/SPI.h diff --git a/wpilibc/Athena/include/SafePWM.h b/wpilibc/athena/include/SafePWM.h similarity index 100% rename from wpilibc/Athena/include/SafePWM.h rename to wpilibc/athena/include/SafePWM.h diff --git a/wpilibc/Athena/include/SampleRobot.h b/wpilibc/athena/include/SampleRobot.h similarity index 100% rename from wpilibc/Athena/include/SampleRobot.h rename to wpilibc/athena/include/SampleRobot.h diff --git a/wpilibc/Athena/include/SerialPort.h b/wpilibc/athena/include/SerialPort.h similarity index 100% rename from wpilibc/Athena/include/SerialPort.h rename to wpilibc/athena/include/SerialPort.h diff --git a/wpilibc/Athena/include/Servo.h b/wpilibc/athena/include/Servo.h similarity index 100% rename from wpilibc/Athena/include/Servo.h rename to wpilibc/athena/include/Servo.h diff --git a/wpilibc/Athena/include/Solenoid.h b/wpilibc/athena/include/Solenoid.h similarity index 100% rename from wpilibc/Athena/include/Solenoid.h rename to wpilibc/athena/include/Solenoid.h diff --git a/wpilibc/Athena/include/SolenoidBase.h b/wpilibc/athena/include/SolenoidBase.h similarity index 100% rename from wpilibc/Athena/include/SolenoidBase.h rename to wpilibc/athena/include/SolenoidBase.h diff --git a/wpilibc/Athena/include/Spark.h b/wpilibc/athena/include/Spark.h similarity index 100% rename from wpilibc/Athena/include/Spark.h rename to wpilibc/athena/include/Spark.h diff --git a/wpilibc/Athena/include/SpeedController.h b/wpilibc/athena/include/SpeedController.h similarity index 100% rename from wpilibc/Athena/include/SpeedController.h rename to wpilibc/athena/include/SpeedController.h diff --git a/wpilibc/Athena/include/Talon.h b/wpilibc/athena/include/Talon.h similarity index 100% rename from wpilibc/Athena/include/Talon.h rename to wpilibc/athena/include/Talon.h diff --git a/wpilibc/Athena/include/TalonSRX.h b/wpilibc/athena/include/TalonSRX.h similarity index 100% rename from wpilibc/Athena/include/TalonSRX.h rename to wpilibc/athena/include/TalonSRX.h diff --git a/wpilibc/Athena/include/USBCamera.h b/wpilibc/athena/include/USBCamera.h similarity index 100% rename from wpilibc/Athena/include/USBCamera.h rename to wpilibc/athena/include/USBCamera.h diff --git a/wpilibc/Athena/include/Ultrasonic.h b/wpilibc/athena/include/Ultrasonic.h similarity index 100% rename from wpilibc/Athena/include/Ultrasonic.h rename to wpilibc/athena/include/Ultrasonic.h diff --git a/wpilibc/Athena/include/Victor.h b/wpilibc/athena/include/Victor.h similarity index 100% rename from wpilibc/Athena/include/Victor.h rename to wpilibc/athena/include/Victor.h diff --git a/wpilibc/Athena/include/VictorSP.h b/wpilibc/athena/include/VictorSP.h similarity index 100% rename from wpilibc/Athena/include/VictorSP.h rename to wpilibc/athena/include/VictorSP.h diff --git a/wpilibc/Athena/include/Vision/AxisCamera.h b/wpilibc/athena/include/Vision/AxisCamera.h similarity index 100% rename from wpilibc/Athena/include/Vision/AxisCamera.h rename to wpilibc/athena/include/Vision/AxisCamera.h diff --git a/wpilibc/Athena/include/Vision/BaeUtilities.h b/wpilibc/athena/include/Vision/BaeUtilities.h similarity index 100% rename from wpilibc/Athena/include/Vision/BaeUtilities.h rename to wpilibc/athena/include/Vision/BaeUtilities.h diff --git a/wpilibc/Athena/include/Vision/BinaryImage.h b/wpilibc/athena/include/Vision/BinaryImage.h similarity index 100% rename from wpilibc/Athena/include/Vision/BinaryImage.h rename to wpilibc/athena/include/Vision/BinaryImage.h diff --git a/wpilibc/Athena/include/Vision/ColorImage.h b/wpilibc/athena/include/Vision/ColorImage.h similarity index 100% rename from wpilibc/Athena/include/Vision/ColorImage.h rename to wpilibc/athena/include/Vision/ColorImage.h diff --git a/wpilibc/Athena/include/Vision/FrcError.h b/wpilibc/athena/include/Vision/FrcError.h similarity index 100% rename from wpilibc/Athena/include/Vision/FrcError.h rename to wpilibc/athena/include/Vision/FrcError.h diff --git a/wpilibc/Athena/include/Vision/HSLImage.h b/wpilibc/athena/include/Vision/HSLImage.h similarity index 100% rename from wpilibc/Athena/include/Vision/HSLImage.h rename to wpilibc/athena/include/Vision/HSLImage.h diff --git a/wpilibc/Athena/include/Vision/ImageBase.h b/wpilibc/athena/include/Vision/ImageBase.h similarity index 100% rename from wpilibc/Athena/include/Vision/ImageBase.h rename to wpilibc/athena/include/Vision/ImageBase.h diff --git a/wpilibc/Athena/include/Vision/MonoImage.h b/wpilibc/athena/include/Vision/MonoImage.h similarity index 100% rename from wpilibc/Athena/include/Vision/MonoImage.h rename to wpilibc/athena/include/Vision/MonoImage.h diff --git a/wpilibc/Athena/include/Vision/RGBImage.h b/wpilibc/athena/include/Vision/RGBImage.h similarity index 100% rename from wpilibc/Athena/include/Vision/RGBImage.h rename to wpilibc/athena/include/Vision/RGBImage.h diff --git a/wpilibc/Athena/include/Vision/Threshold.h b/wpilibc/athena/include/Vision/Threshold.h similarity index 100% rename from wpilibc/Athena/include/Vision/Threshold.h rename to wpilibc/athena/include/Vision/Threshold.h diff --git a/wpilibc/Athena/include/Vision/VisionAPI.h b/wpilibc/athena/include/Vision/VisionAPI.h similarity index 100% rename from wpilibc/Athena/include/Vision/VisionAPI.h rename to wpilibc/athena/include/Vision/VisionAPI.h diff --git a/wpilibc/Athena/include/WPILib.h b/wpilibc/athena/include/WPILib.h similarity index 100% rename from wpilibc/Athena/include/WPILib.h rename to wpilibc/athena/include/WPILib.h diff --git a/wpilibc/Athena/include/nivision.h b/wpilibc/athena/include/nivision.h similarity index 100% rename from wpilibc/Athena/include/nivision.h rename to wpilibc/athena/include/nivision.h diff --git a/wpilibc/Athena/src/ADXL345_I2C.cpp b/wpilibc/athena/src/ADXL345_I2C.cpp similarity index 100% rename from wpilibc/Athena/src/ADXL345_I2C.cpp rename to wpilibc/athena/src/ADXL345_I2C.cpp diff --git a/wpilibc/Athena/src/ADXL345_SPI.cpp b/wpilibc/athena/src/ADXL345_SPI.cpp similarity index 100% rename from wpilibc/Athena/src/ADXL345_SPI.cpp rename to wpilibc/athena/src/ADXL345_SPI.cpp diff --git a/wpilibc/Athena/src/ADXL362.cpp b/wpilibc/athena/src/ADXL362.cpp similarity index 100% rename from wpilibc/Athena/src/ADXL362.cpp rename to wpilibc/athena/src/ADXL362.cpp diff --git a/wpilibc/Athena/src/ADXRS450_Gyro.cpp b/wpilibc/athena/src/ADXRS450_Gyro.cpp similarity index 100% rename from wpilibc/Athena/src/ADXRS450_Gyro.cpp rename to wpilibc/athena/src/ADXRS450_Gyro.cpp diff --git a/wpilibc/Athena/src/AnalogAccelerometer.cpp b/wpilibc/athena/src/AnalogAccelerometer.cpp similarity index 100% rename from wpilibc/Athena/src/AnalogAccelerometer.cpp rename to wpilibc/athena/src/AnalogAccelerometer.cpp diff --git a/wpilibc/Athena/src/AnalogGyro.cpp b/wpilibc/athena/src/AnalogGyro.cpp similarity index 100% rename from wpilibc/Athena/src/AnalogGyro.cpp rename to wpilibc/athena/src/AnalogGyro.cpp diff --git a/wpilibc/Athena/src/AnalogInput.cpp b/wpilibc/athena/src/AnalogInput.cpp similarity index 100% rename from wpilibc/Athena/src/AnalogInput.cpp rename to wpilibc/athena/src/AnalogInput.cpp diff --git a/wpilibc/Athena/src/AnalogOutput.cpp b/wpilibc/athena/src/AnalogOutput.cpp similarity index 100% rename from wpilibc/Athena/src/AnalogOutput.cpp rename to wpilibc/athena/src/AnalogOutput.cpp diff --git a/wpilibc/Athena/src/AnalogPotentiometer.cpp b/wpilibc/athena/src/AnalogPotentiometer.cpp similarity index 100% rename from wpilibc/Athena/src/AnalogPotentiometer.cpp rename to wpilibc/athena/src/AnalogPotentiometer.cpp diff --git a/wpilibc/Athena/src/AnalogTrigger.cpp b/wpilibc/athena/src/AnalogTrigger.cpp similarity index 100% rename from wpilibc/Athena/src/AnalogTrigger.cpp rename to wpilibc/athena/src/AnalogTrigger.cpp diff --git a/wpilibc/Athena/src/AnalogTriggerOutput.cpp b/wpilibc/athena/src/AnalogTriggerOutput.cpp similarity index 100% rename from wpilibc/Athena/src/AnalogTriggerOutput.cpp rename to wpilibc/athena/src/AnalogTriggerOutput.cpp diff --git a/wpilibc/Athena/src/BuiltInAccelerometer.cpp b/wpilibc/athena/src/BuiltInAccelerometer.cpp similarity index 100% rename from wpilibc/Athena/src/BuiltInAccelerometer.cpp rename to wpilibc/athena/src/BuiltInAccelerometer.cpp diff --git a/wpilibc/Athena/src/CANJaguar.cpp b/wpilibc/athena/src/CANJaguar.cpp similarity index 100% rename from wpilibc/Athena/src/CANJaguar.cpp rename to wpilibc/athena/src/CANJaguar.cpp diff --git a/wpilibc/Athena/src/CANTalon.cpp b/wpilibc/athena/src/CANTalon.cpp similarity index 100% rename from wpilibc/Athena/src/CANTalon.cpp rename to wpilibc/athena/src/CANTalon.cpp diff --git a/wpilibc/Athena/src/CameraServer.cpp b/wpilibc/athena/src/CameraServer.cpp similarity index 100% rename from wpilibc/Athena/src/CameraServer.cpp rename to wpilibc/athena/src/CameraServer.cpp diff --git a/wpilibc/Athena/src/Compressor.cpp b/wpilibc/athena/src/Compressor.cpp similarity index 100% rename from wpilibc/Athena/src/Compressor.cpp rename to wpilibc/athena/src/Compressor.cpp diff --git a/wpilibc/Athena/src/ControllerPower.cpp b/wpilibc/athena/src/ControllerPower.cpp similarity index 100% rename from wpilibc/Athena/src/ControllerPower.cpp rename to wpilibc/athena/src/ControllerPower.cpp diff --git a/wpilibc/Athena/src/Counter.cpp b/wpilibc/athena/src/Counter.cpp similarity index 100% rename from wpilibc/Athena/src/Counter.cpp rename to wpilibc/athena/src/Counter.cpp diff --git a/wpilibc/Athena/src/DigitalGlitchFilter.cpp b/wpilibc/athena/src/DigitalGlitchFilter.cpp similarity index 100% rename from wpilibc/Athena/src/DigitalGlitchFilter.cpp rename to wpilibc/athena/src/DigitalGlitchFilter.cpp diff --git a/wpilibc/Athena/src/DigitalInput.cpp b/wpilibc/athena/src/DigitalInput.cpp similarity index 100% rename from wpilibc/Athena/src/DigitalInput.cpp rename to wpilibc/athena/src/DigitalInput.cpp diff --git a/wpilibc/Athena/src/DigitalOutput.cpp b/wpilibc/athena/src/DigitalOutput.cpp similarity index 100% rename from wpilibc/Athena/src/DigitalOutput.cpp rename to wpilibc/athena/src/DigitalOutput.cpp diff --git a/wpilibc/Athena/src/DoubleSolenoid.cpp b/wpilibc/athena/src/DoubleSolenoid.cpp similarity index 100% rename from wpilibc/Athena/src/DoubleSolenoid.cpp rename to wpilibc/athena/src/DoubleSolenoid.cpp diff --git a/wpilibc/Athena/src/DriverStation.cpp b/wpilibc/athena/src/DriverStation.cpp similarity index 100% rename from wpilibc/Athena/src/DriverStation.cpp rename to wpilibc/athena/src/DriverStation.cpp diff --git a/wpilibc/Athena/src/Encoder.cpp b/wpilibc/athena/src/Encoder.cpp similarity index 100% rename from wpilibc/Athena/src/Encoder.cpp rename to wpilibc/athena/src/Encoder.cpp diff --git a/wpilibc/Athena/src/GearTooth.cpp b/wpilibc/athena/src/GearTooth.cpp similarity index 100% rename from wpilibc/Athena/src/GearTooth.cpp rename to wpilibc/athena/src/GearTooth.cpp diff --git a/wpilibc/Athena/src/I2C.cpp b/wpilibc/athena/src/I2C.cpp similarity index 100% rename from wpilibc/Athena/src/I2C.cpp rename to wpilibc/athena/src/I2C.cpp diff --git a/wpilibc/Athena/src/Internal/HardwareHLReporting.cpp b/wpilibc/athena/src/Internal/HardwareHLReporting.cpp similarity index 100% rename from wpilibc/Athena/src/Internal/HardwareHLReporting.cpp rename to wpilibc/athena/src/Internal/HardwareHLReporting.cpp diff --git a/wpilibc/Athena/src/InterruptableSensorBase.cpp b/wpilibc/athena/src/InterruptableSensorBase.cpp similarity index 100% rename from wpilibc/Athena/src/InterruptableSensorBase.cpp rename to wpilibc/athena/src/InterruptableSensorBase.cpp diff --git a/wpilibc/Athena/src/IterativeRobot.cpp b/wpilibc/athena/src/IterativeRobot.cpp similarity index 100% rename from wpilibc/Athena/src/IterativeRobot.cpp rename to wpilibc/athena/src/IterativeRobot.cpp diff --git a/wpilibc/Athena/src/Jaguar.cpp b/wpilibc/athena/src/Jaguar.cpp similarity index 100% rename from wpilibc/Athena/src/Jaguar.cpp rename to wpilibc/athena/src/Jaguar.cpp diff --git a/wpilibc/Athena/src/Joystick.cpp b/wpilibc/athena/src/Joystick.cpp similarity index 100% rename from wpilibc/Athena/src/Joystick.cpp rename to wpilibc/athena/src/Joystick.cpp diff --git a/wpilibc/Athena/src/MotorSafetyHelper.cpp b/wpilibc/athena/src/MotorSafetyHelper.cpp similarity index 100% rename from wpilibc/Athena/src/MotorSafetyHelper.cpp rename to wpilibc/athena/src/MotorSafetyHelper.cpp diff --git a/wpilibc/Athena/src/Notifier.cpp b/wpilibc/athena/src/Notifier.cpp similarity index 100% rename from wpilibc/Athena/src/Notifier.cpp rename to wpilibc/athena/src/Notifier.cpp diff --git a/wpilibc/Athena/src/PIDController.cpp b/wpilibc/athena/src/PIDController.cpp similarity index 100% rename from wpilibc/Athena/src/PIDController.cpp rename to wpilibc/athena/src/PIDController.cpp diff --git a/wpilibc/Athena/src/PWM.cpp b/wpilibc/athena/src/PWM.cpp similarity index 100% rename from wpilibc/Athena/src/PWM.cpp rename to wpilibc/athena/src/PWM.cpp diff --git a/wpilibc/Athena/src/PWMSpeedController.cpp b/wpilibc/athena/src/PWMSpeedController.cpp similarity index 100% rename from wpilibc/Athena/src/PWMSpeedController.cpp rename to wpilibc/athena/src/PWMSpeedController.cpp diff --git a/wpilibc/Athena/src/PowerDistributionPanel.cpp b/wpilibc/athena/src/PowerDistributionPanel.cpp similarity index 100% rename from wpilibc/Athena/src/PowerDistributionPanel.cpp rename to wpilibc/athena/src/PowerDistributionPanel.cpp diff --git a/wpilibc/Athena/src/Preferences.cpp b/wpilibc/athena/src/Preferences.cpp similarity index 100% rename from wpilibc/Athena/src/Preferences.cpp rename to wpilibc/athena/src/Preferences.cpp diff --git a/wpilibc/Athena/src/Relay.cpp b/wpilibc/athena/src/Relay.cpp similarity index 100% rename from wpilibc/Athena/src/Relay.cpp rename to wpilibc/athena/src/Relay.cpp diff --git a/wpilibc/Athena/src/RobotBase.cpp b/wpilibc/athena/src/RobotBase.cpp similarity index 100% rename from wpilibc/Athena/src/RobotBase.cpp rename to wpilibc/athena/src/RobotBase.cpp diff --git a/wpilibc/Athena/src/RobotDrive.cpp b/wpilibc/athena/src/RobotDrive.cpp similarity index 100% rename from wpilibc/Athena/src/RobotDrive.cpp rename to wpilibc/athena/src/RobotDrive.cpp diff --git a/wpilibc/Athena/src/SD540.cpp b/wpilibc/athena/src/SD540.cpp similarity index 100% rename from wpilibc/Athena/src/SD540.cpp rename to wpilibc/athena/src/SD540.cpp diff --git a/wpilibc/Athena/src/SPI.cpp b/wpilibc/athena/src/SPI.cpp similarity index 100% rename from wpilibc/Athena/src/SPI.cpp rename to wpilibc/athena/src/SPI.cpp diff --git a/wpilibc/Athena/src/SafePWM.cpp b/wpilibc/athena/src/SafePWM.cpp similarity index 100% rename from wpilibc/Athena/src/SafePWM.cpp rename to wpilibc/athena/src/SafePWM.cpp diff --git a/wpilibc/Athena/src/SampleRobot.cpp b/wpilibc/athena/src/SampleRobot.cpp similarity index 100% rename from wpilibc/Athena/src/SampleRobot.cpp rename to wpilibc/athena/src/SampleRobot.cpp diff --git a/wpilibc/Athena/src/SensorBase.cpp b/wpilibc/athena/src/SensorBase.cpp similarity index 100% rename from wpilibc/Athena/src/SensorBase.cpp rename to wpilibc/athena/src/SensorBase.cpp diff --git a/wpilibc/Athena/src/SerialPort.cpp b/wpilibc/athena/src/SerialPort.cpp similarity index 100% rename from wpilibc/Athena/src/SerialPort.cpp rename to wpilibc/athena/src/SerialPort.cpp diff --git a/wpilibc/Athena/src/Servo.cpp b/wpilibc/athena/src/Servo.cpp similarity index 100% rename from wpilibc/Athena/src/Servo.cpp rename to wpilibc/athena/src/Servo.cpp diff --git a/wpilibc/Athena/src/Solenoid.cpp b/wpilibc/athena/src/Solenoid.cpp similarity index 100% rename from wpilibc/Athena/src/Solenoid.cpp rename to wpilibc/athena/src/Solenoid.cpp diff --git a/wpilibc/Athena/src/SolenoidBase.cpp b/wpilibc/athena/src/SolenoidBase.cpp similarity index 100% rename from wpilibc/Athena/src/SolenoidBase.cpp rename to wpilibc/athena/src/SolenoidBase.cpp diff --git a/wpilibc/Athena/src/Spark.cpp b/wpilibc/athena/src/Spark.cpp similarity index 100% rename from wpilibc/Athena/src/Spark.cpp rename to wpilibc/athena/src/Spark.cpp diff --git a/wpilibc/Athena/src/Talon.cpp b/wpilibc/athena/src/Talon.cpp similarity index 100% rename from wpilibc/Athena/src/Talon.cpp rename to wpilibc/athena/src/Talon.cpp diff --git a/wpilibc/Athena/src/TalonSRX.cpp b/wpilibc/athena/src/TalonSRX.cpp similarity index 100% rename from wpilibc/Athena/src/TalonSRX.cpp rename to wpilibc/athena/src/TalonSRX.cpp diff --git a/wpilibc/Athena/src/Task.cpp b/wpilibc/athena/src/Task.cpp similarity index 100% rename from wpilibc/Athena/src/Task.cpp rename to wpilibc/athena/src/Task.cpp diff --git a/wpilibc/Athena/src/Timer.cpp b/wpilibc/athena/src/Timer.cpp similarity index 100% rename from wpilibc/Athena/src/Timer.cpp rename to wpilibc/athena/src/Timer.cpp diff --git a/wpilibc/Athena/src/USBCamera.cpp b/wpilibc/athena/src/USBCamera.cpp similarity index 100% rename from wpilibc/Athena/src/USBCamera.cpp rename to wpilibc/athena/src/USBCamera.cpp diff --git a/wpilibc/Athena/src/Ultrasonic.cpp b/wpilibc/athena/src/Ultrasonic.cpp similarity index 100% rename from wpilibc/Athena/src/Ultrasonic.cpp rename to wpilibc/athena/src/Ultrasonic.cpp diff --git a/wpilibc/Athena/src/Utility.cpp b/wpilibc/athena/src/Utility.cpp similarity index 100% rename from wpilibc/Athena/src/Utility.cpp rename to wpilibc/athena/src/Utility.cpp diff --git a/wpilibc/Athena/src/Victor.cpp b/wpilibc/athena/src/Victor.cpp similarity index 100% rename from wpilibc/Athena/src/Victor.cpp rename to wpilibc/athena/src/Victor.cpp diff --git a/wpilibc/Athena/src/VictorSP.cpp b/wpilibc/athena/src/VictorSP.cpp similarity index 100% rename from wpilibc/Athena/src/VictorSP.cpp rename to wpilibc/athena/src/VictorSP.cpp diff --git a/wpilibc/Athena/src/Vision/AxisCamera.cpp b/wpilibc/athena/src/Vision/AxisCamera.cpp similarity index 100% rename from wpilibc/Athena/src/Vision/AxisCamera.cpp rename to wpilibc/athena/src/Vision/AxisCamera.cpp diff --git a/wpilibc/Athena/src/Vision/BaeUtilities.cpp b/wpilibc/athena/src/Vision/BaeUtilities.cpp similarity index 100% rename from wpilibc/Athena/src/Vision/BaeUtilities.cpp rename to wpilibc/athena/src/Vision/BaeUtilities.cpp diff --git a/wpilibc/Athena/src/Vision/BinaryImage.cpp b/wpilibc/athena/src/Vision/BinaryImage.cpp similarity index 100% rename from wpilibc/Athena/src/Vision/BinaryImage.cpp rename to wpilibc/athena/src/Vision/BinaryImage.cpp diff --git a/wpilibc/Athena/src/Vision/ColorImage.cpp b/wpilibc/athena/src/Vision/ColorImage.cpp similarity index 100% rename from wpilibc/Athena/src/Vision/ColorImage.cpp rename to wpilibc/athena/src/Vision/ColorImage.cpp diff --git a/wpilibc/Athena/src/Vision/FrcError.cpp b/wpilibc/athena/src/Vision/FrcError.cpp similarity index 100% rename from wpilibc/Athena/src/Vision/FrcError.cpp rename to wpilibc/athena/src/Vision/FrcError.cpp diff --git a/wpilibc/Athena/src/Vision/HSLImage.cpp b/wpilibc/athena/src/Vision/HSLImage.cpp similarity index 100% rename from wpilibc/Athena/src/Vision/HSLImage.cpp rename to wpilibc/athena/src/Vision/HSLImage.cpp diff --git a/wpilibc/Athena/src/Vision/ImageBase.cpp b/wpilibc/athena/src/Vision/ImageBase.cpp similarity index 100% rename from wpilibc/Athena/src/Vision/ImageBase.cpp rename to wpilibc/athena/src/Vision/ImageBase.cpp diff --git a/wpilibc/Athena/src/Vision/MonoImage.cpp b/wpilibc/athena/src/Vision/MonoImage.cpp similarity index 100% rename from wpilibc/Athena/src/Vision/MonoImage.cpp rename to wpilibc/athena/src/Vision/MonoImage.cpp diff --git a/wpilibc/Athena/src/Vision/RGBImage.cpp b/wpilibc/athena/src/Vision/RGBImage.cpp similarity index 100% rename from wpilibc/Athena/src/Vision/RGBImage.cpp rename to wpilibc/athena/src/Vision/RGBImage.cpp diff --git a/wpilibc/Athena/src/Vision/Threshold.cpp b/wpilibc/athena/src/Vision/Threshold.cpp similarity index 100% rename from wpilibc/Athena/src/Vision/Threshold.cpp rename to wpilibc/athena/src/Vision/Threshold.cpp diff --git a/wpilibc/Athena/src/Vision/VisionAPI.cpp b/wpilibc/athena/src/Vision/VisionAPI.cpp similarity index 100% rename from wpilibc/Athena/src/Vision/VisionAPI.cpp rename to wpilibc/athena/src/Vision/VisionAPI.cpp diff --git a/wpilibc/build.gradle b/wpilibc/build.gradle index 663e0ade22..a1f445ccbe 100644 --- a/wpilibc/build.gradle +++ b/wpilibc/build.gradle @@ -7,8 +7,8 @@ plugins { evaluationDependsOn(':hal') ext.shared = 'shared' -ext.athena = 'Athena' -ext.simulation = 'simluation' +ext.athena = 'athena' +ext.simulation = 'sim' // Attempts to execute the doxygen command. If there is no exception, doxygen exists, so return true. If there's // an IOException, it doesn't exist, so return false diff --git a/wpilibc/simulation/.gitignore b/wpilibc/sim/.gitignore similarity index 100% rename from wpilibc/simulation/.gitignore rename to wpilibc/sim/.gitignore diff --git a/wpilibc/simulation/CMakeLists.txt b/wpilibc/sim/CMakeLists.txt similarity index 100% rename from wpilibc/simulation/CMakeLists.txt rename to wpilibc/sim/CMakeLists.txt diff --git a/wpilibc/simulation/README.md b/wpilibc/sim/README.md similarity index 100% rename from wpilibc/simulation/README.md rename to wpilibc/sim/README.md diff --git a/wpilibc/simulation/include/AnalogGyro.h b/wpilibc/sim/include/AnalogGyro.h similarity index 100% rename from wpilibc/simulation/include/AnalogGyro.h rename to wpilibc/sim/include/AnalogGyro.h diff --git a/wpilibc/simulation/include/AnalogInput.h b/wpilibc/sim/include/AnalogInput.h similarity index 100% rename from wpilibc/simulation/include/AnalogInput.h rename to wpilibc/sim/include/AnalogInput.h diff --git a/wpilibc/simulation/include/AnalogPotentiometer.h b/wpilibc/sim/include/AnalogPotentiometer.h similarity index 100% rename from wpilibc/simulation/include/AnalogPotentiometer.h rename to wpilibc/sim/include/AnalogPotentiometer.h diff --git a/wpilibc/simulation/include/Counter.h b/wpilibc/sim/include/Counter.h similarity index 100% rename from wpilibc/simulation/include/Counter.h rename to wpilibc/sim/include/Counter.h diff --git a/wpilibc/simulation/include/CounterBase.h b/wpilibc/sim/include/CounterBase.h similarity index 100% rename from wpilibc/simulation/include/CounterBase.h rename to wpilibc/sim/include/CounterBase.h diff --git a/wpilibc/simulation/include/DigitalInput.h b/wpilibc/sim/include/DigitalInput.h similarity index 100% rename from wpilibc/simulation/include/DigitalInput.h rename to wpilibc/sim/include/DigitalInput.h diff --git a/wpilibc/simulation/include/DoubleSolenoid.h b/wpilibc/sim/include/DoubleSolenoid.h similarity index 100% rename from wpilibc/simulation/include/DoubleSolenoid.h rename to wpilibc/sim/include/DoubleSolenoid.h diff --git a/wpilibc/simulation/include/DriverStation.h b/wpilibc/sim/include/DriverStation.h similarity index 100% rename from wpilibc/simulation/include/DriverStation.h rename to wpilibc/sim/include/DriverStation.h diff --git a/wpilibc/simulation/include/Encoder.h b/wpilibc/sim/include/Encoder.h similarity index 100% rename from wpilibc/simulation/include/Encoder.h rename to wpilibc/sim/include/Encoder.h diff --git a/wpilibc/simulation/include/IterativeRobot.h b/wpilibc/sim/include/IterativeRobot.h similarity index 100% rename from wpilibc/simulation/include/IterativeRobot.h rename to wpilibc/sim/include/IterativeRobot.h diff --git a/wpilibc/simulation/include/Jaguar.h b/wpilibc/sim/include/Jaguar.h similarity index 100% rename from wpilibc/simulation/include/Jaguar.h rename to wpilibc/sim/include/Jaguar.h diff --git a/wpilibc/simulation/include/Joystick.h b/wpilibc/sim/include/Joystick.h similarity index 100% rename from wpilibc/simulation/include/Joystick.h rename to wpilibc/sim/include/Joystick.h diff --git a/wpilibc/simulation/include/MotorSafety.h b/wpilibc/sim/include/MotorSafety.h similarity index 100% rename from wpilibc/simulation/include/MotorSafety.h rename to wpilibc/sim/include/MotorSafety.h diff --git a/wpilibc/simulation/include/MotorSafetyHelper.h b/wpilibc/sim/include/MotorSafetyHelper.h similarity index 100% rename from wpilibc/simulation/include/MotorSafetyHelper.h rename to wpilibc/sim/include/MotorSafetyHelper.h diff --git a/wpilibc/simulation/include/NetworkCommunication/FRCComm.h b/wpilibc/sim/include/NetworkCommunication/FRCComm.h similarity index 100% rename from wpilibc/simulation/include/NetworkCommunication/FRCComm.h rename to wpilibc/sim/include/NetworkCommunication/FRCComm.h diff --git a/wpilibc/simulation/include/Notifier.h b/wpilibc/sim/include/Notifier.h similarity index 100% rename from wpilibc/simulation/include/Notifier.h rename to wpilibc/sim/include/Notifier.h diff --git a/wpilibc/simulation/include/PWM.h b/wpilibc/sim/include/PWM.h similarity index 100% rename from wpilibc/simulation/include/PWM.h rename to wpilibc/sim/include/PWM.h diff --git a/wpilibc/simulation/include/Relay.h b/wpilibc/sim/include/Relay.h similarity index 100% rename from wpilibc/simulation/include/Relay.h rename to wpilibc/sim/include/Relay.h diff --git a/wpilibc/simulation/include/RobotBase.h b/wpilibc/sim/include/RobotBase.h similarity index 100% rename from wpilibc/simulation/include/RobotBase.h rename to wpilibc/sim/include/RobotBase.h diff --git a/wpilibc/simulation/include/RobotDrive.h b/wpilibc/sim/include/RobotDrive.h similarity index 100% rename from wpilibc/simulation/include/RobotDrive.h rename to wpilibc/sim/include/RobotDrive.h diff --git a/wpilibc/simulation/include/SafePWM.h b/wpilibc/sim/include/SafePWM.h similarity index 100% rename from wpilibc/simulation/include/SafePWM.h rename to wpilibc/sim/include/SafePWM.h diff --git a/wpilibc/simulation/include/SampleRobot.h b/wpilibc/sim/include/SampleRobot.h similarity index 100% rename from wpilibc/simulation/include/SampleRobot.h rename to wpilibc/sim/include/SampleRobot.h diff --git a/wpilibc/simulation/include/Solenoid.h b/wpilibc/sim/include/Solenoid.h similarity index 100% rename from wpilibc/simulation/include/Solenoid.h rename to wpilibc/sim/include/Solenoid.h diff --git a/wpilibc/simulation/include/SpeedController.h b/wpilibc/sim/include/SpeedController.h similarity index 100% rename from wpilibc/simulation/include/SpeedController.h rename to wpilibc/sim/include/SpeedController.h diff --git a/wpilibc/simulation/include/Talon.h b/wpilibc/sim/include/Talon.h similarity index 100% rename from wpilibc/simulation/include/Talon.h rename to wpilibc/sim/include/Talon.h diff --git a/wpilibc/simulation/include/Victor.h b/wpilibc/sim/include/Victor.h similarity index 100% rename from wpilibc/simulation/include/Victor.h rename to wpilibc/sim/include/Victor.h diff --git a/wpilibc/simulation/include/WPILib.h b/wpilibc/sim/include/WPILib.h similarity index 100% rename from wpilibc/simulation/include/WPILib.h rename to wpilibc/sim/include/WPILib.h diff --git a/wpilibc/simulation/include/simulation/MainNode.h b/wpilibc/sim/include/simulation/MainNode.h similarity index 100% rename from wpilibc/simulation/include/simulation/MainNode.h rename to wpilibc/sim/include/simulation/MainNode.h diff --git a/wpilibc/simulation/include/simulation/SimContinuousOutput.h b/wpilibc/sim/include/simulation/SimContinuousOutput.h similarity index 100% rename from wpilibc/simulation/include/simulation/SimContinuousOutput.h rename to wpilibc/sim/include/simulation/SimContinuousOutput.h diff --git a/wpilibc/simulation/include/simulation/SimDigitalInput.h b/wpilibc/sim/include/simulation/SimDigitalInput.h similarity index 100% rename from wpilibc/simulation/include/simulation/SimDigitalInput.h rename to wpilibc/sim/include/simulation/SimDigitalInput.h diff --git a/wpilibc/simulation/include/simulation/SimEncoder.h b/wpilibc/sim/include/simulation/SimEncoder.h similarity index 100% rename from wpilibc/simulation/include/simulation/SimEncoder.h rename to wpilibc/sim/include/simulation/SimEncoder.h diff --git a/wpilibc/simulation/include/simulation/SimFloatInput.h b/wpilibc/sim/include/simulation/SimFloatInput.h similarity index 100% rename from wpilibc/simulation/include/simulation/SimFloatInput.h rename to wpilibc/sim/include/simulation/SimFloatInput.h diff --git a/wpilibc/simulation/include/simulation/SimGyro.h b/wpilibc/sim/include/simulation/SimGyro.h similarity index 100% rename from wpilibc/simulation/include/simulation/SimGyro.h rename to wpilibc/sim/include/simulation/SimGyro.h diff --git a/wpilibc/simulation/include/simulation/simTime.h b/wpilibc/sim/include/simulation/simTime.h similarity index 100% rename from wpilibc/simulation/include/simulation/simTime.h rename to wpilibc/sim/include/simulation/simTime.h diff --git a/wpilibc/simulation/src/AnalogGyro.cpp b/wpilibc/sim/src/AnalogGyro.cpp similarity index 100% rename from wpilibc/simulation/src/AnalogGyro.cpp rename to wpilibc/sim/src/AnalogGyro.cpp diff --git a/wpilibc/simulation/src/AnalogInput.cpp b/wpilibc/sim/src/AnalogInput.cpp similarity index 100% rename from wpilibc/simulation/src/AnalogInput.cpp rename to wpilibc/sim/src/AnalogInput.cpp diff --git a/wpilibc/simulation/src/AnalogPotentiometer.cpp b/wpilibc/sim/src/AnalogPotentiometer.cpp similarity index 100% rename from wpilibc/simulation/src/AnalogPotentiometer.cpp rename to wpilibc/sim/src/AnalogPotentiometer.cpp diff --git a/wpilibc/simulation/src/DigitalInput.cpp b/wpilibc/sim/src/DigitalInput.cpp similarity index 100% rename from wpilibc/simulation/src/DigitalInput.cpp rename to wpilibc/sim/src/DigitalInput.cpp diff --git a/wpilibc/simulation/src/DoubleSolenoid.cpp b/wpilibc/sim/src/DoubleSolenoid.cpp similarity index 100% rename from wpilibc/simulation/src/DoubleSolenoid.cpp rename to wpilibc/sim/src/DoubleSolenoid.cpp diff --git a/wpilibc/simulation/src/DriverStation.cpp b/wpilibc/sim/src/DriverStation.cpp similarity index 100% rename from wpilibc/simulation/src/DriverStation.cpp rename to wpilibc/sim/src/DriverStation.cpp diff --git a/wpilibc/simulation/src/Encoder.cpp b/wpilibc/sim/src/Encoder.cpp similarity index 100% rename from wpilibc/simulation/src/Encoder.cpp rename to wpilibc/sim/src/Encoder.cpp diff --git a/wpilibc/simulation/src/IterativeRobot.cpp b/wpilibc/sim/src/IterativeRobot.cpp similarity index 100% rename from wpilibc/simulation/src/IterativeRobot.cpp rename to wpilibc/sim/src/IterativeRobot.cpp diff --git a/wpilibc/simulation/src/Jaguar.cpp b/wpilibc/sim/src/Jaguar.cpp similarity index 100% rename from wpilibc/simulation/src/Jaguar.cpp rename to wpilibc/sim/src/Jaguar.cpp diff --git a/wpilibc/simulation/src/Joystick.cpp b/wpilibc/sim/src/Joystick.cpp similarity index 100% rename from wpilibc/simulation/src/Joystick.cpp rename to wpilibc/sim/src/Joystick.cpp diff --git a/wpilibc/simulation/src/MotorSafetyHelper.cpp b/wpilibc/sim/src/MotorSafetyHelper.cpp similarity index 100% rename from wpilibc/simulation/src/MotorSafetyHelper.cpp rename to wpilibc/sim/src/MotorSafetyHelper.cpp diff --git a/wpilibc/simulation/src/Notifier.cpp b/wpilibc/sim/src/Notifier.cpp similarity index 100% rename from wpilibc/simulation/src/Notifier.cpp rename to wpilibc/sim/src/Notifier.cpp diff --git a/wpilibc/simulation/src/PIDController.cpp b/wpilibc/sim/src/PIDController.cpp similarity index 100% rename from wpilibc/simulation/src/PIDController.cpp rename to wpilibc/sim/src/PIDController.cpp diff --git a/wpilibc/simulation/src/PWM.cpp b/wpilibc/sim/src/PWM.cpp similarity index 100% rename from wpilibc/simulation/src/PWM.cpp rename to wpilibc/sim/src/PWM.cpp diff --git a/wpilibc/simulation/src/Relay.cpp b/wpilibc/sim/src/Relay.cpp similarity index 100% rename from wpilibc/simulation/src/Relay.cpp rename to wpilibc/sim/src/Relay.cpp diff --git a/wpilibc/simulation/src/RobotBase.cpp b/wpilibc/sim/src/RobotBase.cpp similarity index 100% rename from wpilibc/simulation/src/RobotBase.cpp rename to wpilibc/sim/src/RobotBase.cpp diff --git a/wpilibc/simulation/src/RobotDrive.cpp b/wpilibc/sim/src/RobotDrive.cpp similarity index 100% rename from wpilibc/simulation/src/RobotDrive.cpp rename to wpilibc/sim/src/RobotDrive.cpp diff --git a/wpilibc/simulation/src/SafePWM.cpp b/wpilibc/sim/src/SafePWM.cpp similarity index 100% rename from wpilibc/simulation/src/SafePWM.cpp rename to wpilibc/sim/src/SafePWM.cpp diff --git a/wpilibc/simulation/src/SampleRobot.cpp b/wpilibc/sim/src/SampleRobot.cpp similarity index 100% rename from wpilibc/simulation/src/SampleRobot.cpp rename to wpilibc/sim/src/SampleRobot.cpp diff --git a/wpilibc/simulation/src/SensorBase.cpp b/wpilibc/sim/src/SensorBase.cpp similarity index 100% rename from wpilibc/simulation/src/SensorBase.cpp rename to wpilibc/sim/src/SensorBase.cpp diff --git a/wpilibc/simulation/src/Solenoid.cpp b/wpilibc/sim/src/Solenoid.cpp similarity index 100% rename from wpilibc/simulation/src/Solenoid.cpp rename to wpilibc/sim/src/Solenoid.cpp diff --git a/wpilibc/simulation/src/Talon.cpp b/wpilibc/sim/src/Talon.cpp similarity index 100% rename from wpilibc/simulation/src/Talon.cpp rename to wpilibc/sim/src/Talon.cpp diff --git a/wpilibc/simulation/src/Timer.cpp b/wpilibc/sim/src/Timer.cpp similarity index 100% rename from wpilibc/simulation/src/Timer.cpp rename to wpilibc/sim/src/Timer.cpp diff --git a/wpilibc/simulation/src/Utility.cpp b/wpilibc/sim/src/Utility.cpp similarity index 100% rename from wpilibc/simulation/src/Utility.cpp rename to wpilibc/sim/src/Utility.cpp diff --git a/wpilibc/simulation/src/Victor.cpp b/wpilibc/sim/src/Victor.cpp similarity index 100% rename from wpilibc/simulation/src/Victor.cpp rename to wpilibc/sim/src/Victor.cpp diff --git a/wpilibc/simulation/src/simulation/SimContinuousOutput.cpp b/wpilibc/sim/src/simulation/SimContinuousOutput.cpp similarity index 100% rename from wpilibc/simulation/src/simulation/SimContinuousOutput.cpp rename to wpilibc/sim/src/simulation/SimContinuousOutput.cpp diff --git a/wpilibc/simulation/src/simulation/SimDigitalInput.cpp b/wpilibc/sim/src/simulation/SimDigitalInput.cpp similarity index 100% rename from wpilibc/simulation/src/simulation/SimDigitalInput.cpp rename to wpilibc/sim/src/simulation/SimDigitalInput.cpp diff --git a/wpilibc/simulation/src/simulation/SimEncoder.cpp b/wpilibc/sim/src/simulation/SimEncoder.cpp similarity index 100% rename from wpilibc/simulation/src/simulation/SimEncoder.cpp rename to wpilibc/sim/src/simulation/SimEncoder.cpp diff --git a/wpilibc/simulation/src/simulation/SimFloatInput.cpp b/wpilibc/sim/src/simulation/SimFloatInput.cpp similarity index 100% rename from wpilibc/simulation/src/simulation/SimFloatInput.cpp rename to wpilibc/sim/src/simulation/SimFloatInput.cpp diff --git a/wpilibc/simulation/src/simulation/SimGyro.cpp b/wpilibc/sim/src/simulation/SimGyro.cpp similarity index 100% rename from wpilibc/simulation/src/simulation/SimGyro.cpp rename to wpilibc/sim/src/simulation/SimGyro.cpp diff --git a/wpilibc/simulation.gradle b/wpilibc/simulation.gradle index 7da3216dc6..c051f2af5c 100644 --- a/wpilibc/simulation.gradle +++ b/wpilibc/simulation.gradle @@ -80,7 +80,7 @@ task wpilibcSimCopy(type: Copy, dependsOn: allcsim) { into "include" } - from ("simulation/include"){ + from ("sim/include"){ into "include" } diff --git a/wpilibcIntegrationTests/build.gradle b/wpilibcIntegrationTests/build.gradle index 5434404912..a7b982419d 100644 --- a/wpilibcIntegrationTests/build.gradle +++ b/wpilibcIntegrationTests/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'cpp' defineNetworkTablesProperties() ext.shared = "${project(':wpilibc').projectDir.getAbsolutePath()}/shared" -ext.athena = "${project(':wpilibc').projectDir.getAbsolutePath()}/Athena" +ext.athena = "${project(':wpilibc').projectDir.getAbsolutePath()}/athena" ext.hal = project(':hal').projectDir.getAbsolutePath() model { @@ -44,4 +44,4 @@ model { } } -} \ No newline at end of file +}