Skip to content

Commit

Permalink
Update 04.05.10-FW27
Browse files Browse the repository at this point in the history
  • Loading branch information
mariuswarning authored and hmlampe committed Jul 12, 2024
1 parent 08139fc commit 0fe6ed4
Show file tree
Hide file tree
Showing 4,284 changed files with 1,552,008 additions and 17 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ptxproj/src/boost_1_68_0.tar.bz2 filter=lfs diff=lfs merge=lfs -text
ptxproj/src/linux-*.tgz filter=lfs diff=lfs merge=lfs -text
ptxproj/src/rootlesskit-dep-2.0.2.tar.gz filter=lfs diff=lfs merge=lfs -text
ptxproj/src/go1.21.8.linux-amd64.tar.gz filter=lfs diff=lfs merge=lfs -text
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
/docker/certs/*.crt
/ptxproj/**/bin/gcc_*_*_arm-linux-gnueabihf/
/ptxproj/**/out/gcc_*_*_arm-linux-gnueabihf/
/ptxproj/**/bin/gcc_*_*_aarch64-linux-gnu/
/ptxproj/**/out/gcc_*_*_aarch64-linux-gnu/
/ptxproj/configs/*/*.old
/ptxproj/local_src/**/*.o
/ptxproj/local_src/**/*.so
Expand Down
10 changes: 10 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Firmware Release 04.05.10 (27) – CODESYS 3

Engineering by CODESYS IDE V. 3.5 is supported
Engineering by e!COCKPIT IDE is not supported
CODESYS 2.3 is not supported

Migration Guide – from e!COCKPIT to CODEYS V3.5:
• https://techdocs.wago.com/Software/eCOCKPIT_Migration/en-US/index.html#index_content

Initial Release
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REGISTRY_PREFIX='wagoautomation/'
ARG SDK_BUILDER_VERSION='3.0.0'

FROM ${REGISTRY_PREFIX}sdk-builder:${SDK_BUILDER_VERSION} as pfc300-firmware-sdk
FROM ${REGISTRY_PREFIX}sdk-builder:${SDK_BUILDER_VERSION} AS pfc300-firmware-sdk


ARG USERID
Expand Down
22 changes: 11 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,39 +22,39 @@ $(GEN_DIRS):
mkdir -p $@

.PHONY: builder
builder: $(OUT_DIR)/pfc-builder
builder: $(OUT_DIR)/pfc300-builder

$(OUT_DIR)/pfc-builder: Dockerfile docker/build.sh Makefile | $(OUT_DIR)
docker build $(DOCKER_BUILDFLAGS) --iidfile $@ --file $< --tag pfc-builder docker
$(OUT_DIR)/pfc300-builder: Dockerfile docker/build.sh Makefile | $(OUT_DIR)
docker build $(DOCKER_BUILDFLAGS) --iidfile $@ --file $< --tag pfc300-builder docker

.PHONY: bash
bash: builder | $(PTXPROJ)
docker run --rm -it --user "$(USERID)" -v "$(PTXPROJ_PATH):/home/user/ptxproj" pfc-builder bash
docker run --rm -it --user "$(USERID)" -v "$(PTXPROJ_PATH):/home/user/ptxproj" pfc300-builder bash

.PHONY: get
get: builder | $(PTXPROJ)
docker run --rm -it --user "$(USERID)" -v "$(PTXPROJ_PATH):/home/user/ptxproj" pfc-builder build get
docker run --rm -it --user "$(USERID)" -v "$(PTXPROJ_PATH):/home/user/ptxproj" pfc300-builder build get

.PHONY: offline-get
offline-get: builder | $(PTXPROJ)
docker run --rm -i --network none --user "$(USERID)" -v "$(PTXPROJ_PATH):/home/user/ptxproj" pfc-builder build get
docker run --rm -i --network none --user "$(USERID)" -v "$(PTXPROJ_PATH):/home/user/ptxproj" pfc300-builder build get

.PHONY: init
init: builder | $(PTXPROJ)
docker run --rm -i --user "$(USERID)" -v "$(PTXPROJ_PATH):/home/user/ptxproj" pfc-builder build init
docker run --rm -i --user "$(USERID)" -v "$(PTXPROJ_PATH):/home/user/ptxproj" pfc300-builder build init

.PHONY: build
build: builder | $(PTXPROJ)
docker run --rm -it --user "$(USERID)" -v "$(PTXPROJ_PATH):/home/user/ptxproj" pfc-builder build
docker run --rm -it --user "$(USERID)" -v "$(PTXPROJ_PATH):/home/user/ptxproj" pfc300-builder build

.PHONY: offline-build
offline-build: builder | $(PTXPROJ)
docker run --rm -it --network none --user "$(USERID)" -v "$(PTXPROJ_PATH):/home/user/ptxproj" pfc-builder build
docker run --rm -it --network none --user "$(USERID)" -v "$(PTXPROJ_PATH):/home/user/ptxproj" pfc300-builder build

.PHONY: images
images: builder | $(PTXPROJ)
docker run --rm -it --network none --user "$(USERID)" -v "$(PTXPROJ_PATH):/home/user/ptxproj" pfc-builder build images
docker run --rm -it --network none --user "$(USERID)" -v "$(PTXPROJ_PATH):/home/user/ptxproj" pfc300-builder build images

.PHONY: wup
wup: builder | $(PTXPROJ)
docker run --rm -it --network none --user "$(USERID)" -v "$(PTXPROJ_PATH):/home/user/ptxproj" pfc-builder build wup
docker run --rm -it --network none --user "$(USERID)" -v "$(PTXPROJ_PATH):/home/user/ptxproj" pfc300-builder build wup
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ If you prefer to build the sdk-builder image manually follow instruction provide
## Installation and building STEP-BY-STEP:

### 1.) Check out the correct release
We provide one tag for each firmware(FW) release. You can download specific FW versions in the release section. Alternatively you may use git to clone the repository.
We provide one tag for each firmware(FW) release. You can download specific FW versions in the release section. Alternatively you may use git to clone the repository.

git clone git@github.com:WAGO/pfc-firmware-sdk-G2.git && cd pfc-firmware-sdk-G2
git clone git@github.com:WAGO/pfc300-firmware-sdk.git && cd pfc300-firmware-sdk

Afterward you can checkout a specific release.

Expand All @@ -80,9 +80,9 @@ Afterward you can checkout a specific release.

Alternatively you can also run pfc-builder in bash mode (```make bash```) and enter the following commands.

ptxdist select configs/wago-pfcXXX/ptxconfig_pfc_g2 && \
ptxdist platform configs/wago-pfcXXX/platformconfig && \
ptxdist toolchain /opt/gcc-Toolchain-2022.08/LINARO.Toolchain-2022.08/arm-linux-gnueabihf/bin/ && \
ptxdist select configs/wago-pfc300/ptxconfig_pfc && \
ptxdist platform configs/wago-pfc300/platformconfig && \
ptxdist toolchain /opt/gcc-Toolchain-2022.08-wago.1/LINARO.Toolchain-2022.08-wago.1/aarch64-linux-gnu/bin && \
ptxdist clean -q

#### 3.1) Get and download all packages
Expand Down
31 changes: 31 additions & 0 deletions ptxproj/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#
# Kconfig: Main menu structure definition
# Copyright (C) Juergen Beisert <j.beisert@pengutronix.de> 2008
#

# including of config/Kconfig was not successful, so we pasted its content

# source "config/Kconfig"

##### content of "config/Kconfig" #####

mainmenu "PTXdist $CONFIGFILE_VERSION"

config MODULES
bool
default y

source "generated/project_specific.in"
source "generated/fixme.in"

source "generated/project_name.in"

source "rules/Kconfig"

#######################################

menu "Wago Specific "
source "generated/wago_specific.in"
endmenu


Loading

0 comments on commit 0fe6ed4

Please sign in to comment.