Skip to content

Commit

Permalink
bump to v29.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
s5suzuki committed Feb 10, 2025
1 parent cd17153 commit 86f115d
Show file tree
Hide file tree
Showing 6 changed files with 94 additions and 97 deletions.
16 changes: 8 additions & 8 deletions ThirdPartyNotice.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,35 +26,35 @@ ash 0.38.0+1.3.281 (Apache-2.0 OR MIT)
https://github.com/ash-rs/ash
---------------------------------------------------------

autd3 29.0.0-rc.20 (MIT)
autd3 29.0.0 (MIT)
https://github.com/shinolab/autd3-rs
---------------------------------------------------------

autd3-core 29.0.0-rc.20 (MIT)
autd3-core 29.0.0 (MIT)
https://github.com/shinolab/autd3-rs
---------------------------------------------------------

autd3-derive 29.0.0-rc.20 (MIT)
autd3-derive 29.0.0 (MIT)
https://github.com/shinolab/autd3-rs
---------------------------------------------------------

autd3-driver 29.0.0-rc.20 (MIT)
autd3-driver 29.0.0 (MIT)
https://github.com/shinolab/autd3-rs
---------------------------------------------------------

autd3-emulator 29.0.0-rc.20 (MIT)
autd3-emulator 29.0.0 (MIT)
https://github.com/shinolab/autd3-emulator
---------------------------------------------------------

autd3-firmware-emulator 29.0.0-rc.20 (MIT)
autd3-firmware-emulator 29.0.0 (MIT)
https://github.com/shinolab/autd3-rs
---------------------------------------------------------

autd3capi-driver 29.0.0-rc.20 (MIT)
autd3capi-driver 29.0.0 (MIT)
https://github.com/shinolab/autd3-capi
---------------------------------------------------------

autd3capi-emulator 29.0.0-rc.20 (MIT)
autd3capi-emulator 29.0.0 (MIT)
https://github.com/shinolab/autd3-capi-emulator
---------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion pyautd3_emulator/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
]


__version__ = "29.0.0rc20"
__version__ = "29.0.0"
56 changes: 28 additions & 28 deletions pyautd3_emulator/native_methods/autd3capi_emulator.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,26 @@ def __eq__(self, other: object) -> bool:
return isinstance(other, EmulatorPtr) and self._fields_ == other._fields_ # pragma: no cover


class InstantPtr(ctypes.Structure):
class RangeXYZ(ctypes.Structure):
_fields_ = [
("x_start", ctypes.c_float),
("x_end", ctypes.c_float),
("y_start", ctypes.c_float),
("y_end", ctypes.c_float),
("z_start", ctypes.c_float),
("z_end", ctypes.c_float),
("resolution", ctypes.c_float),
]

def __eq__(self, other: object) -> bool:
return isinstance(other, RangeXYZ) and self._fields_ == other._fields_ # pragma: no cover


class EmulatorControllerPtr(ctypes.Structure):
_fields_ = [("value", ctypes.c_void_p)]

def __eq__(self, other: object) -> bool:
return isinstance(other, InstantPtr) and self._fields_ == other._fields_ # pragma: no cover
return isinstance(other, EmulatorControllerPtr) and self._fields_ == other._fields_ # pragma: no cover


class RmsPtr(ctypes.Structure):
Expand All @@ -41,18 +56,18 @@ def __eq__(self, other: object) -> bool:
return isinstance(other, RmsPtr) and self._fields_ == other._fields_ # pragma: no cover


class EmulatorControllerPtr(ctypes.Structure):
class InstantPtr(ctypes.Structure):
_fields_ = [("value", ctypes.c_void_p)]

def __eq__(self, other: object) -> bool:
return isinstance(other, EmulatorControllerPtr) and self._fields_ == other._fields_ # pragma: no cover
return isinstance(other, InstantPtr) and self._fields_ == other._fields_ # pragma: no cover


class ResultRms(ctypes.Structure):
_fields_ = [("result", RmsPtr), ("err_len", ctypes.c_uint32), ("err", ctypes.c_void_p)]
class RecordPtr(ctypes.Structure):
_fields_ = [("value", ctypes.c_void_p)]

def __eq__(self, other: object) -> bool:
return isinstance(other, ResultRms) and self._fields_ == other._fields_ # pragma: no cover
return isinstance(other, RecordPtr) and self._fields_ == other._fields_ # pragma: no cover


class RmsRecordOption(ctypes.Structure):
Expand All @@ -62,26 +77,18 @@ def __eq__(self, other: object) -> bool:
return isinstance(other, RmsRecordOption) and self._fields_ == other._fields_ # pragma: no cover


class RecordPtr(ctypes.Structure):
_fields_ = [("value", ctypes.c_void_p)]
class ResultRecord(ctypes.Structure):
_fields_ = [("result", RecordPtr), ("err_len", ctypes.c_uint32), ("err", ctypes.c_void_p)]

def __eq__(self, other: object) -> bool:
return isinstance(other, RecordPtr) and self._fields_ == other._fields_ # pragma: no cover
return isinstance(other, ResultRecord) and self._fields_ == other._fields_ # pragma: no cover


class RangeXYZ(ctypes.Structure):
_fields_ = [
("x_start", ctypes.c_float),
("x_end", ctypes.c_float),
("y_start", ctypes.c_float),
("y_end", ctypes.c_float),
("z_start", ctypes.c_float),
("z_end", ctypes.c_float),
("resolution", ctypes.c_float),
]
class ResultRms(ctypes.Structure):
_fields_ = [("result", RmsPtr), ("err_len", ctypes.c_uint32), ("err", ctypes.c_void_p)]

def __eq__(self, other: object) -> bool:
return isinstance(other, RangeXYZ) and self._fields_ == other._fields_ # pragma: no cover
return isinstance(other, ResultRms) and self._fields_ == other._fields_ # pragma: no cover


class ResultInstant(ctypes.Structure):
Expand All @@ -91,13 +98,6 @@ def __eq__(self, other: object) -> bool:
return isinstance(other, ResultInstant) and self._fields_ == other._fields_ # pragma: no cover


class ResultRecord(ctypes.Structure):
_fields_ = [("result", RecordPtr), ("err_len", ctypes.c_uint32), ("err", ctypes.c_void_p)]

def __eq__(self, other: object) -> bool:
return isinstance(other, ResultRecord) and self._fields_ == other._fields_ # pragma: no cover


class Singleton(type):
_instances = {} # type: ignore[var-annotated]
_lock = threading.Lock()
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[project]
name = "pyautd3_emulator"
authors = [{ name = "Shun Suzuki", email = "suzuki@hapis.k.u-tokyo.ac.jp" }]
version = "29.0.0rc20"
version = "29.0.0"
description = "autd3-emulator library wrapper for python"
readme = "README.md"
requires-python = ">=3.11"
dependencies = ["numpy>=2", "polars>=1.21.0", "pyautd3==29.0.0rc20"]
dependencies = ["numpy>=2", "polars>=1.21.0", "pyautd3==29.0.0"]
classifiers = [
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
Expand Down
2 changes: 1 addition & 1 deletion tools/wrapper-generator/capi-emulator
Loading

0 comments on commit 86f115d

Please sign in to comment.