fprime-gds 4.0.0a7__tar.gz → 4.0.0a9__tar.gz

{fprime_gds-4.0.0a7 → fprime_gds-4.0.0a9}/.github/actions/spelling/expect.txt

@@ -40,20 +40,24 @@ cata
 CCB
 CCFF
 ccsds
+Cdh
 Cdioux
 cdn
 cdxoefg
 CFDG
 CFDP
 CFPD
+chans
 chartjs
 CHNG
 classdocs
 clearfix
 cls
 cmdhist
+cmps
 cmt
 CODEFILE
+codegen
 COLORSTYLE
 colorwheel
 columnify
@@ -80,7 +84,7 @@ deframed
 deframer
 deframing
 DEPRECATEDLIST
-DESER
+deser
 Deserial
 deserializes
 dests
@@ -117,6 +121,7 @@ ECONNRESET
 ect
 EEXIST
 Efg
+elifs
 ENDC
 endcond
 errorhandler
@@ -131,17 +136,26 @@ fastentrypoints
 fbuild
 fd
 FEEDNAME
+FEQ
 FFCC
 FFFF
+FGE
+FGT
 fileurl
 Firefox
+FLE
 focusring
+FNE
 FONTNAME
 FONTPATH
 FONTSIZE
+FPEXT
 fpp
 fprime
 fptable
+FPTOSI
+FPTOUI
+FPTRUNC
 fpy
 fpybc
 fqn
@@ -170,12 +184,15 @@ hpaulson
 htags
 hyperlinks
 idct
+idk
 idl
 idx
 ieeetr
+IEQ
 ified
 ifun
 IH
+INE
 inprogress
 intersphinx
 intlimits
@@ -197,6 +214,7 @@ junitxml
 keepalive
 keyify
 kinda
+lalr
 leisher
 lestarch
 levelname
@@ -240,6 +258,7 @@ NOSONAR
 nosort
 nosubgrouping
 Noto
+nreg
 NSPACES
 nuntil
 odl
@@ -264,6 +283,7 @@ pkts
 plainnat
 plantuml
 PNGs
+postlex
 preds
 prm
 prmdb
@@ -312,20 +332,26 @@ seqfile
 seqgen
 serializables
 serialutil
+SGE
+SGT
 showinitializer
 sideeffect
 SIGALRM
+SITOFP
 sizeb
 SMAP
 Smath
+smth
 SNDHWM
 sorttable
 spacepacket
 squashify
+sreg
 sss
 Ssymbols
 stackoverflow
 startuml
+subclasscheck
 subcmd
 subgrouping
 subhist
@@ -367,7 +393,9 @@ typedef
 uart
 ucf
 udp
+UGE
 UIs
+UITOFP
 uk
 ul
 UNINIT

{fprime_gds-4.0.0a7 → fprime_gds-4.0.0a9}/.github/workflows/codeql-security-scan.yml

@@ -8,6 +8,10 @@ on:
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ devel ]
+# Cancel in-progress runs if a newer run is started on a given PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ !contains(github.ref, 'devel') && !contains(github.ref, 'release/')}}
 
 jobs:
   analyze:

{fprime_gds-4.0.0a7 → fprime_gds-4.0.0a9}/.github/workflows/fprime-gds-tests.yml

@@ -6,6 +6,10 @@ on:
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ devel ]
+# Cancel in-progress runs if a newer run is started on a given PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ !contains(github.ref, 'devel') && !contains(github.ref, 'release/')}}
 
 jobs:
   Unit-tests:

{fprime_gds-4.0.0a7 → fprime_gds-4.0.0a9}/.github/workflows/gds-cli-tests.yml

@@ -6,6 +6,10 @@ on:
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ devel ]
+# Cancel in-progress runs if a newer run is started on a given PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ !contains(github.ref, 'devel') && !contains(github.ref, 'release/')}}
 
 env:
   DICTIONARY: ./.github/resources/RefTopologyAppDictionary.xml

{fprime_gds-4.0.0a7 → fprime_gds-4.0.0a9}/.github/workflows/spelling.yml

@@ -11,6 +11,10 @@ on:
     tags-ignore:
       - "**"
     types: ['opened', 'reopened', 'synchronize']
+# Cancel in-progress runs if a newer run is started on a given PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ !contains(github.ref, 'devel') && !contains(github.ref, 'release/')}}
 
 jobs:
   spelling:

{fprime_gds-4.0.0a7 → fprime_gds-4.0.0a9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fprime-gds
-Version: 4.0.0a7
+Version: 4.0.0a9
 Summary: F Prime Flight Software Ground Data System layer
 Author-email: Michael Starch <Michael.D.Starch@jpl.nasa.gov>, Thomas Boyer-Chammard <Thomas.Boyer.Chammard@jpl.nasa.gov>
 License: 
@@ -240,6 +240,7 @@ Requires-Dist: Jinja2>=2.11.3
 Requires-Dist: openpyxl>=3.0.10
 Requires-Dist: pyserial>=3.5
 Requires-Dist: pydantic>=2.6
+Requires-Dist: lark>=1.2.2
 Requires-Dist: PyYAML>=6.0.2
 Requires-Dist: spacepackets>=0.30.0
 Requires-Dist: crc>=7.0.0

{fprime_gds-4.0.0a7 → fprime_gds-4.0.0a9}/pyproject.toml

@@ -43,6 +43,7 @@ dependencies = [
     "openpyxl>=3.0.10",
     "pyserial>=3.5",
     "pydantic>=2.6",
+    "lark>=1.2.2",
     "PyYAML>=6.0.2",
     "spacepackets>=0.30.0",
     "crc>=7.0.0"
@@ -65,7 +66,7 @@ fprime-seqgen = "fprime_gds.common.tools.seqgen:main"
 fprime-dp-write = "fprime_gds.executables.data_product_writer:main"
 fprime-gds = "fprime_gds.executables.run_deployment:main"
 fprime-prm-write = "fprime_gds.common.tools.params:main"
-fprime-fpy-bytecode = "fprime_gds.common.fpy.serialize_bytecode:main"
+fprime-fpyc = "fprime_gds.common.fpy.main:main"
 
 # For Pytest fixtures
 [project.entry-points."pytest11"]

{fprime_gds-4.0.0a7 → fprime_gds-4.0.0a9}/src/fprime_gds/common/decoders/event_decoder.py

@@ -22,6 +22,8 @@ from fprime_gds.common.decoders import decoder
 from fprime_gds.common.decoders.decoder import DecodingException
 from fprime_gds.common.utils import config_manager
 
+import logging
+LOGGER = logging.getLogger("event_decoder")
 
 class EventDecoder(decoder.Decoder):
     """Decoder class for event data"""
@@ -67,7 +69,11 @@ class EventDecoder(decoder.Decoder):
         while (ptr < len(data)):
 
             # Decode event ID here...
-            self.id_obj.deserialize(data, ptr)
+            if ptr + self.id_obj.getSize() <= len(data):
+                self.id_obj.deserialize(data, ptr)
+            else:
+                LOGGER.warning("Insufficient data for event ID")
+                break
             ptr += self.id_obj.getSize()
             event_id = self.id_obj.val
 

{fprime_gds-4.0.0a7 → fprime_gds-4.0.0a9}/src/fprime_gds/common/distributor/distributor.py

@@ -203,6 +203,8 @@ class Distributor(DataHandler):
                 try:
                     d.data_callback(msg)
                 except DecodingException as dexc:
-                    LOGGER.warning("Decoding error occurred: %s. Skipping.", dexc)
+                    LOGGER.warning("Decoding error: %s", dexc)
+                except Exception as exc:
+                    LOGGER.warning("Parsing error: %s", exc)
             else:
                 LOGGER.warning("No decoder registered for: %s", data_desc_type.DataDescType(data_desc).name)

fprime_gds-4.0.0a9/src/fprime_gds/common/fpy/README.md

@@ -0,0 +1,56 @@
+# Fpy Advanced Sequencing Language Version 0.1
+The Fpy advanced sequencing language is a combination of a high-level scripting language and a low-level bytecode language for running complex command sequences on spacecraft flight software.
+## Fpy Syntax
+### Modules, components, channels, commands and types
+You can imagine the Fpy syntax as Python with the following mappings:
+1. FPrime modules become Python namespaces
+2. FPrime components become Python classes
+3. FPrime types (structs, arrays and enums) become Python classes
+4. FPrime component instances become Python object instances
+5. FPrime commands become member functions of Python object instances
+6. FPrime telemetry channels become member properties of Python object instances
+
+FPrime declaration:
+```
+module Ref {
+    passive component ExampleComponent {
+        telemetry testChannel: U8
+        sync command TEST_COMMAND(arg: string size 40)
+    }
+
+    instance exampleInstance: ExampleComponent base id 0x01
+}
+```
+Fpy usage:
+```py
+# reference a telemetry channel
+Ref.exampleInstance.testChannel
+# call a command
+Ref.exampleInstance.TEST_COMMAND("arg value")
+```
+
+
+FPrime declaration:
+```
+struct ExampleStruct {
+    member: F32
+}
+
+enum TestEnum {
+    ONE
+    TWO
+    THREE
+}
+
+array TestArray = [3] U8
+```
+
+Fpy usage:
+```py
+# construct a struct
+ExampleStruct(0.0)
+# reference an enum const
+TestEnum.THREE
+# construct an array
+TestArray(1, 2, 3)
+```

fprime_gds-4.0.0a9/src/fprime_gds/common/fpy/SPEC.md

@@ -0,0 +1,69 @@
+Nothing type is a type whose set of values is an empty set
+Unit type is a type whose set of values is a set with one element
+
+# `if` statement
+
+## Syntactical and semantic checks
+
+`"if" condition ":" INDENT stmt* DEDENT ("elif" condition ":" INDENT stmt* DEDENT)* ["else" ":" INDENT stmt* DEDENT]`
+
+1. where `condition` is an expression which evaluates to a boolean
+2. where `stmt` is a statement
+
+## Code generation
+
+1. `if` generates `IF`, followed by the generated code for the first body, followed by `GOTO` to the end of the if statement
+2. `elif` generates `IF`, followed by the generated code for its body, followed by `GOTO` to the end of the if statement
+3. `else` generates the code for its body
+
+# `not` boolean operator
+
+## Syntactical and semantic checks
+
+`"not" value` evaluates to a boolean at runtime
+
+1. where `value` is an expression which evaluates to a boolean
+
+## Code generation
+
+1. `not` generates `NOT`
+
+# `and` and `or` boolean operators
+
+## Syntactical and semantic checks
+
+`value (op value)+` evaluates to a boolean at runtime
+
+1. where `op: "and"|"or"`
+2. where `value` is an expression which evaluates to a boolean
+
+## Code generation
+
+1. Each `and` or `or` between two `value`s generates an `AND` or `OR`, respectively
+
+# Infix comparisons
+
+## Syntactical and semantic checks
+
+`lhs op rhs` evaluates to a boolean at runtime
+
+1. where `op: ">" | "<" | "<=" | ">=" | "==" | "!="`
+2. and `lhs`, `rhs` are expressions which evaluate to a number
+
+If either `lhs` or `rhs` evaluate to a float:
+3. both `lhs` and `rhs` must evaluate to floats of the same bit width
+
+Otherwise, `lhs` and `rhs` evaluate to integer values. All comparisons between integer values are valid.
+
+## Code generation
+
+### Equality comparisons
+
+1. `==` or `!=` between two floats generates `FEQ` or `FNE`, respectively
+2. `==` or `!=` between two ints generates `IEQ` or `INE`, respectively
+
+### Inequality comparisons
+
+1. `>`, `<`, `<=`, or `>=` between two floats generates `FGT`, `FLT`, `FLE` or `FGE`, respectively
+2. `>`, `<`, `<=`, or `>=` between two unsigned ints generates `UGT`, `ULT`, `ULE` or `UGE`, respectively
+2. `>`, `<`, `<=`, or `>=` between two ints, where at least one is signed, generates `SGT`, `SLT`, `SLE` or `SGE`, respectively