X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fpython%2Fsigrok%2Fcore%2Fclasses.i;fp=bindings%2Fpython%2Fsigrok%2Fcore%2Fclasses.i;h=49cfba98791443e48c7b0f4fe8d7eec246d7a873;hb=dd13d47a9ef6c9a5c1c1920d8ac57e22bd1d9960;hp=07b13715964a699ee685f77084bdabd658e49ce5;hpb=edb691fcedb767093885c61d19d8d490c9c8c9c2;p=libsigrok.git diff --git a/bindings/python/sigrok/core/classes.i b/bindings/python/sigrok/core/classes.i index 07b13715..49cfba98 100644 --- a/bindings/python/sigrok/core/classes.i +++ b/bindings/python/sigrok/core/classes.i @@ -250,9 +250,9 @@ typedef guint pyg_flags_type; { return dynamic_pointer_cast($self->payload()); } - std::shared_ptr _payload_analog_old() + std::shared_ptr _payload_analog() { - return dynamic_pointer_cast($self->payload()); + return dynamic_pointer_cast($self->payload()); } std::shared_ptr _payload_logic() { @@ -271,8 +271,8 @@ typedef guint pyg_flags_type; return self._payload_meta() elif self.type == PacketType.LOGIC: return self._payload_logic() - elif self.type == PacketType.ANALOG_OLD: - return self._payload_analog_old() + elif self.type == PacketType.ANALOG: + return self._payload_analog() else: return None @@ -377,7 +377,7 @@ std::map dict_to_map_options(PyObject *dict, %} /* Ignore these methods, we will override them below. */ -%ignore sigrok::AnalogOld::data; +%ignore sigrok::Analog::data; %ignore sigrok::Driver::scan; %ignore sigrok::InputFormat::create_input; %ignore sigrok::OutputFormat::create_output; @@ -506,8 +506,8 @@ std::map dict_to_map_options(PyObject *dict, } } -/* Return NumPy array from AnalogOld::data(). */ -%extend sigrok::AnalogOld +/* Return NumPy array from Analog::data(). */ +%extend sigrok::Analog { PyObject * _data() {