Merge branch 'nasa:devel' into fix/enum_representation_types

.github/workflows/build-test-macos.yml

@@ -20,6 +20,7 @@ on:
 jobs:
   macOS-Framework:
     runs-on: macos-latest
+    timeout-minutes: 30
     steps:
     - name: "Checkout F´ Repository"
       uses: actions/checkout@v4
@@ -29,6 +30,9 @@ jobs:
     - uses: ./.github/actions/setup
     - name: F prime CI step
       run: ./ci/tests/Framework.bash
+      env:
+        # Limit to 2 jobs to avoid resource exhaustion (https://github.com/nasa/fprime/issues/2462)
+        JOBS: 2
     # Archive the outputs
     - name: 'Archive Logs'
       uses: actions/upload-artifact@v3
@@ -40,6 +44,7 @@ jobs:
 
   macOS-Ref:
     runs-on: macos-latest
+    timeout-minutes: 30
     steps:
     - name: "Checkout F´ Repository"
       uses: actions/checkout@v4
@@ -49,6 +54,8 @@ jobs:
     - uses: ./.github/actions/setup
     - name: F prime CI step
       run: ./ci/tests/Ref.bash
+      env:
+        JOBS: 2
     # Archive the outputs
     - name: 'Archive Logs'
       uses: actions/upload-artifact@v3
@@ -60,6 +67,7 @@ jobs:
 
   macOS-Integration:
     runs-on: macos-latest
+    timeout-minutes: 30
     steps:
     - name: "Checkout F´ Repository"
       uses: actions/checkout@v4
@@ -71,6 +79,8 @@ jobs:
       run: brew install coreutils
     - name: F prime CI step
       run: ./ci/tests/30-ints.bash
+      env:
+        JOBS: 2
     # Archive the outputs
     - name: 'Archive Logs'
       uses: actions/upload-artifact@v3

.github/workflows/pip-check.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ${{ matrix.runner }}
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         runner: [macos-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@v3

Autocoders/Python/src/fprime_ac/utils/version.py

@@ -2,7 +2,7 @@
 import os
 import subprocess
 
-FALLBACK_VERSION = "v3.4.0"  # Keep up-to-date on release tag
+FALLBACK_VERSION = "v3.4.1"  # Keep up-to-date on release tag
 
 
 def get_version_str(working_dir, fallback=FALLBACK_VERSION):

CMakeLists.txt

@@ -20,6 +20,7 @@ add_compile_options(
     -Wall
     -Wextra
     -Werror
+#    -pedantic
     $<$<COMPILE_LANGUAGE:CXX>:-Wold-style-cast>
     -Wno-unused-parameter
 )

Drv/Interfaces/ByteStreamDriverInterface.fppi

@@ -5,4 +5,4 @@
     output port $recv: Drv.ByteStreamRecv
 
     @ Port invoked to send data out the driver
-    guarded input port send: Drv.ByteStreamSend
+    guarded input port $send: Drv.ByteStreamSend

Drv/Ip/SocketReadTask.cpp

@@ -111,4 +111,4 @@ void SocketReadTask::readTask(void* pointer) {
            (status == SOCK_SUCCESS || status == SOCK_INTERRUPTED_TRY_AGAIN || self->m_reconnect));
     self->getSocketHandler().shutdown(); // Shutdown the port entirely
 }
-};  // namespace Drv
+}  // namespace Drv

Drv/Ip/SocketReadTask.hpp

@@ -173,5 +173,5 @@ class SocketReadTask {
     bool m_stop; //!< Stops the task when set to true
 
 };
-};
+}
 #endif  // DRV_SOCKETREADTASK_HPP

Drv/LinuxGpioDriver/LinuxGpioDriverComponentImpl.cpp

@@ -27,8 +27,8 @@
 #include <fcntl.h>
 #include <poll.h>
 
-//#define DEBUG_PRINT(x,...) printf(x,##__VA_ARGS__); fflush(stdout)
-#define DEBUG_PRINT(x,...)
+//#define DEBUG_PRINT(...) printf(##__VA_ARGS__); fflush(stdout)
+#define DEBUG_PRINT(...)
 
 namespace Drv {
 
@@ -375,7 +375,7 @@ namespace Drv {
         // Read is only taking 22 usecs each time, so it is not blocking for long
         if (fdset[0].revents & POLLPRI) {
 
-            char *buf[MAX_BUF];
+            char buf[MAX_BUF];
             (void) lseek(fdset[0].fd, 0, SEEK_SET); // Must seek back to the starting
             if(read(fdset[0].fd, buf, MAX_BUF) > 0) {
                 DEBUG_PRINT("\npoll() GPIO interrupt occurred w/ value: %c\n", buf[0]);

Drv/LinuxI2cDriver/LinuxI2cDriver.cpp

@@ -174,25 +174,23 @@ namespace Drv {
       Fw::Logger::logMsg("I2c addr: 0x%02X\n",addr);
     #endif
 
-    struct i2c_msg rdwr_msgs[2] = {
-        {  // Start address
-            .addr = static_cast<U16>(addr),
-            .flags = 0, // write
-            .len = static_cast<U16>(writeBuffer.getSize()),
-            .buf = writeBuffer.getData()
-        },
-        { // Read buffer
-            .addr = static_cast<U16>(addr),
-            .flags = I2C_M_RD, // read
-            .len = static_cast<U16>(readBuffer.getSize()),
-            .buf = readBuffer.getData()
-        }
-    };
-
-    struct i2c_rdwr_ioctl_data rdwr_data = {
-        .msgs = rdwr_msgs,
-        .nmsgs = 2
-    };
+    struct i2c_msg rdwr_msgs[2];
+
+    // Start address
+    rdwr_msgs[0].addr = static_cast<U16>(addr);
+    rdwr_msgs[0].flags = 0; // write
+    rdwr_msgs[0].len = static_cast<U16>(writeBuffer.getSize());
+    rdwr_msgs[0].buf = writeBuffer.getData();
+
+    // Read buffer
+    rdwr_msgs[1].addr = static_cast<U16>(addr);
+    rdwr_msgs[1].flags = I2C_M_RD; // read
+    rdwr_msgs[1].len = static_cast<U16>(readBuffer.getSize());
+    rdwr_msgs[1].buf = readBuffer.getData();
+
+    struct i2c_rdwr_ioctl_data rdwr_data;
+    rdwr_data.msgs = rdwr_msgs;
+    rdwr_data.nmsgs = 2;
 
     //Use ioctl to perform the combined write/read transaction
     NATIVE_INT_TYPE stat = ioctl(this->m_fd, I2C_RDWR, &rdwr_data);

Drv/LinuxSpiDriver/LinuxSpiDriverComponentImpl.cpp

@@ -24,8 +24,8 @@
 #include <linux/spi/spidev.h>
 #include <cerrno>
 
-//#define DEBUG_PRINT(x,...) printf(x,##__VA_ARGS__); fflush(stdout)
-#define DEBUG_PRINT(x,...)
+//#define DEBUG_PRINT(...) printf(##__VA_ARGS__); fflush(stdout)
+#define DEBUG_PRINT(...)
 
 namespace Drv {
 

Drv/LinuxUartDriver/LinuxUartDriver.cpp

@@ -22,8 +22,8 @@
 
 //#include <cstdlib>
 //#include <cstdio>
-//#define DEBUG_PRINT(x,...) printf(x,##__VA_ARGS__); fflush(stdout)
-#define DEBUG_PRINT(x, ...)
+//#define DEBUG_PRINT(...) printf(##__VA_ARGS__); fflush(stdout)
+#define DEBUG_PRINT(...)
 
 namespace Drv {
 

Fw/Comp/ActiveComponentBase.cpp

@@ -4,8 +4,8 @@
 #include <Os/TaskString.hpp>
 #include <cstdio>
 
-//#define DEBUG_PRINT(x,...) printf(x,##__VA_ARGS__); fflush(stdout)
-#define DEBUG_PRINT(x,...)
+//#define DEBUG_PRINT(...) printf(##__VA_ARGS__); fflush(stdout)
+#define DEBUG_PRINT(...)
 
 namespace Fw {
 

Fw/Logger/Logger.cpp

@@ -31,5 +31,4 @@ namespace Fw {
     Logger::~Logger() {
     }
 
-};
-//End namespace Fw
+} //End namespace Fw