608f6c0335
check_fix_white_space.py: Tell user about TAB and/or trailing WS
...
Make the output of the script more descriptive:
Tell user what was wrong, either TAB or trailing WS (or both)
2019-12-09 11:10:07 +01:00
a57ae08ebe
check_fix_white_space.py: Hint the user about --fix
...
When the script detects whitespace damage, hint the user that
the same script can fix it.
2019-12-09 11:00:50 +01:00
6e723594b5
bitbucket-pipelines.yml: Don't run git submodule
...
The command `git submodule update --init`
already shows us the versions of the submodules.
There is no need to run `git submodule` after that - renove it.
2019-12-09 10:30:41 +01:00
bb3d895439
Merged in MBP-128-twincat-4024-0-is-shipped-with-4023-119 (pull request #18 )
...
MBP-128 twincat 4024.0 is shipped with 4023.119
Approved-by: Aaron James Long <aaron.long@stfc.ac.uk >
2019-12-06 11:01:22 +00:00
b60f33ed5a
solution.tsproj: Update to version 4.1.4023.119
2019-12-06 09:52:04 +01:00
62086f488d
twincat_version_manager.py: Different versions for *.Tc and *.tsproj
...
"The 4024 release apparently shipped with the 4023.119
internal build for engineering"
It seems as if the *.Tc* files ue a different version numbering than
the *.tsproj files.
Adapt twincat_version_manager.py to handle different versions
for different file types (technically file names) and
check that the *.tsproj file have version "3.1.4023.119"
2019-12-06 09:44:27 +01:00
31ff22d7a4
Merged in MBP-114-dont-use-tab-in-source-code (pull request #16 )
...
MBP-114 dont use tab in source code
2019-12-04 11:42:52 +00:00
4b2302d0d4
Fix whitespace damage in solution/tc_project_app/tc_mca_std_lib
2019-11-29 11:51:27 +01:00
403b1c9296
bitbucket-pipelines.yml: Print status of git submodule
2019-11-29 11:44:53 +01:00
69f8fc4696
solution/tc_epicscommodule updated to 3.1.4024.0
2019-11-29 11:34:27 +01:00
bef8078e99
Fix whitespace damage
...
Fix the whitespaces using check_fix_white_space.py
modified: solution/tc_project_app/GVLs/GVL_APP.TcGVL
modified: solution/tc_project_app/POUs/MAIN.TcPOU
2019-11-29 09:47:11 +01:00
9facfb89c1
Update tc_epicscommodule to a white+space clean version
2019-11-29 09:43:45 +01:00
7ce75ac945
bitbucket-pipelines.yml: Change pipline from pull-request to default
...
Allways run the pipeline, for each push, not only pull-requests.
This should detect problems early,
2019-11-29 09:31:37 +01:00
2004342dd3
bitbucket-pipelines.yml: Activate check_fix_white_space.py
2019-11-29 08:32:32 +01:00
df8fd4f4be
Add check_fix_white_space.py
...
Make it possible to check for whitespace-damage:
- a file uses TAB instead of space
- a file has trailing whitespace e.g.
"text on this line \n" instead of "text on this line\n"
Both make reviews unnecessary hard and may lead to merge conflicts,
which could be easily avoided.
In the next commit this script will be added to the continous integration.
2019-11-29 08:32:17 +01:00
5644dd9bb7
Update Hardware FB for the latest version from Viktor Heirich and 4024.0
...
Some FB in the Etercat Termianls folder were not the latest version
They were replaced by the latest version according to the developer Viktor Heirich# Please enter the commit message for your changes. Lines starting
2019-10-16 11:35:02 +02:00
da7b2d1625
Merged in MBP-109-test-pipelines-for-twincat (pull request #14 )
...
MBP-109 test pipelines for twincat
2019-10-15 12:22:31 +00:00
117f65b403
Merge origin/integration into MBP-109-test-pipelines-for-twincat
...
Conflicts:
solution/solution.tsproj
2019-10-15 14:19:34 +02:00
8ced80123e
Update tc_mca_std_lib to version 3024.0
2019-10-15 14:05:11 +02:00
9a0b8e98cc
Update tc_epicscommodule to master for new 3024.0
2019-10-15 14:04:02 +02:00
efeccb18bc
Merged in MBP-85-standardise-our-twincat-version (pull request #15 )
...
MBP-85 standardise our twincat version
2019-10-15 11:57:52 +00:00
eeeaf8a3a1
Fix exit codes
2019-10-14 18:17:55 +01:00
d57ad738ee
Attempt to fix bitbucket being wierd
2019-10-14 18:12:31 +01:00
9ba0d7a67e
Provide better error codes
2019-10-14 18:01:29 +01:00
7f9e9feff5
Updated submodules
2019-10-11 23:24:09 +01:00
1579c29d6f
Updated version
2019-10-11 23:20:39 +01:00
1d3a7d6c59
Updated version
2019-10-11 23:18:38 +01:00
0adff94a46
Updated version
2019-10-11 23:13:43 +01:00
edbb3e8cdb
Try and fix for pipelines
2019-10-11 18:51:00 +01:00
81b5d1f1dc
Only do on PR
2019-10-11 18:38:05 +01:00
adff4d92d3
Just confirm we can pass a test
2019-10-11 18:25:39 +01:00
b2b97f583c
Should now do submodules
2019-10-11 18:23:32 +01:00
517bd5dc4e
Pipeline now checks versions
2019-10-11 18:18:44 +01:00
1946724be1
Fix syntax error
2019-10-11 17:15:21 +01:00
cf5349dced
Allow pipeline to be run manually
2019-10-11 17:11:57 +01:00
48788d138f
Add pipeline yaml
2019-10-11 17:09:09 +01:00
442f840065
First try at running a pipeline
2019-10-11 17:07:29 +01:00
0d757f16de
Merged in mbp-106/application-specific-gvl (pull request #10 )
...
Mbp 106/application specific gvl
2019-08-08 09:37:40 +00:00
232a454e21
fix conflict while merging to integration branch
2019-08-08 11:32:13 +02:00
3afaa99adc
Merge branch 'integration' into mbp-106/application-specific-gvl
2019-08-08 11:23:32 +02:00
f0df405a7a
Merged in mbp-99/execute-reset-triggers-and-status-links (pull request #7 )
...
Mbp 99/execute reset triggers and status links
2019-08-01 11:58:01 +00:00
05927a40a6
Change all references and links from GVL.axisNum to GVL_APP.axisNum
2019-08-01 13:03:33 +02:00
e9bac1d121
Create GVL_APP and add axisNum constant variable in it
2019-08-01 12:58:31 +02:00
08c6c6acaf
Delete Axis task from solution to have a clean solution
2019-08-01 12:38:27 +02:00
1bf298212a
set bExecute to FLASE at the end of the code
2019-08-01 12:13:24 +02:00
1b3ef2c20f
Reset bExecute when Axis are coupled
2019-07-18 10:03:08 +02:00
8beccc5cd8
Change representation to Hex of nNC_ErrorID in FB_NC_Error
2019-07-17 15:55:52 +02:00
bacbdf1e39
add missing FB for error handling EL7037 and EL7047
2019-07-17 13:52:07 +02:00
b3f741222f
Fix bug with bExecute reset after command
2019-07-17 10:14:43 +02:00
c03cead419
Fix typo in comment
2019-07-16 13:42:19 +02:00
Torsten Bögershausen