Skip to content

Update more stuff to fprime v4.0.0a1 #40

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 5 commits into from
Jun 3, 2025

Conversation

ethancheez
Copy link
Collaborator

@ethancheez ethancheez commented May 29, 2025

Warning

rp2040 builds are now broken because CMAKE_EXECUTABLE_SUFFIX can't append the .elf extension.
See #41

@ethancheez ethancheez changed the base branch from upgrade-to-fprime-4 to devel May 29, 2025 12:41
@ethancheez ethancheez changed the base branch from devel to upgrade-to-fprime-4 May 29, 2025 20:30
@ethancheez ethancheez requested a review from kevin-f-ortega May 29, 2025 21:34
Copy link

@kevin-f-ortega kevin-f-ortega left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for updating this to F Prime v4.0.0a1. Just a few minor comments.


PlatformIntType m_pin;
};
PlatformIntType m_pin;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are soon getting rid of PlatformIntType. Should replace this with int

Fw::Success setDutyCycle_handler(const FwIndexType portNum, /*!< The port number*/
U8 dutyCycle);

PlatformIntType m_pin;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to an int

@@ -27,22 +27,21 @@ class LifeLed : public LifeLedComponentBase {
~LifeLed();

//! Set the arduino pin to own
void configure(PlatformIntType pin=Arduino::DEF_LED_BUILTIN);
void configure(PlatformIntType pin = Arduino::DEF_LED_BUILTIN);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to int

void run_handler(NATIVE_INT_TYPE portNum, //!< The port number
NATIVE_UINT_TYPE context //!< The call order
void run_handler(FwIndexType portNum, //!< The port number
U32 context //!< The call order
) override;
U16 m_blink_count;
PlatformIntType m_pin;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to int

@kevin-f-ortega
Copy link

I realize this MR is to upgrade-to-fprime-4 and not to main. Can merge this and address the PlatformIntType --> int request later

@kevin-f-ortega kevin-f-ortega merged commit 700b42b into upgrade-to-fprime-4 Jun 3, 2025
@kevin-f-ortega kevin-f-ortega deleted the update/fprime-v4.0.0 branch June 3, 2025 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants