From 119d210be3502241f386a4b99055b3b0f501b685 Mon Sep 17 00:00:00 2001
From: Rob Bocchino <bocchino@jpl.nasa.gov>
Date: Wed, 10 Apr 2024 14:15:32 -0700
Subject: [PATCH] Revise types in generated C++ code (#2668)

* Revise built-in FPP types

* Update FPP version

* Pull in DpManager from data-products

* Update fpp version
---
 config/FpConfig.fpp |  3 ++-
 requirements.txt    | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/config/FpConfig.fpp b/config/FpConfig.fpp
index d0ca9b28be..c1c00f997c 100644
--- a/config/FpConfig.fpp
+++ b/config/FpConfig.fpp
@@ -1,4 +1,3 @@
-type FwBuffSizeType
 type FwChanIdType
 type FwDpIdType
 type FwDpPriorityType
@@ -8,6 +7,8 @@ type FwIndexType
 type FwOpcodeType
 type FwPacketDescriptorType
 type FwPrmIdType
+type FwSignedSizeType
+type FwSizeStoreType
 type FwSizeType
 type FwTimeBaseStoreType
 type FwTimeContextStoreType
diff --git a/requirements.txt b/requirements.txt
index 371b0eddf8..0a281fb343 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,17 +18,17 @@ fprime-fpl-convert-xml==1.0.3
 fprime-fpl-extract-xml==1.0.3
 fprime-fpl-layout==1.0.3
 fprime-fpl-write-pic==1.0.3
-fprime-fpp-check==2.1.0a5
-fprime-fpp-depend==2.1.0a5
-fprime-fpp-filenames==2.1.0a5
-fprime-fpp-format==2.1.0a5
-fprime-fpp-from-xml==2.1.0a5
-fprime-fpp-locate-defs==2.1.0a5
-fprime-fpp-locate-uses==2.1.0a5
-fprime-fpp-syntax==2.1.0a5
-fprime-fpp-to-cpp==2.1.0a5
-fprime-fpp-to-json==2.1.0a5
-fprime-fpp-to-xml==2.1.0a5
+fprime-fpp-check==2.1.0a6
+fprime-fpp-depend==2.1.0a6
+fprime-fpp-filenames==2.1.0a6
+fprime-fpp-format==2.1.0a6
+fprime-fpp-from-xml==2.1.0a6
+fprime-fpp-locate-defs==2.1.0a6
+fprime-fpp-locate-uses==2.1.0a6
+fprime-fpp-syntax==2.1.0a6
+fprime-fpp-to-cpp==2.1.0a6
+fprime-fpp-to-json==2.1.0a6
+fprime-fpp-to-xml==2.1.0a6
 fprime-gds==3.4.3
 fprime-tools==3.4.4
 fprime-visual==1.0.2