Skip to content

Commit 9b97465

Browse files
author
rt-labs bot
committed
Automatic catchup to commit 5e5b50af23648f233d87b9770ac14e6f65efc3a9
5e5b50a Switch to 64bit build for raspberry 5f54312 Add build for raspberry pi b8ddc56 Drop all cmake files from public 9029305 Bump version to 1.0.0 8897d37 Correct spelling warnings in release notes bcc7598 Bump rstcloth for python 3.12 support 34bdce3 Add release notes ffd1fbc Avoid setting default gateway on Linux eb3752f Adapt documentation to precompiled binary 8289114 Update documentation in existing structure c3388a8 Improve logging in sample app bc4a062 Rename project to pnet c25dcf3 Script to remove wireshark files without alarm frames from a directory bb910db Limit the stationname command line argument length 932347b ignore slot and subslot in dpreal_data read req ecc2f31 update rpc udp port management 36d9677 p-net - fix epm handling e600fc3 p-net - fix behavior for duplicate connection requests 3c41db2 Add helper scripts to install Based-On-Commit: 5e5b50af23648f233d87b9770ac14e6f65efc3a9 Change-Id: If261b8b9ae3db6d0e443a9b3842a030003d23cfe
1 parent 7601ac2 commit 9b97465

19 files changed

+301
-759
lines changed

.docker/rbpi.Dockerfile

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
FROM dockcross/linux-arm64-lts
2+
ENV DEFAULT_DOCKCROSS_IMAGE p-net-rbpi
3+
RUN apt-get install -y python3-venv
4+
5+
RUN pip install --break-system-packages uv
6+
7+
ARG BUILDER_UID=1001
8+
ARG BUILDER_GID=1001
9+
ARG BUILDER_USER=rtljenkins
10+
ARG BUILDER_GROUP=rtljenkins
11+
RUN BUILDER_UID=${BUILDER_GID} BUILDER_GID=${BUILDER_GID} BUILDER_USER=${BUILDER_USER} BUILDER_GROUP=${BUILDER_GROUP} /dockcross/entrypoint.sh echo "Setup jenkins user"

CHANGELOG.md

-125
This file was deleted.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ buy a license. See LICENSE.md for more details.
4646

4747
## Getting started
4848

49-
See the tutorial in the documentation: [https://rt-labs.com/docs/p-net/tutorial.html](https://rt-labs.com/docs/p-net/tutorial.html)
49+
See the tutorial in the documentation: [https://docs.rt-labs.com/p-net/running_sample_app.html](https://docs.rt-labs.com/p-net/running_sample_app.html)
5050

5151
Note that you need to include submodules when cloning:
5252

include/pnet_api.h

+15-6
Original file line numberDiff line numberDiff line change
@@ -1563,14 +1563,20 @@ PNET_EXPORT int pnet_pull_submodule (
15631563
* before calling \a pnet_application_ready(). This includes all subslots in the
15641564
* DAP slot (slot 0).
15651565
*
1566+
* This function will copy the user data to the frame buffer, for sending to the PLC.
1567+
*
1568+
* Note that setting the IOPS to BAD will trigger an
1569+
* "Error: User data failure of hardware component" in the PLC, and it
1570+
* typically needs to be cleared manually.
1571+
*
15661572
* @param net InOut: The p-net stack instance
15671573
* @param api In: The API.
15681574
* @param slot In: The slot.
15691575
* @param subslot In: The sub-slot.
1570-
* @param p_data In: Data buffer. If NULL the data will not
1571-
* be updated.
1576+
* @param p_data In: User buffer with data to be sent. If NULL the data
1577+
* will not be updated.
15721578
* @param data_len In: Bytes in data buffer.
1573-
* @param iops In: The device provider status.
1579+
* @param iops In: The device provider status (GOOD or BAD).
15741580
* See pnet_ioxs_values_t
15751581
* @return 0 if a sub-module data and IOPS was set.
15761582
* -1 if an error occurred.
@@ -1598,7 +1604,7 @@ PNET_EXPORT int pnet_input_set_data_and_iops (
15981604
* @param api In: The API.
15991605
* @param slot In: The slot.
16001606
* @param subslot In: The sub-slot.
1601-
* @param p_iocs Out: The controller consumer status.
1607+
* @param p_iocs Out: The controller consumer status (GOOD or BAD).
16021608
* See pnet_ioxs_values_t
16031609
* @return 0 if a sub-module IOCS was set.
16041610
* -1 if an error occurred.
@@ -1622,6 +1628,9 @@ PNET_EXPORT int pnet_input_get_iocs (
16221628
* back data that has been set by \a pnet_input_set_data_and_iops() using this
16231629
* function.
16241630
*
1631+
* This function will copy the data from the frame buffer (which has data from the PLC)
1632+
* to the user buffer.
1633+
*
16251634
* If a valid new data (and IOPS) frame has arrived from the IO-controller since
16261635
* your last call to this function (regardless of the slot/subslot arguments)
16271636
* then the flag \a p_new_flag is set to true, else it is set to false.
@@ -1639,7 +1648,7 @@ PNET_EXPORT int pnet_input_get_iocs (
16391648
* @param slot In: The slot.
16401649
* @param subslot In: The sub-slot.
16411650
* @param p_new_flag Out: true if new data.
1642-
* @param p_data Out: The received data.
1651+
* @param p_data Out: User buffer for the received data.
16431652
* @param p_data_len In: Size of receive buffer.
16441653
* Out: Received number of data bytes.
16451654
* @param p_iops Out: The controller provider status (IOPS).
@@ -1671,7 +1680,7 @@ PNET_EXPORT int pnet_output_get_data_and_iops (
16711680
* @param api In: The API.
16721681
* @param slot In: The slot.
16731682
* @param subslot In: The sub-slot.
1674-
* @param iocs In: The device consumer status.
1683+
* @param iocs In: The device consumer status (GOOD or BAD).
16751684
* See pnet_ioxs_values_t
16761685
* @return 0 if a sub-module IOCS was set.
16771686
* -1 if an error occurred.

pnet_version.h.in

+8-8
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@
1616
#ifndef PNET_VERSION_H
1717
#define PNET_VERSION_H
1818

19-
#cmakedefine PROFINET_GIT_REVISION "@PROFINET_GIT_REVISION@"
19+
#cmakedefine PNET_GIT_REVISION "@PNET_GIT_REVISION@"
2020

21-
#if !defined(PNET_VERSION_BUILD) && defined(PROFINET_GIT_REVISION)
22-
#define PNET_VERSION_BUILD PROFINET_GIT_REVISION
21+
#if !defined(PNET_VERSION_BUILD) && defined(PNET_GIT_REVISION)
22+
#define PNET_VERSION_BUILD PNET_GIT_REVISION
2323
#endif
2424

2525
/* clang-format-off */
2626

27-
#define PNET_VERSION_MAJOR @PROFINET_VERSION_MAJOR@
28-
#define PNET_VERSION_MINOR @PROFINET_VERSION_MINOR@
29-
#define PNET_VERSION_PATCH @PROFINET_VERSION_PATCH@
27+
#define PNET_VERSION_MAJOR @PNET_VERSION_MAJOR@
28+
#define PNET_VERSION_MINOR @PNET_VERSION_MINOR@
29+
#define PNET_VERSION_PATCH @PNET_VERSION_PATCH@
3030

3131
#if defined(PNET_VERSION_BUILD)
3232
#define PNET_VERSION \
33-
"@PROFINET_VERSION_MAJOR@.@PROFINET_VERSION_MINOR@.@PROFINET_VERSION_PATCH@+" PNET_VERSION_BUILD
33+
"@PNET_VERSION_MAJOR@.@PNET_VERSION_MINOR@.@PNET_VERSION_PATCH@+" PNET_VERSION_BUILD
3434
#else
3535
#define PNET_VERSION \
36-
"@PROFINET_VERSION_MAJOR@.@PROFINET_VERSION_MINOR@.@PROFINET_VERSION_PATCH@"
36+
"@PNET_VERSION_MAJOR@.@PNET_VERSION_MINOR@.@PNET_VERSION_PATCH@"
3737
#endif
3838

3939
/* clang-format-on */

src/CMakeLists.txt

-92
This file was deleted.

0 commit comments

Comments
 (0)