Skip to content

Commit 49b1317

Browse files
author
Pieter (Pozyx)
committed
Fixed remote positioning, deprecated giving the algorithm to positioning
1 parent 0bb54c4 commit 49b1317

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

Pozyx.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1615,7 +1615,10 @@ class PozyxClass
16151615
/** \addtogroup positioning_functions
16161616
* @{
16171617
*/
1618-
1618+
1619+
[[deprecated("doPositioning will no longer set the algorithm in future releases. Use setPositionAlgorithm in setup() instead.")]]
1620+
static int doPositioning(coordinates_t *coordinates, uint8_t dimension, int32_t height, uint8_t algorithm);
1621+
16191622
/**
16201623
* Obtain the coordinates.
16211624
* This function triggers the positioning algorithm to perform positioning with the given parameters.
@@ -1633,9 +1636,9 @@ class PozyxClass
16331636
*
16341637
* @see doRemotePositioning, doAnchorCalibration, addDevice, setSelectionOfAnchors, setPositionAlgorithm
16351638
*/
1636-
static int doPositioning(coordinates_t *position, uint8_t dimension, int32_t height, uint8_t algorithm);
1639+
static int doPositioning(coordinates_t *position, uint8_t dimension, int32_t height=0);
16371640

1638-
[[deprecated("doRemotePositioning will no longer set the algorithm in future releases. Use setPositionAlgorithm in your setup instead.")]]
1641+
[[deprecated("doRemotePositioning will no longer set the algorithm in future releases. Use setPositionAlgorithm in setup() instead.")]]
16391642
static int doRemotePositioning(uint16_t remote_id, coordinates_t *coordinates, uint8_t dimension, int32_t height, uint8_t algorithm);
16401643

16411644
/**

Pozyx_lib.cpp

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,15 @@ int PozyxClass::doRemoteRanging(uint16_t device_from, uint16_t device_to, device
780780

781781
}
782782

783-
int PozyxClass::doPositioning(coordinates_t *position, uint8_t dimension, int32_t height, uint8_t algorithm)
783+
int PozyxClass::doPositioning(coordinates_t *coordinates, uint8_t dimension, int32_t height, uint8_t algorithm)
784+
{
785+
int status = setPositionAlgorithm(algorithm, dimension);
786+
if (status != POZYX_SUCCESS)
787+
return status;
788+
return doPositioning(coordinates, dimension, height);
789+
}
790+
791+
int PozyxClass::doPositioning(coordinates_t *position, uint8_t dimension, int32_t height)
784792
{
785793
assert(position != NULL);
786794

@@ -850,8 +858,10 @@ int PozyxClass::doPositioning(coordinates_t *position, uint8_t dimension, int32_
850858

851859
int PozyxClass::doRemotePositioning(uint16_t remote_id, coordinates_t *coordinates, uint8_t dimension, int32_t height, uint8_t algorithm)
852860
{
853-
setPositionAlgorithm(algorithm, dimension, remote_id);
854-
doRemotePositioning(remote_id, coordinates, dimension, height);
861+
int status = setPositionAlgorithm(algorithm, dimension, remote_id);
862+
if (status != POZYX_SUCCESS)
863+
return status;
864+
return doRemotePositioning(remote_id, coordinates, dimension, height);
855865
}
856866

857867
int PozyxClass::doRemotePositioning(uint16_t remote_id, coordinates_t *coordinates, uint8_t dimension, int32_t height)

0 commit comments

Comments
 (0)