Fix FPrime microsecond range expectation

Author: nateinaction

FprimeZephyrReference/Components/Drv/Rv3028Manager/Rv3028Manager.cpp

@@ -53,7 +53,7 @@ U32 Rv3028Manager ::timeGet_handler(FwIndexType portNum) {
     U32 u_secs;
     this->getTime(posix_time, u_secs);
 
-    return u_secs;
+    return posix_time;
 }
 
 void Rv3028Manager ::timeSet_handler(FwIndexType portNum, const Drv::TimeData& t) {
@@ -109,7 +109,11 @@ void Rv3028Manager ::getTime(U32& posix_time, U32& u_secs) {
         return;
     }
 
-    uint32_t time_usecs = k_cyc_to_us_near32(k_cycle_get_32());
+    // Get microsecond part from system clock cycles
+    // Note: RV3028 does not provide sub-second precision, so this is
+    // just an approximation based on system cycles.
+    // FPrime expects microseconds in the range [0, 999999]
+    uint32_t time_usecs = k_cyc_to_us_near32(k_cycle_get_32()) % 1000000;
 
     // Set output parameters
     posix_time = static_cast<U32>(time_pt);

FprimeZephyrReference/test/int/rtc_test.py

@@ -72,7 +72,25 @@ def test_01_current_time_set(fprime_test_api: IntegrationTestAPI):
     pytest.approx(event_time, abs=30) == datetime.now(timezone.utc)
 
 
-def test_02_set_time_in_past(fprime_test_api: IntegrationTestAPI):
+def test_02_time_incrementing(fprime_test_api: IntegrationTestAPI):
+    """Test that time increments over time"""
+
+    # Fetch initial time
+    initial_event_time = get_time(fprime_test_api)
+
+    # Wait for time to increment
+    time.sleep(2.0)
+
+    # Fetch updated time
+    updated_event_time = get_time(fprime_test_api)
+
+    # Assert time has increased
+    assert updated_event_time > initial_event_time, (
+        f"Time should increase. Initial: {initial_event_time}, Updated: {updated_event_time}"
+    )
+
+
+def test_03_set_time_in_past(fprime_test_api: IntegrationTestAPI):
     """Test that we can set the time to a past time"""
 
     # Set time to Curiosity landing on Mars (7 minutes of terror! https://youtu.be/Ki_Af_o9Q9s)
@@ -90,34 +108,17 @@ def test_02_set_time_in_past(fprime_test_api: IntegrationTestAPI):
         event_previous_time_arg.val, tz=timezone.utc
     )
 
+    # Fetch FPrime time from event
+    fp_time: TimeType = result.get_time()
+    event_time = datetime.fromtimestamp(fp_time.seconds, tz=timezone.utc)
+
     # Assert previously set time is within 30 seconds of now
     pytest.approx(previously_set_time, abs=30) == datetime.now(timezone.utc)
 
-    # Fetch newly set time from event
-    event_time = get_time(fprime_test_api)
-
-    # Assert time is within 30 seconds of curiosity landing
+    # Assert event time is within 30 seconds of curiosity landing
     pytest.approx(event_time, abs=30) == curiosity_landing
 
 
-def test_03_time_incrementing(fprime_test_api: IntegrationTestAPI):
-    """Test that time increments over time"""
-
-    # Fetch initial time
-    initial_event_time = get_time(fprime_test_api)
-
-    # Wait for time to increment
-    time.sleep(2.0)
-
-    # Fetch updated time
-    updated_event_time = get_time(fprime_test_api)
-
-    # Assert time has increased
-    assert updated_event_time > initial_event_time, (
-        f"Time should increase. Initial: {initial_event_time}, Updated: {updated_event_time}"
-    )
-
-
 def test_04_time_in_telemetry(fprime_test_api: IntegrationTestAPI):
     """Test that we can get Time telemetry"""