-
Notifications
You must be signed in to change notification settings - Fork 1
Feature/as6 #8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Feature/as6 #8
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
9dff4f9
Add AS 6 project unconverted
Joshpolansky 5f981ca
remove unused runtime versions
Joshpolansky eee6648
Update to AS 4.12
Joshpolansky bcae1a4
Update AS6 project
Joshpolansky 38b596f
remove unsupported time functions for ARM
Joshpolansky 3259f96
Change versions
agrayzel d40712d
Update some includes
agrayzel 57b584a
Remove TLSF dependency
agrayzel 289d428
Update ARM runtime version to match Intel Config
sclaiborne 5e011f4
Add build and publish pipelines
sclaiborne 8ffb96c
Merge branch 'main' into feature/as6
sclaiborne 2fe6acd
Merge branch 'feature/as6' into feature/github-actions
sclaiborne da50fe0
Fix package json
sclaiborne da84ea8
Clean up prepare package steps
sclaiborne 33f4101
Remove Jenkins file
sclaiborne 714fd03
Merge pull request #10 from loupeteam/feature/github-actions
sclaiborne 6b88d58
Remove tlsf and rtklib
sclaiborne 791aa03
Set workflow to build on PRs
sclaiborne c0941ab
Set AS 6 working version
sclaiborne File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <?AutomationStudio Version="6.5.1.7" WorkingVersion="6.5"?> | ||
| <Project Description="Starter Automation Studio project." Version="1.0.0" Edition="Standard" EditionComment="Standard" xmlns="http://br-automation.co.at/AS/Project"> | ||
| <Communication /> | ||
| <ANSIC DefaultIncludes="true" /> | ||
| <IEC ExtendedConstants="true" IecExtendedComments="true" KeywordsAsStructureMembers="false" NamingConventions="true" Pointers="true" Preprocessor="false" /> | ||
| <Motion RestartAcoposParameter="true" RestartInitParameter="true" /> | ||
| <Project StoreRuntimeInProject="false" /> | ||
| <Variables DefaultInitValue="0" DefaultRetain="false" DefaultVolatile="true" /> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
|
|
||
| TYPE | ||
|
|
||
| END_TYPE |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
|
|
||
| VAR | ||
|
|
||
| END_VAR | ||
|
|
||
| VAR CONSTANT | ||
|
|
||
| END_VAR |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <?AutomationStudio FileVersion="4.9"?> | ||
| <Package xmlns="http://br-automation.co.at/AS/Package"> | ||
| <Objects> | ||
| <Object Type="Library" Language="ANSIC" Reference="true">..\..\src\Ar\stringext\ANSIC.lby</Object> | ||
| </Objects> | ||
| </Package> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <?AutomationStudio FileVersion="4.9"?> | ||
| <Package xmlns="http://br-automation.co.at/AS/Package"> | ||
| <Objects> | ||
| <Object Type="Package">_AS</Object> | ||
| <Object Type="Package">Loupe</Object> | ||
| </Objects> | ||
| </Package> |
80 changes: 80 additions & 0 deletions
80
example/As6Project/Logical/Libraries/_AS/AsBrStr/AsBrStr.fun
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
|
|
||
| {REDUND_CONTEXT} {REDUND_UNREPLICABLE} FUNCTION brsftoa : UINT (*converts a REAL value into a character string*) | ||
| VAR_INPUT | ||
| value :REAL; (*REAL (FLOAT) value to be converted into a character string*) | ||
| pString :UDINT; (*pointer to the destination character string*) | ||
| END_VAR | ||
| END_FUNCTION | ||
| {REDUND_CONTEXT} {REDUND_UNREPLICABLE} FUNCTION brsatof : REAL (*converts a character string into a REAL (FLOAT) value*) | ||
| VAR_INPUT | ||
| pString :UDINT; (*pointer to the character string to be converted*) | ||
| END_VAR | ||
| END_FUNCTION | ||
| {REDUND_CONTEXT} {REDUND_UNREPLICABLE} FUNCTION brsatod : LREAL (*converts a character string into a LREAL (DOUBLE) value*) | ||
| VAR_INPUT | ||
| pString :UDINT; (*pointer to the character string to be converted*) | ||
| END_VAR | ||
| END_FUNCTION | ||
| {REDUND_CONTEXT} {REDUND_UNREPLICABLE} FUNCTION brsitoa : UINT (*converts a DINT value into a character string*) | ||
| VAR_INPUT | ||
| value :DINT; (*numerical value to be converted into a string*) | ||
| pString :UDINT; (*pointer to the destination character string*) | ||
| END_VAR | ||
| END_FUNCTION | ||
| {REDUND_CONTEXT} {REDUND_UNREPLICABLE} FUNCTION brsatoi : DINT (*converts a character string into a DINT value*) | ||
| VAR_INPUT | ||
| pString :UDINT; (*pointer to the character string to be converted*) | ||
| END_VAR | ||
| END_FUNCTION | ||
| {REDUND_CONTEXT} {REDUND_UNREPLICABLE} FUNCTION brsmemset : UDINT (*fills the memory area with specific values*) | ||
| VAR_INPUT | ||
| pDest :UDINT; (*pointer to the destination memory*) | ||
| value :USINT; (*initialization value*) | ||
| length :UDINT; (*number of bytes to be initialized*) | ||
| END_VAR | ||
| END_FUNCTION | ||
| {REDUND_CONTEXT} {REDUND_UNREPLICABLE} FUNCTION brsmemcpy : UDINT (*copies the memory area*) | ||
| VAR_INPUT | ||
| pDest :UDINT; (*pointer to the destination memory*) | ||
| pSrc :UDINT; (*pointer to the data to be copied*) | ||
| length :UDINT; (*size of bytes to be copied*) | ||
| END_VAR | ||
| END_FUNCTION | ||
| {REDUND_CONTEXT} {REDUND_UNREPLICABLE} FUNCTION brsmemmove : UDINT (*copies the memory area (even if the memory areas overlap)*) | ||
| VAR_INPUT | ||
| pDest :UDINT; (*pointer to the destination memory*) | ||
| pSrc :UDINT; (*pointer to the data to be copied*) | ||
| length :UDINT; (*size of bytes to be copied*) | ||
| END_VAR | ||
| END_FUNCTION | ||
| {REDUND_CONTEXT} {REDUND_UNREPLICABLE} FUNCTION brsmemcmp : DINT (*compares memory areas*) | ||
| VAR_INPUT | ||
| pMem1 :UDINT; (*pointer to the memory area 1*) | ||
| pMem2 :UDINT; (*pointer to the memory area 2*) | ||
| length :UDINT; (*size of bytes to be checked*) | ||
| END_VAR | ||
| END_FUNCTION | ||
| {REDUND_CONTEXT} {REDUND_UNREPLICABLE} FUNCTION brsstrcat : UDINT (*attaches character strings to one another*) | ||
| VAR_INPUT | ||
| pDest :UDINT; (*pointer to the destination character string*) | ||
| pSrc :UDINT; (*pointer to the source character string*) | ||
| END_VAR | ||
| END_FUNCTION | ||
| {REDUND_CONTEXT} {REDUND_UNREPLICABLE} FUNCTION brsstrlen : UDINT (*provides the length of a character string*) | ||
| VAR_INPUT | ||
| pString :UDINT; (*pointer to the source character string*) | ||
| END_VAR | ||
| END_FUNCTION | ||
| {REDUND_CONTEXT} {REDUND_UNREPLICABLE} FUNCTION brsstrcpy : UDINT (*copies one character string into another*) | ||
| VAR_INPUT | ||
| pDest :UDINT; (*pointer to the destination character string*) | ||
| pSrc :UDINT; (*pointer to the source character string*) | ||
| END_VAR | ||
| END_FUNCTION | ||
| {REDUND_CONTEXT} {REDUND_UNREPLICABLE} FUNCTION brsstrcmp : DINT (*compares two character strings*) | ||
| VAR_INPUT | ||
| pString1 :UDINT; (*pointer to the first character string*) | ||
| pString2 :UDINT; (*pointer to the second character string*) | ||
| END_VAR | ||
| END_FUNCTION | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
|
|
||
| TYPE | ||
|
|
||
| END_TYPE |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
|
|
||
| VAR CONSTANT | ||
|
|
||
| END_VAR |
39 changes: 39 additions & 0 deletions
39
example/As6Project/Logical/Libraries/_AS/AsBrStr/SG3/AsBrStr.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* Automation Studio generated header file */ | ||
| /* Do not edit ! */ | ||
|
|
||
| #ifndef _ASBRSTR_ | ||
| #define _ASBRSTR_ | ||
| #ifdef __cplusplus | ||
| extern "C" | ||
| { | ||
| #endif | ||
|
|
||
| #include <bur/plctypes.h> | ||
|
|
||
| #ifndef _IEC_CONST | ||
| #define _IEC_CONST _WEAK const | ||
| #endif | ||
|
|
||
|
|
||
|
|
||
|
|
||
| /* Prototyping of functions and function blocks */ | ||
| unsigned short brsftoa(float value, unsigned long pString); | ||
| float brsatof(unsigned long pString); | ||
| unsigned short brsitoa(signed long value, unsigned long pString); | ||
| signed long brsatoi(unsigned long pString); | ||
| unsigned long brsmemset(unsigned long pDest, unsigned char value, unsigned long length); | ||
| unsigned long brsmemcpy(unsigned long pDest, unsigned long pSrc, unsigned long length); | ||
| unsigned long brsmemmove(unsigned long pDest, unsigned long pSrc, unsigned long length); | ||
| signed long brsmemcmp(unsigned long pMem1, unsigned long pMem2, unsigned long length); | ||
| unsigned long brsstrcat(unsigned long pDest, unsigned long pSrc); | ||
| unsigned long brsstrlen(unsigned long pString); | ||
| unsigned long brsstrcpy(unsigned long pDest, unsigned long pSrc); | ||
| signed long brsstrcmp(unsigned long pString1, unsigned long pString2); | ||
|
|
||
|
|
||
| #ifdef __cplusplus | ||
| }; | ||
| #endif | ||
| #endif /* _ASBRSTR_ */ | ||
|
|
39 changes: 39 additions & 0 deletions
39
example/As6Project/Logical/Libraries/_AS/AsBrStr/SG4/AsBrStr.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* Automation Studio generated header file */ | ||
| /* Do not edit ! */ | ||
|
|
||
| #ifndef _ASBRSTR_ | ||
| #define _ASBRSTR_ | ||
| #ifdef __cplusplus | ||
| extern "C" | ||
| { | ||
| #endif | ||
|
|
||
| #include <bur/plctypes.h> | ||
|
|
||
| #ifndef _BUR_PUBLIC | ||
| #define _BUR_PUBLIC | ||
| #endif | ||
|
|
||
|
|
||
|
|
||
| /* Prototyping of functions and function blocks */ | ||
| _BUR_PUBLIC unsigned short brsftoa(float value, unsigned long pString); | ||
| _BUR_PUBLIC float brsatof(unsigned long pString); | ||
| _BUR_PUBLIC double brsatod(unsigned long pString); | ||
| _BUR_PUBLIC unsigned short brsitoa(signed long value, unsigned long pString); | ||
| _BUR_PUBLIC signed long brsatoi(unsigned long pString); | ||
| _BUR_PUBLIC unsigned long brsmemset(unsigned long pDest, unsigned char value, unsigned long length); | ||
| _BUR_PUBLIC unsigned long brsmemcpy(unsigned long pDest, unsigned long pSrc, unsigned long length); | ||
| _BUR_PUBLIC unsigned long brsmemmove(unsigned long pDest, unsigned long pSrc, unsigned long length); | ||
| _BUR_PUBLIC signed long brsmemcmp(unsigned long pMem1, unsigned long pMem2, unsigned long length); | ||
| _BUR_PUBLIC unsigned long brsstrcat(unsigned long pDest, unsigned long pSrc); | ||
| _BUR_PUBLIC unsigned long brsstrlen(unsigned long pString); | ||
| _BUR_PUBLIC unsigned long brsstrcpy(unsigned long pDest, unsigned long pSrc); | ||
| _BUR_PUBLIC signed long brsstrcmp(unsigned long pString1, unsigned long pString2); | ||
|
|
||
|
|
||
| #ifdef __cplusplus | ||
| }; | ||
| #endif | ||
| #endif /* _ASBRSTR_ */ | ||
|
|
39 changes: 39 additions & 0 deletions
39
example/As6Project/Logical/Libraries/_AS/AsBrStr/SGC/AsBrStr.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* Automation Studio generated header file */ | ||
| /* Do not edit ! */ | ||
|
|
||
| #ifndef _ASBRSTR_ | ||
| #define _ASBRSTR_ | ||
| #ifdef __cplusplus | ||
| extern "C" | ||
| { | ||
| #endif | ||
|
|
||
| #include <bur/plctypes.h> | ||
|
|
||
| #ifndef _IEC_CONST | ||
| #define _IEC_CONST _WEAK const | ||
| #endif | ||
|
|
||
|
|
||
|
|
||
|
|
||
| /* Prototyping of functions and function blocks */ | ||
| unsigned short brsftoa(float value, unsigned long pString); | ||
| float brsatof(unsigned long pString); | ||
| unsigned short brsitoa(signed long value, unsigned long pString); | ||
| signed long brsatoi(unsigned long pString); | ||
| unsigned long brsmemset(unsigned long pDest, unsigned char value, unsigned long length); | ||
| unsigned long brsmemcpy(unsigned long pDest, unsigned long pSrc, unsigned long length); | ||
| unsigned long brsmemmove(unsigned long pDest, unsigned long pSrc, unsigned long length); | ||
| signed long brsmemcmp(unsigned long pMem1, unsigned long pMem2, unsigned long length); | ||
| unsigned long brsstrcat(unsigned long pDest, unsigned long pSrc); | ||
| unsigned long brsstrlen(unsigned long pString); | ||
| unsigned long brsstrcpy(unsigned long pDest, unsigned long pSrc); | ||
| signed long brsstrcmp(unsigned long pString1, unsigned long pString2); | ||
|
|
||
|
|
||
| #ifdef __cplusplus | ||
| }; | ||
| #endif | ||
| #endif /* _ASBRSTR_ */ | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <?AutomationStudio Version=3.0.0.0?> | ||
| <Library xmlns="http://br-automation.co.at/AS/Library" Description="The AsBrStr Library contains FBKs for memory and character string handling."> | ||
| <Files> | ||
| <File>AsBrStr.fun</File> | ||
| <File>AsBrStr.typ</File> | ||
| <File>AsBrStr.var</File> | ||
| </Files> | ||
| </Library> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
Referencepath usessrc\Ar\stringext\ANSIC.lby(different casing than the actualsrc/Ar/StringExt/...directory). This can break builds on case-sensitive filesystems (and makes the reference brittle). Update the path to match the real directory casing.