Skip to content
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

Clean up MFBoards.h files to match current values #9

Merged
merged 1 commit into from
Sep 6, 2021

Conversation

neilenns
Copy link
Contributor

@neilenns neilenns commented Sep 4, 2021

Founds several places where there were mismatches in MFBoards.h from the source currently checked in to https://github.dev/MobiFlight/MobiFlight-Connector/blob/51613650fa8142f4a7338633dac631e2ec33fb2a/FirmwareSource/mobiflight/mobiflight.ino.

Updated the files so they replicate the currently shipping settings.

@@ -15,7 +15,7 @@

#define MODULE_MAX_PINS 69
#define MAX_OUTPUTS 40
#define MAX_BUTTONS 67 // 69 max. numbering, 0/1 for serial
#define MAX_BUTTONS 68
Copy link
Contributor Author

Choose a reason for hiding this comment

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

#define MF_LCD_SUPPORT 0
#define MF_STEPPER_SUPPORT 0
#define MF_SERVO_SUPPORT 0
#define MF_SEGMENT_SUPPORT 1
Copy link
Contributor Author

Choose a reason for hiding this comment

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

#define MF_ANALOG_SUPPORT 1
#define MF_SHIFTER_SUPPORT 0
#define MF_INPUT_SHIFTER_SUPPORT 1
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was an error on my part, accidentally having a #define in the wrong branch.


// ALL 26892 (93.8%) / 1713 (66.9%)
// No Segments 25148 (87.7%) / 1580 (61.7%)
// No LCDs 25308 (88.3%) / 1678 (65.5%)
// NO Steppers 21892 (76.4%) / 1675 (65.4%)
// No Servos 25302 (88.2%) / 1620 (63.3%)

#define MODULE_MAX_PINS 25
#define MODULE_MAX_PINS 21
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Another error on my part making edits in the wrong branch. This should be 21 as listed here: https://github.dev/MobiFlight/MobiFlight-Connector/blob/51613650fa8142f4a7338633dac631e2ec33fb2a/FirmwareSource/mobiflight/mobiflight.ino#L88

@@ -25,7 +24,6 @@
#define MAX_MFLCD_I2C 2
#define MAX_ANALOG_INPUTS 2
#define MAX_SHIFTERS 4
#define MAX_INPUT_SHIFTERS 4
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Edits in the wrong branch that carried over.

@neilenns neilenns self-assigned this Sep 5, 2021
Copy link
Collaborator

@MobiFlight-Admin MobiFlight-Admin left a comment

Choose a reason for hiding this comment

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

Looks like you reverted the settings to the current values.

Copy link
Collaborator

@MobiFlight-Admin MobiFlight-Admin left a comment

Choose a reason for hiding this comment

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

Approving again

Copy link
Collaborator

@MobiFlight-Admin MobiFlight-Admin left a comment

Choose a reason for hiding this comment

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

Three times is a charm

@MobiFlight-Admin
Copy link
Collaborator

I don't get it. review required, done it three times. what am i missing?

@neilenns
Copy link
Contributor Author

neilenns commented Sep 6, 2021

@MobiFlight-Admin Not sure on your end, but on my end it shows you approved and it's ready to merge.

@neilenns neilenns merged commit 4d0ebb6 into main Sep 6, 2021
@neilenns neilenns deleted the issue5-define-verification branch September 6, 2021 16:18
@neilenns neilenns linked an issue Sep 6, 2021 that may be closed by this pull request
@neilenns neilenns added this to Done in Initial migration Oct 8, 2021
@neilenns neilenns removed this from Done in Initial migration Oct 8, 2021
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.

Verify all the board-specific #define values are correct
2 participants