diff --git a/.gitignore b/.gitignore index e731f53..faef5b7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,12 +9,12 @@ __pycache__ *.egg-info build dist +/lib /rev/version.py -/rev/_init_rev.py -/rev/rpy-include -/rev/pkgcfg.py -/rev/py.typed +/rev/_init__rev.py +/rev/trampolines +/rev/*.pc *.dylib *.dll diff --git a/gen/CANDeviceScanner.yml b/gen/CANDeviceScanner.yml deleted file mode 100644 index 4859c59..0000000 --- a/gen/CANDeviceScanner.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- - -functions: - GetFRCDeviceTypeText: - GetFRCManufacturerText: -classes: - CANScanIdentifier: - attributes: - deviceTypeId: - manufacturerId: - canId: - uniqueId: - name: - methods: - CANScanIdentifier: - Name: - CANBusScanner: - methods: - CANBusScanner: - Start: - Stop: - Running: - LastError: - CANBusScan: - RegisterDevice: diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..79cab7a --- /dev/null +++ b/meson.build @@ -0,0 +1,23 @@ +project('robotpy-rev', ['cpp'], + default_options: ['warning_level=1', 'cpp_std=c++20', + 'b_colorout=auto', 'optimization=2', 'b_pie=true']) + +subdir('semiwrap') + +rev_sources += files( + 'rev/rev.cpp', +) + +# +# Static link +# + +cpp = meson.get_compiler('cpp') +libs_path = meson.current_source_dir() + '/lib/lib' + +rev_deps += [ + cpp.find_library('REVLibDriver', dirs: libs_path), + cpp.find_library('REVLib', dirs: libs_path), +] + +subdir('semiwrap/modules') diff --git a/pyproject.toml b/pyproject.toml index 9fe6319..3653c0a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,57 +1,88 @@ -[tool.robotpy-build.metadata] +[build-system] +build-backend = "hatchling.build" +requires = [ + "hatchling", + "hatch-vcs", + "semiwrap~=0.1", + "hatch-meson~=0.1.0b2", + "hatch-robotpy~=0.2.0", + "wpilib~=2025.3.2.2", +] + + +[project] name = "robotpy-rev" +dynamic = ["version"] description = "REVLib for RobotPy" -author = "RobotPy Development Team" -author_email = "robotpy@googlegroups.com" -url = "https://github.com/robotpy/robotpy-rev" license = "BSD-3-Clause" -install_requires = [ - "wpilib<2026.0.0,>=2025.3.2", +dependencies = [ + "wpilib~=2025.3.2.2", ] -[build-system] -requires = [ - "robotpy-build<2026.0.0,~=2025.1.0", - "wpilib<2026.0.0,>=2025.3.2", -] +[[project.authors]] +name = "RobotPy Development Team" +email = "robotpy@googlegroups.com" -[tool.robotpy-build] -base_package = "rev" -update_init = ["rev"] +[project.urls] +"Source code" = "https://github.com/robotpy/robotpy-ctre" -[tool.robotpy-build.static_libs."revlib_driver".maven_lib_download] -artifact_id = "REVLib-driver" + +[tool.hatch.version] +source = "vcs" + +[tool.hatch.build.hooks.vcs] +version-file = "rev/version.py" + +[tool.hatch.build.targets.wheel] +packages = ["rev"] + +# +# Autogenerated TOML via `python3 -m hatch_robotpy.from_vendor` +# + +[[tool.hatch.build.hooks.robotpy.maven_lib_download]] +artifact_id = "REVLib-cpp" group_id = "com.revrobotics.frc" repo_url = "https://maven.revrobotics.com" version = "2025.0.3" -libs = ["REVLibDriver"] +staticlibs = ["REVLib"] +extract_to = "lib" -[tool.robotpy-build.static_libs."revlib".maven_lib_download] -artifact_id = "REVLib-cpp" +[[tool.hatch.build.hooks.robotpy.maven_lib_download]] +artifact_id = "REVLib-driver" group_id = "com.revrobotics.frc" repo_url = "https://maven.revrobotics.com" version = "2025.0.3" -libs = ["REVLib"] +staticlibs = [ "REVLibDriver"] +extract_to = "lib" + +# +# End autogenerated TOML +# + + +[tool.hatch.build.hooks.semiwrap] + +[tool.hatch.build.hooks.meson] -[tool.robotpy-build.wrappers."rev"] + + +[tool.semiwrap] +update_init = ["rev"] + + +[tool.semiwrap.extension_modules."rev._rev"] name = "rev" -sources = [ - "rev/rev.cpp" -] depends = [ - "wpilibc", - "wpilib_core", - "wpimath_cpp", - "wpiHal", - "wpiutil", - "revlib_driver", - "revlib", + "wpilib", ] -generation_data = "gen" +includes = [ + "lib/include" +] -[tool.robotpy-build.wrappers."rev".autogen_headers] +[tool.semiwrap.extension_modules."rev._rev".headers] # rev # CANSparkDriver = "rev/CANSparkDriver.h" # CANSparkDriverPrivate = "rev/CANSparkDriverPrivate.h" diff --git a/rev/__init__.py b/rev/__init__.py index b8497ff..7f270d7 100644 --- a/rev/__init__.py +++ b/rev/__init__.py @@ -1,8 +1,8 @@ from .version import __version__ -from . import _init_rev +from . import _init__rev -# autogenerated by 'robotpy-build create-imports rev rev._rev' +# autogenerated by 'semiwrap create-imports rev rev._rev' from ._rev import ( AbsoluteEncoder, AbsoluteEncoderConfig, diff --git a/rev/py.typed b/rev/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/rev/rev.cpp b/rev/rev.cpp index c7e6095..e8f3376 100644 --- a/rev/rev.cpp +++ b/rev/rev.cpp @@ -1,3 +1,3 @@ -#include +#include -RPYBUILD_PYBIND11_MODULE(m) { initWrapper(m); } \ No newline at end of file +SEMIWRAP_PYBIND11_MODULE(m) { initWrapper(m); } \ No newline at end of file diff --git a/semiwrap/.gitignore b/semiwrap/.gitignore new file mode 100644 index 0000000..6cdce10 --- /dev/null +++ b/semiwrap/.gitignore @@ -0,0 +1,3 @@ +/meson.build +/modules/meson.build +/trampolines/meson.build diff --git a/gen/AbsoluteEncoder.yml b/semiwrap/AbsoluteEncoder.yml similarity index 71% rename from gen/AbsoluteEncoder.yml rename to semiwrap/AbsoluteEncoder.yml index 93fb9f9..e139179 100644 --- a/gen/AbsoluteEncoder.yml +++ b/semiwrap/AbsoluteEncoder.yml @@ -1,7 +1,6 @@ ---- classes: - AbsoluteEncoder: + rev::AbsoluteEncoder: methods: GetPosition: GetVelocity: diff --git a/gen/AbsoluteEncoderConfig.yml b/semiwrap/AbsoluteEncoderConfig.yml similarity index 89% rename from gen/AbsoluteEncoderConfig.yml rename to semiwrap/AbsoluteEncoderConfig.yml index 92996ad..f4bbd36 100644 --- a/gen/AbsoluteEncoderConfig.yml +++ b/semiwrap/AbsoluteEncoderConfig.yml @@ -1,7 +1,6 @@ ---- classes: - AbsoluteEncoderConfig: + rev::spark::AbsoluteEncoderConfig: base_qualnames: BaseConfig: rev::BaseConfig methods: diff --git a/gen/AbsoluteEncoderConfigAccessor.yml b/semiwrap/AbsoluteEncoderConfigAccessor.yml similarity index 81% rename from gen/AbsoluteEncoderConfigAccessor.yml rename to semiwrap/AbsoluteEncoderConfigAccessor.yml index 90cc1ce..dcbfbc3 100644 --- a/gen/AbsoluteEncoderConfigAccessor.yml +++ b/semiwrap/AbsoluteEncoderConfigAccessor.yml @@ -1,7 +1,6 @@ ---- classes: - AbsoluteEncoderConfigAccessor: + rev::spark::AbsoluteEncoderConfigAccessor: methods: GetInverted: GetPositionConversionFactor: diff --git a/gen/AlternateEncoderConfig.yml b/semiwrap/AlternateEncoderConfig.yml similarity index 90% rename from gen/AlternateEncoderConfig.yml rename to semiwrap/AlternateEncoderConfig.yml index 33c562f..63612fb 100644 --- a/gen/AlternateEncoderConfig.yml +++ b/semiwrap/AlternateEncoderConfig.yml @@ -1,7 +1,6 @@ ---- classes: - AlternateEncoderConfig: + rev::spark::AlternateEncoderConfig: base_qualnames: BaseConfig: rev::BaseConfig enums: diff --git a/gen/AlternateEncoderConfigAccessor.yml b/semiwrap/AlternateEncoderConfigAccessor.yml similarity index 78% rename from gen/AlternateEncoderConfigAccessor.yml rename to semiwrap/AlternateEncoderConfigAccessor.yml index d660dde..f228087 100644 --- a/gen/AlternateEncoderConfigAccessor.yml +++ b/semiwrap/AlternateEncoderConfigAccessor.yml @@ -1,7 +1,6 @@ ---- classes: - AlternateEncoderConfigAccessor: + rev::spark::AlternateEncoderConfigAccessor: methods: GetCountsPerRevolution: GetInverted: diff --git a/gen/AnalogInput.yml b/semiwrap/AnalogInput.yml similarity index 75% rename from gen/AnalogInput.yml rename to semiwrap/AnalogInput.yml index 89b4ceb..d9b0928 100644 --- a/gen/AnalogInput.yml +++ b/semiwrap/AnalogInput.yml @@ -1,7 +1,6 @@ ---- classes: - AnalogInput: + rev::AnalogInput: methods: GetVoltage: GetPosition: diff --git a/gen/AnalogSensorConfig.yml b/semiwrap/AnalogSensorConfig.yml similarity index 85% rename from gen/AnalogSensorConfig.yml rename to semiwrap/AnalogSensorConfig.yml index c4ef206..da2c54d 100644 --- a/gen/AnalogSensorConfig.yml +++ b/semiwrap/AnalogSensorConfig.yml @@ -1,7 +1,6 @@ ---- classes: - AnalogSensorConfig: + rev::spark::AnalogSensorConfig: base_qualnames: BaseConfig: rev::BaseConfig methods: diff --git a/gen/AnalogSensorConfigAccessor.yml b/semiwrap/AnalogSensorConfigAccessor.yml similarity index 72% rename from gen/AnalogSensorConfigAccessor.yml rename to semiwrap/AnalogSensorConfigAccessor.yml index 36c573a..0bfbc73 100644 --- a/gen/AnalogSensorConfigAccessor.yml +++ b/semiwrap/AnalogSensorConfigAccessor.yml @@ -1,7 +1,6 @@ ---- classes: - AnalogSensorConfigAccessor: + rev::spark::AnalogSensorConfigAccessor: methods: GetInverted: GetPositionConversionFactor: diff --git a/gen/BaseConfig.yml b/semiwrap/BaseConfig.yml similarity index 95% rename from gen/BaseConfig.yml rename to semiwrap/BaseConfig.yml index 5958f5a..2ff338c 100644 --- a/gen/BaseConfig.yml +++ b/semiwrap/BaseConfig.yml @@ -1,7 +1,6 @@ ---- classes: - BaseConfig: + rev::BaseConfig: methods: Flatten: BaseConfig: diff --git a/gen/CIEColor.yml b/semiwrap/CIEColor.yml similarity index 85% rename from gen/CIEColor.yml rename to semiwrap/CIEColor.yml index 01472d8..e462e51 100644 --- a/gen/CIEColor.yml +++ b/semiwrap/CIEColor.yml @@ -1,7 +1,6 @@ ---- classes: - CIEColor: + rev::CIEColor: methods: CIEColor: GetX: diff --git a/gen/ClosedLoopConfig.yml b/semiwrap/ClosedLoopConfig.yml similarity index 95% rename from gen/ClosedLoopConfig.yml rename to semiwrap/ClosedLoopConfig.yml index be58adc..78098e7 100644 --- a/gen/ClosedLoopConfig.yml +++ b/semiwrap/ClosedLoopConfig.yml @@ -1,7 +1,6 @@ ---- classes: - ClosedLoopConfig: + rev::spark::ClosedLoopConfig: base_qualnames: BaseConfig: rev::BaseConfig attributes: diff --git a/gen/ClosedLoopConfigAccessor.yml b/semiwrap/ClosedLoopConfigAccessor.yml similarity index 89% rename from gen/ClosedLoopConfigAccessor.yml rename to semiwrap/ClosedLoopConfigAccessor.yml index 48068b9..f109b3a 100644 --- a/gen/ClosedLoopConfigAccessor.yml +++ b/semiwrap/ClosedLoopConfigAccessor.yml @@ -1,7 +1,6 @@ ---- classes: - ClosedLoopConfigAccessor: + rev::spark::ClosedLoopConfigAccessor: attributes: maxMotion: smartMotion: diff --git a/gen/ClosedLoopSlot.yml b/semiwrap/ClosedLoopSlot.yml similarity index 100% rename from gen/ClosedLoopSlot.yml rename to semiwrap/ClosedLoopSlot.yml diff --git a/gen/ColorMatch.yml b/semiwrap/ColorMatch.yml similarity index 92% rename from gen/ColorMatch.yml rename to semiwrap/ColorMatch.yml index 196da53..59007b6 100644 --- a/gen/ColorMatch.yml +++ b/semiwrap/ColorMatch.yml @@ -1,7 +1,6 @@ ---- classes: - ColorMatch: + rev::ColorMatch: methods: ColorMatch: AddColorMatch: diff --git a/gen/ColorSensorV3.yml b/semiwrap/ColorSensorV3.yml similarity index 91% rename from gen/ColorSensorV3.yml rename to semiwrap/ColorSensorV3.yml index 9c01ccc..9fd3fbb 100644 --- a/gen/ColorSensorV3.yml +++ b/semiwrap/ColorSensorV3.yml @@ -1,7 +1,6 @@ ---- classes: - ColorSensorV3: + rev::ColorSensorV3: enums: GainFactor: LEDPulseFrequency: @@ -23,7 +22,7 @@ classes: ConfigureColorSensor: HasReset: IsConnected: - ColorSensorV3::RawColor: + rev::ColorSensorV3::RawColor: attributes: red: green: diff --git a/gen/EncoderConfig.yml b/semiwrap/EncoderConfig.yml similarity index 92% rename from gen/EncoderConfig.yml rename to semiwrap/EncoderConfig.yml index 2b5da15..17a1efd 100644 --- a/gen/EncoderConfig.yml +++ b/semiwrap/EncoderConfig.yml @@ -1,7 +1,6 @@ ---- classes: - EncoderConfig: + rev::spark::EncoderConfig: base_qualnames: BaseConfig: rev::BaseConfig methods: diff --git a/gen/EncoderConfigAccessor.yml b/semiwrap/EncoderConfigAccessor.yml similarity index 87% rename from gen/EncoderConfigAccessor.yml rename to semiwrap/EncoderConfigAccessor.yml index fa722fd..592f7de 100644 --- a/gen/EncoderConfigAccessor.yml +++ b/semiwrap/EncoderConfigAccessor.yml @@ -1,7 +1,6 @@ ---- classes: - EncoderConfigAccessor: + rev::spark::EncoderConfigAccessor: methods: GetCountsPerRevolution: GetInverted: diff --git a/gen/ExternalEncoderConfig.yml b/semiwrap/ExternalEncoderConfig.yml similarity index 89% rename from gen/ExternalEncoderConfig.yml rename to semiwrap/ExternalEncoderConfig.yml index 893a3df..449206e 100644 --- a/gen/ExternalEncoderConfig.yml +++ b/semiwrap/ExternalEncoderConfig.yml @@ -1,7 +1,6 @@ ---- classes: - ExternalEncoderConfig: + rev::spark::ExternalEncoderConfig: base_qualnames: BaseConfig: rev::BaseConfig enums: diff --git a/gen/ExternalEncoderConfigAccessor.yml b/semiwrap/ExternalEncoderConfigAccessor.yml similarity index 81% rename from gen/ExternalEncoderConfigAccessor.yml rename to semiwrap/ExternalEncoderConfigAccessor.yml index c66c045..e269b4c 100644 --- a/gen/ExternalEncoderConfigAccessor.yml +++ b/semiwrap/ExternalEncoderConfigAccessor.yml @@ -1,7 +1,6 @@ ---- classes: - ExternalEncoderConfigAccessor: + rev::spark::ExternalEncoderConfigAccessor: methods: GetCountsPerRevolution: GetInverted: diff --git a/gen/LimitSwitchConfig.yml b/semiwrap/LimitSwitchConfig.yml similarity index 90% rename from gen/LimitSwitchConfig.yml rename to semiwrap/LimitSwitchConfig.yml index 1a75df0..e8ae0c3 100644 --- a/gen/LimitSwitchConfig.yml +++ b/semiwrap/LimitSwitchConfig.yml @@ -1,7 +1,6 @@ ---- classes: - LimitSwitchConfig: + rev::spark::LimitSwitchConfig: base_qualnames: BaseConfig: rev::BaseConfig enums: diff --git a/gen/LimitSwitchConfigAccessor.yml b/semiwrap/LimitSwitchConfigAccessor.yml similarity index 78% rename from gen/LimitSwitchConfigAccessor.yml rename to semiwrap/LimitSwitchConfigAccessor.yml index 285f0f2..86d3238 100644 --- a/gen/LimitSwitchConfigAccessor.yml +++ b/semiwrap/LimitSwitchConfigAccessor.yml @@ -1,7 +1,6 @@ ---- classes: - LimitSwitchConfigAccessor: + rev::spark::LimitSwitchConfigAccessor: methods: GetForwardLimitSwitchEnabled: GetForwardSwitchType: diff --git a/gen/MAXMotionConfig.yml b/semiwrap/MAXMotionConfig.yml similarity index 88% rename from gen/MAXMotionConfig.yml rename to semiwrap/MAXMotionConfig.yml index e7fa7fb..2b0814e 100644 --- a/gen/MAXMotionConfig.yml +++ b/semiwrap/MAXMotionConfig.yml @@ -1,7 +1,6 @@ ---- classes: - MAXMotionConfig: + rev::spark::MAXMotionConfig: base_qualnames: BaseConfig: rev::BaseConfig enums: diff --git a/gen/MAXMotionConfigAccessor.yml b/semiwrap/MAXMotionConfigAccessor.yml similarity index 76% rename from gen/MAXMotionConfigAccessor.yml rename to semiwrap/MAXMotionConfigAccessor.yml index dbc1616..d17dc1a 100644 --- a/gen/MAXMotionConfigAccessor.yml +++ b/semiwrap/MAXMotionConfigAccessor.yml @@ -1,7 +1,6 @@ ---- classes: - MAXMotionConfigAccessor: + rev::spark::MAXMotionConfigAccessor: methods: GetMaxVelocity: GetMaxAcceleration: diff --git a/gen/MovingAverageFilterSim.yml b/semiwrap/MovingAverageFilterSim.yml similarity index 66% rename from gen/MovingAverageFilterSim.yml rename to semiwrap/MovingAverageFilterSim.yml index 9aec38c..b260812 100644 --- a/gen/MovingAverageFilterSim.yml +++ b/semiwrap/MovingAverageFilterSim.yml @@ -1,7 +1,6 @@ ---- classes: - MovingAverageFilterSim: + rev::spark::MovingAverageFilterSim: methods: MovingAverageFilterSim: put: diff --git a/gen/NoiseGenerator.yml b/semiwrap/NoiseGenerator.yml similarity index 69% rename from gen/NoiseGenerator.yml rename to semiwrap/NoiseGenerator.yml index a2605b9..c280140 100644 --- a/gen/NoiseGenerator.yml +++ b/semiwrap/NoiseGenerator.yml @@ -1,7 +1,6 @@ ---- classes: - NoiseGenerator: + rev::spark::NoiseGenerator: methods: whiteNoise: hallSensorVelocity: diff --git a/gen/REVLibError.yml b/semiwrap/REVLibError.yml similarity index 100% rename from gen/REVLibError.yml rename to semiwrap/REVLibError.yml diff --git a/gen/RelativeEncoder.yml b/semiwrap/RelativeEncoder.yml similarity index 83% rename from gen/RelativeEncoder.yml rename to semiwrap/RelativeEncoder.yml index d1ec149..3ca05ac 100644 --- a/gen/RelativeEncoder.yml +++ b/semiwrap/RelativeEncoder.yml @@ -1,10 +1,9 @@ ---- extra_includes_first: - rev/REVLibError.h classes: - RelativeEncoder: + rev::RelativeEncoder: methods: GetPosition: GetVelocity: diff --git a/gen/SignalsConfig.yml b/semiwrap/SignalsConfig.yml similarity index 97% rename from gen/SignalsConfig.yml rename to semiwrap/SignalsConfig.yml index 81fa700..fc195f7 100644 --- a/gen/SignalsConfig.yml +++ b/semiwrap/SignalsConfig.yml @@ -1,7 +1,6 @@ ---- classes: - SignalsConfig: + rev::spark::SignalsConfig: base_qualnames: BaseConfig: rev::BaseConfig methods: diff --git a/gen/SignalsConfigAccessor.yml b/semiwrap/SignalsConfigAccessor.yml similarity index 97% rename from gen/SignalsConfigAccessor.yml rename to semiwrap/SignalsConfigAccessor.yml index 3d73820..9864d93 100644 --- a/gen/SignalsConfigAccessor.yml +++ b/semiwrap/SignalsConfigAccessor.yml @@ -1,7 +1,6 @@ ---- classes: - SignalsConfigAccessor: + rev::spark::SignalsConfigAccessor: methods: GetAppliedOutputPeriodMs: GetAppliedOutputAlwaysOn: diff --git a/gen/SmartMotionConfig.yml b/semiwrap/SmartMotionConfig.yml similarity index 86% rename from gen/SmartMotionConfig.yml rename to semiwrap/SmartMotionConfig.yml index 7514b22..b53b8a5 100644 --- a/gen/SmartMotionConfig.yml +++ b/semiwrap/SmartMotionConfig.yml @@ -1,7 +1,6 @@ ---- classes: - SmartMotionConfig: + rev::spark::SmartMotionConfig: base_qualnames: BaseConfig: rev::BaseConfig methods: diff --git a/gen/SmartMotionConfigAccessor.yml b/semiwrap/SmartMotionConfigAccessor.yml similarity index 76% rename from gen/SmartMotionConfigAccessor.yml rename to semiwrap/SmartMotionConfigAccessor.yml index d2ba6a1..df1d046 100644 --- a/gen/SmartMotionConfigAccessor.yml +++ b/semiwrap/SmartMotionConfigAccessor.yml @@ -1,7 +1,6 @@ ---- classes: - SmartMotionConfigAccessor: + rev::spark::SmartMotionConfigAccessor: methods: GetMaxVelocity: GetMaxAcceleration: diff --git a/gen/SoftLimitConfig.yml b/semiwrap/SoftLimitConfig.yml similarity index 87% rename from gen/SoftLimitConfig.yml rename to semiwrap/SoftLimitConfig.yml index 889c99d..e0787d6 100644 --- a/gen/SoftLimitConfig.yml +++ b/semiwrap/SoftLimitConfig.yml @@ -1,7 +1,6 @@ ---- classes: - SoftLimitConfig: + rev::spark::SoftLimitConfig: base_qualnames: BaseConfig: rev::BaseConfig methods: diff --git a/gen/SoftLimitConfigAccessor.yml b/semiwrap/SoftLimitConfigAccessor.yml similarity index 78% rename from gen/SoftLimitConfigAccessor.yml rename to semiwrap/SoftLimitConfigAccessor.yml index 11d7b22..3818c6c 100644 --- a/gen/SoftLimitConfigAccessor.yml +++ b/semiwrap/SoftLimitConfigAccessor.yml @@ -1,7 +1,6 @@ ---- classes: - SoftLimitConfigAccessor: + rev::spark::SoftLimitConfigAccessor: methods: GetForwardSoftLimitEnabled: GetForwardSoftLimit: diff --git a/gen/SparkAbsoluteEncoder.yml b/semiwrap/SparkAbsoluteEncoder.yml similarity index 77% rename from gen/SparkAbsoluteEncoder.yml rename to semiwrap/SparkAbsoluteEncoder.yml index 8274c4a..c31b0c4 100644 --- a/gen/SparkAbsoluteEncoder.yml +++ b/semiwrap/SparkAbsoluteEncoder.yml @@ -1,7 +1,6 @@ ---- classes: - SparkAbsoluteEncoder: + rev::spark::SparkAbsoluteEncoder: base_qualnames: AbsoluteEncoder: rev::AbsoluteEncoder methods: diff --git a/gen/SparkAbsoluteEncoderSim.yml b/semiwrap/SparkAbsoluteEncoderSim.yml similarity index 91% rename from gen/SparkAbsoluteEncoderSim.yml rename to semiwrap/SparkAbsoluteEncoderSim.yml index 3aeb935..377f465 100644 --- a/gen/SparkAbsoluteEncoderSim.yml +++ b/semiwrap/SparkAbsoluteEncoderSim.yml @@ -1,7 +1,6 @@ ---- classes: - SparkAbsoluteEncoderSim: + rev::spark::SparkAbsoluteEncoderSim: methods: SparkAbsoluteEncoderSim: overloads: diff --git a/gen/SparkAnalogSensor.yml b/semiwrap/SparkAnalogSensor.yml similarity index 80% rename from gen/SparkAnalogSensor.yml rename to semiwrap/SparkAnalogSensor.yml index 3db85b9..beb9aae 100644 --- a/gen/SparkAnalogSensor.yml +++ b/semiwrap/SparkAnalogSensor.yml @@ -1,7 +1,6 @@ ---- classes: - SparkAnalogSensor: + rev::spark::SparkAnalogSensor: base_qualnames: AnalogInput: rev::AnalogInput methods: diff --git a/gen/SparkAnalogSensorSim.yml b/semiwrap/SparkAnalogSensorSim.yml similarity index 92% rename from gen/SparkAnalogSensorSim.yml rename to semiwrap/SparkAnalogSensorSim.yml index 9772035..2941c8c 100644 --- a/gen/SparkAnalogSensorSim.yml +++ b/semiwrap/SparkAnalogSensorSim.yml @@ -1,7 +1,6 @@ ---- classes: - SparkAnalogSensorSim: + rev::spark::SparkAnalogSensorSim: methods: SparkAnalogSensorSim: overloads: diff --git a/gen/SparkBase.yml b/semiwrap/SparkBase.yml similarity index 96% rename from gen/SparkBase.yml rename to semiwrap/SparkBase.yml index 7717af8..ab98fe8 100644 --- a/gen/SparkBase.yml +++ b/semiwrap/SparkBase.yml @@ -1,4 +1,3 @@ ---- extra_includes_first: - rev/REVLibError.h @@ -11,7 +10,7 @@ extra_includes: # - rev::REVLibError classes: - SparkBase: + rev::spark::SparkBase: typealias: - rev::spark::SparkLowLevel::MotorType - rev::spark::SparkLowLevel::SparkModel @@ -93,7 +92,7 @@ classes: GetEncoderEvenIfAlreadyCreated: GetMotorInterface: GetSparkModel: - SparkBase::Faults: + rev::spark::SparkBase::Faults: attributes: other: motorType: @@ -109,7 +108,7 @@ classes: overloads: "": uint16_t: - SparkBase::Warnings: + rev::spark::SparkBase::Warnings: attributes: brownout: overcurrent: diff --git a/gen/SparkBaseConfig.yml b/semiwrap/SparkBaseConfig.yml similarity index 96% rename from gen/SparkBaseConfig.yml rename to semiwrap/SparkBaseConfig.yml index 399a8d6..74c9910 100644 --- a/gen/SparkBaseConfig.yml +++ b/semiwrap/SparkBaseConfig.yml @@ -1,7 +1,6 @@ ---- classes: - SparkBaseConfig: + rev::spark::SparkBaseConfig: base_qualnames: BaseConfig: rev::BaseConfig attributes: diff --git a/gen/SparkBaseConfigAccessor.yml b/semiwrap/SparkBaseConfigAccessor.yml similarity index 93% rename from gen/SparkBaseConfigAccessor.yml rename to semiwrap/SparkBaseConfigAccessor.yml index f557a86..7bb3368 100644 --- a/gen/SparkBaseConfigAccessor.yml +++ b/semiwrap/SparkBaseConfigAccessor.yml @@ -1,7 +1,6 @@ ---- classes: - SparkBaseConfigAccessor: + rev::spark::SparkBaseConfigAccessor: attributes: absoluteEncoder: analogSensor: diff --git a/gen/SparkClosedLoopController.yml b/semiwrap/SparkClosedLoopController.yml similarity index 72% rename from gen/SparkClosedLoopController.yml rename to semiwrap/SparkClosedLoopController.yml index 51c082b..55f50af 100644 --- a/gen/SparkClosedLoopController.yml +++ b/semiwrap/SparkClosedLoopController.yml @@ -1,7 +1,6 @@ ---- classes: - SparkClosedLoopController: + rev::spark::SparkClosedLoopController: enums: ArbFFUnits: methods: diff --git a/gen/SparkExternalEncoderSim.yml b/semiwrap/SparkExternalEncoderSim.yml similarity index 90% rename from gen/SparkExternalEncoderSim.yml rename to semiwrap/SparkExternalEncoderSim.yml index e5a1df3..193a447 100644 --- a/gen/SparkExternalEncoderSim.yml +++ b/semiwrap/SparkExternalEncoderSim.yml @@ -1,7 +1,6 @@ ---- classes: - SparkExternalEncoderSim: + rev::spark::SparkExternalEncoderSim: methods: SparkExternalEncoderSim: SetPosition: diff --git a/gen/SparkFlex.yml b/semiwrap/SparkFlex.yml similarity index 92% rename from gen/SparkFlex.yml rename to semiwrap/SparkFlex.yml index 5aa16cd..61e5427 100644 --- a/gen/SparkFlex.yml +++ b/semiwrap/SparkFlex.yml @@ -1,4 +1,3 @@ ---- extra_includes_first: - rev/REVLibError.h @@ -7,7 +6,7 @@ extra_includes: - rev/SparkLowLevel.h classes: - SparkFlex: + rev::spark::SparkFlex: typealias: - rev::spark::SparkLowLevel::MotorType attributes: diff --git a/gen/SparkFlexConfig.yml b/semiwrap/SparkFlexConfig.yml similarity index 91% rename from gen/SparkFlexConfig.yml rename to semiwrap/SparkFlexConfig.yml index 9cc49a7..fe256dc 100644 --- a/gen/SparkFlexConfig.yml +++ b/semiwrap/SparkFlexConfig.yml @@ -1,10 +1,9 @@ ---- extra_includes: - sparkbaseconfig_apply.h classes: - SparkFlexConfig: + rev::spark::SparkFlexConfig: attributes: externalEncoder: methods: diff --git a/gen/SparkFlexConfigAccessor.yml b/semiwrap/SparkFlexConfigAccessor.yml similarity index 65% rename from gen/SparkFlexConfigAccessor.yml rename to semiwrap/SparkFlexConfigAccessor.yml index fe997ba..83260b3 100644 --- a/gen/SparkFlexConfigAccessor.yml +++ b/semiwrap/SparkFlexConfigAccessor.yml @@ -1,7 +1,6 @@ ---- classes: - SparkFlexConfigAccessor: + rev::spark::SparkFlexConfigAccessor: is_polymorphic: false attributes: externalEncoder: diff --git a/gen/SparkFlexExternalEncoder.yml b/semiwrap/SparkFlexExternalEncoder.yml similarity index 78% rename from gen/SparkFlexExternalEncoder.yml rename to semiwrap/SparkFlexExternalEncoder.yml index b180d70..c44138f 100644 --- a/gen/SparkFlexExternalEncoder.yml +++ b/semiwrap/SparkFlexExternalEncoder.yml @@ -1,7 +1,6 @@ ---- classes: - SparkFlexExternalEncoder: + rev::spark::SparkFlexExternalEncoder: base_qualnames: RelativeEncoder: rev::RelativeEncoder methods: diff --git a/gen/SparkFlexSim.yml b/semiwrap/SparkFlexSim.yml similarity index 83% rename from gen/SparkFlexSim.yml rename to semiwrap/SparkFlexSim.yml index b985fa6..6e1d5bc 100644 --- a/gen/SparkFlexSim.yml +++ b/semiwrap/SparkFlexSim.yml @@ -1,7 +1,6 @@ ---- classes: - SparkFlexSim: + rev::spark::SparkFlexSim: is_polymorphic: false methods: SparkFlexSim: diff --git a/gen/SparkLimitSwitch.yml b/semiwrap/SparkLimitSwitch.yml similarity index 51% rename from gen/SparkLimitSwitch.yml rename to semiwrap/SparkLimitSwitch.yml index 70b4fb0..3bfaa8c 100644 --- a/gen/SparkLimitSwitch.yml +++ b/semiwrap/SparkLimitSwitch.yml @@ -1,6 +1,5 @@ ---- classes: - SparkLimitSwitch: + rev::spark::SparkLimitSwitch: methods: Get: diff --git a/gen/SparkLimitSwitchSim.yml b/semiwrap/SparkLimitSwitchSim.yml similarity index 83% rename from gen/SparkLimitSwitchSim.yml rename to semiwrap/SparkLimitSwitchSim.yml index 50949af..520be95 100644 --- a/gen/SparkLimitSwitchSim.yml +++ b/semiwrap/SparkLimitSwitchSim.yml @@ -1,7 +1,6 @@ ---- classes: - SparkLimitSwitchSim: + rev::spark::SparkLimitSwitchSim: methods: SparkLimitSwitchSim: overloads: diff --git a/gen/SparkLowLevel.yml b/semiwrap/SparkLowLevel.yml similarity index 87% rename from gen/SparkLowLevel.yml rename to semiwrap/SparkLowLevel.yml index a9b4062..28dc046 100644 --- a/gen/SparkLowLevel.yml +++ b/semiwrap/SparkLowLevel.yml @@ -1,10 +1,9 @@ ---- extra_includes_first: - rev/REVLibError.h classes: - SparkLowLevel: + rev::spark::SparkLowLevel: attributes: kAPIMajorVersion: kAPIMinorVersion: @@ -55,7 +54,7 @@ classes: ignore: true GetSafeFloat: ignore: true - SparkLowLevel::PeriodicStatus0: + rev::spark::SparkLowLevel::PeriodicStatus0: attributes: appliedOutput: voltage: @@ -68,7 +67,7 @@ classes: inverted: primaryHeartbeatLock: timestamp: - SparkLowLevel::PeriodicStatus1: + rev::spark::SparkLowLevel::PeriodicStatus1: attributes: otherFault: motorTypeFault: @@ -104,34 +103,34 @@ classes: otherStickyWarning: isFollower: timestamp: - SparkLowLevel::PeriodicStatus2: + rev::spark::SparkLowLevel::PeriodicStatus2: attributes: primaryEncoderVelocity: primaryEncoderPosition: timestamp: - SparkLowLevel::PeriodicStatus3: + rev::spark::SparkLowLevel::PeriodicStatus3: attributes: analogVoltage: analogVelocity: analogPosition: timestamp: - SparkLowLevel::PeriodicStatus4: + rev::spark::SparkLowLevel::PeriodicStatus4: attributes: externalOrAltEncoderVelocity: externalOrAltEncoderPosition: timestamp: - SparkLowLevel::PeriodicStatus5: + rev::spark::SparkLowLevel::PeriodicStatus5: attributes: dutyCycleEncoderVelocity: dutyCycleEncoderPosition: timestamp: - SparkLowLevel::PeriodicStatus6: + rev::spark::SparkLowLevel::PeriodicStatus6: attributes: unadjustedDutyCycle: dutyCyclePeriod: dutyCycleNoSignal: timestamp: - SparkLowLevel::PeriodicStatus7: + rev::spark::SparkLowLevel::PeriodicStatus7: attributes: iAccumulation: timestamp: diff --git a/gen/SparkMax.yml b/semiwrap/SparkMax.yml similarity index 96% rename from gen/SparkMax.yml rename to semiwrap/SparkMax.yml index 633a1b5..e1cfbe5 100644 --- a/gen/SparkMax.yml +++ b/semiwrap/SparkMax.yml @@ -1,11 +1,10 @@ ---- extra_includes_first: - rev/REVLibError.h - rev/SparkLowLevel.h classes: - SparkMax: + rev::spark::SparkMax: typealias: - rev::spark::SparkLowLevel::MotorType - rev::spark::SparkBase::PersistMode diff --git a/gen/SparkMaxAlternateEncoder.yml b/semiwrap/SparkMaxAlternateEncoder.yml similarity index 78% rename from gen/SparkMaxAlternateEncoder.yml rename to semiwrap/SparkMaxAlternateEncoder.yml index 16e5823..e6f6619 100644 --- a/gen/SparkMaxAlternateEncoder.yml +++ b/semiwrap/SparkMaxAlternateEncoder.yml @@ -1,7 +1,6 @@ ---- classes: - SparkMaxAlternateEncoder: + rev::spark::SparkMaxAlternateEncoder: base_qualnames: RelativeEncoder: rev::RelativeEncoder methods: diff --git a/gen/SparkMaxAlternateEncoderSim.yml b/semiwrap/SparkMaxAlternateEncoderSim.yml similarity index 89% rename from gen/SparkMaxAlternateEncoderSim.yml rename to semiwrap/SparkMaxAlternateEncoderSim.yml index 300903a..d81b9f0 100644 --- a/gen/SparkMaxAlternateEncoderSim.yml +++ b/semiwrap/SparkMaxAlternateEncoderSim.yml @@ -1,7 +1,6 @@ ---- classes: - SparkMaxAlternateEncoderSim: + rev::spark::SparkMaxAlternateEncoderSim: methods: SparkMaxAlternateEncoderSim: SetPosition: diff --git a/gen/SparkMaxConfig.yml b/semiwrap/SparkMaxConfig.yml similarity index 92% rename from gen/SparkMaxConfig.yml rename to semiwrap/SparkMaxConfig.yml index db7b596..bd3c070 100644 --- a/gen/SparkMaxConfig.yml +++ b/semiwrap/SparkMaxConfig.yml @@ -1,10 +1,9 @@ ---- extra_includes: - sparkbaseconfig_apply.h classes: - SparkMaxConfig: + rev::spark::SparkMaxConfig: attributes: alternateEncoder: enums: diff --git a/gen/SparkMaxConfigAccessor.yml b/semiwrap/SparkMaxConfigAccessor.yml similarity index 66% rename from gen/SparkMaxConfigAccessor.yml rename to semiwrap/SparkMaxConfigAccessor.yml index f8c5387..a18724e 100644 --- a/gen/SparkMaxConfigAccessor.yml +++ b/semiwrap/SparkMaxConfigAccessor.yml @@ -1,7 +1,6 @@ ---- classes: - SparkMaxConfigAccessor: + rev::spark::SparkMaxConfigAccessor: is_polymorphic: false attributes: alternateEncoder: diff --git a/gen/SparkMaxSim.yml b/semiwrap/SparkMaxSim.yml similarity index 84% rename from gen/SparkMaxSim.yml rename to semiwrap/SparkMaxSim.yml index e130157..16d9a25 100644 --- a/gen/SparkMaxSim.yml +++ b/semiwrap/SparkMaxSim.yml @@ -1,7 +1,6 @@ ---- classes: - SparkMaxSim: + rev::spark::SparkMaxSim: is_polymorphic: false methods: SparkMaxSim: diff --git a/gen/SparkParameters.yml b/semiwrap/SparkParameters.yml similarity index 100% rename from gen/SparkParameters.yml rename to semiwrap/SparkParameters.yml diff --git a/gen/SparkRelativeEncoder.yml b/semiwrap/SparkRelativeEncoder.yml similarity index 80% rename from gen/SparkRelativeEncoder.yml rename to semiwrap/SparkRelativeEncoder.yml index 9e97062..74ff9e7 100644 --- a/gen/SparkRelativeEncoder.yml +++ b/semiwrap/SparkRelativeEncoder.yml @@ -1,7 +1,6 @@ ---- classes: - SparkRelativeEncoder: + rev::spark::SparkRelativeEncoder: base_qualnames: RelativeEncoder: rev::RelativeEncoder methods: diff --git a/gen/SparkRelativeEncoderSim.yml b/semiwrap/SparkRelativeEncoderSim.yml similarity index 91% rename from gen/SparkRelativeEncoderSim.yml rename to semiwrap/SparkRelativeEncoderSim.yml index 7d789ff..cbc996d 100644 --- a/gen/SparkRelativeEncoderSim.yml +++ b/semiwrap/SparkRelativeEncoderSim.yml @@ -1,7 +1,6 @@ ---- classes: - SparkRelativeEncoderSim: + rev::spark::SparkRelativeEncoderSim: methods: SparkRelativeEncoderSim: overloads: diff --git a/gen/SparkSim.yml b/semiwrap/SparkSim.yml similarity index 97% rename from gen/SparkSim.yml rename to semiwrap/SparkSim.yml index 07647c8..ec5c686 100644 --- a/gen/SparkSim.yml +++ b/semiwrap/SparkSim.yml @@ -1,7 +1,6 @@ ---- classes: - SparkSim: + rev::spark::SparkSim: methods: SparkSim: GetAppliedOutput: diff --git a/gen/SparkSimFaultManager.yml b/semiwrap/SparkSimFaultManager.yml similarity index 84% rename from gen/SparkSimFaultManager.yml rename to semiwrap/SparkSimFaultManager.yml index 2d967ac..4421fe9 100644 --- a/gen/SparkSimFaultManager.yml +++ b/semiwrap/SparkSimFaultManager.yml @@ -1,7 +1,6 @@ ---- classes: - SparkSimFaultManager: + rev::spark::SparkSimFaultManager: methods: SparkSimFaultManager: overloads: diff --git a/setup.py b/setup.py deleted file mode 100644 index 3542d0c..0000000 --- a/setup.py +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env python3 - -from robotpy_build.setup import setup - -setup()