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

Feature/sw 303 cx specific functionalities #181

Merged
merged 31 commits into from
Sep 11, 2024

Conversation

Pradeep-Carbonix
Copy link
Contributor

@Pradeep-Carbonix Pradeep-Carbonix commented Sep 3, 2024

Merged the following commits :
df00855
eed5d3f
0b2e019
5385f77
89790bf
23e5c97
f9435d2
4c49385
54fa1a0
200ea68
26b8f58
d9da9cc
0153533
de41bd6

These commits address the compiler issues :
88bfe2e
d6a91fb
0043d40
a931ea4
2d4ca0f

IamPete1 and others added 4 commits September 9, 2024 14:14
Allows aggregate monitors like Sum and ESC to report the minimum voltage
instead of the average voltage. This is useful for systems with multiple
isolated batteries where the lowest voltage is the limiting factor.

SW-97
@robertlong13 robertlong13 force-pushed the feature/SW-303-CX-specific-functionalities branch from 399d84d to fb4c7ce Compare September 9, 2024 04:19
@Pradeep-Carbonix Pradeep-Carbonix added the needs upstream Upstream PR against ArduPilot needed label Sep 9, 2024
@robertlong13
Copy link
Collaborator

robertlong13 commented Sep 9, 2024

[deleted comment, replaced with later update; see edit history for the old version of this]

Pradeep-Carbonix and others added 3 commits September 10, 2024 10:24
Added #if AP_EXTENDED_ESC_TELEM_ENABLED to enable compilation when ESCX is not defined
Added a parameter CRAN_DIR where 0 if forward and 1 or greater is reverse direction for Engine Cranking.

As all our Engine our forward direction that is our default state.

SW-111
@robertlong13 robertlong13 force-pushed the feature/SW-303-CX-specific-functionalities branch from 2d4ca0f to b415d39 Compare September 10, 2024 02:42
@robertlong13
Copy link
Collaborator

robertlong13 commented Sep 10, 2024

<style> </style>
Feature Tested Upstream Commits Notes
AP_BattMonitor: ESC: add mask Yes Done c7748d4  
AP_BattMonitor: add option minimum volt option Yes Open f463c78 1708b0d  
AP_BLHeli: add support for 13-byte ext. telemetry Yes Not Needed 48cfd1f aef7f60  
AP_ICEngine: Add CRANK_DIR for direction control of TCA9554 Engine Yes Done 0044db4 Maybe wait for relay rework of TCA9554 instead of upstreaming
AP_Scripting: prevent "Starting XXX tune" happening multiple times N/A Done 9d83b59  
AP_EFI: Adding EFIS log for Hirth Yes Done 3167042  
AP_EFI : Addition of Engine Information over Mavlink Yes Not needed 9a5d09c  
Parameter docs Update: modified multiple param comments N/A Maybe 3809caa The spin range additions might be a good upstream
Parameter: CRASH_DETECT Param doc update to add 1 in value set N/A Done b127387 3f052fa  
AP_ICEngine: don't allow engine run with safety on Yes Done 1bd7fb8 87ed7bc  
HWDEF : enable APD HVPro Telem for Ottano Yes Not needed e8214b3  
HWDEF : enable ICEngine starter Yes Not needed 9933ab8  
AP_ESC_Telem: add power percentage N/A Done c5573f4 d7f8ec5  
AP_Periph: add support for sending extended ESC status Yes Done 843d57a 1e12921 726daa0 e24acce b6ea2c0 8136c79 d6715cc  
AP_ESC_Telem: tidy old calls to _telem_data Yes Done 7059de7  
waf: add support for generating compile_commands.json Yes Done 38b582a  
AP_EFI: fix ECYL log message Yes Done 07e9e76  
AP_EFI: Hirth: remove crankshaft sensor status N/A Done de65762  
AP_EFI: Hirth: fix enums in EFIS log message doc Yes Not needed b5b6493  

loki077 and others added 12 commits September 11, 2024 11:01
- Added EFIS log for Hirth engine
- Added ThM to help understand the engine logs better
- Updated the field names to keep the total length 64-characters long.
- Added Bitfield for the EFIS log to log all errors.
 - CHT2 and EGT2
 - Remove CI build error
Making changes to fix the CarboParameter CI pass for below issues

Parameter 'BATT2_CURR_PIN' has an invalid value: 51 : [-1, 3, 4, 14, 15, 17, 101]
Parameter 'BATT2_VOLT_PIN' has an invalid value: 50 : [-1, 2, 5, 13, 14, 16, 100]
Parameter 'BATT3_CURR_PIN' has an invalid value: 52 : [-1, 3, 4, 14, 15, 17, 101]
Parameter 'BATT3_VOLT_PIN' has an invalid value: 50 : [-1, 2, 5, 13, 14, 16, 100]
Parameter 'CRASH_DETECT' has an invalid value: 1 : [0]
Parameter 'Q_M_SPIN_ARM' has an invalid value: 0.07 : [0.0, 0.1, 0.2]

SW-45
Cherry-pick source:
 - AP_ICEngine: don't allow engine run with safety on : e070848
 - AP_EFI: fixed ignition while disarmed : 2956810

Cherry-pick was not sufficient, since the code has changed since 4.3.25. This code is tested after changes.
This condition was modified to fix the CI autotest error : MAV_CMD_DO_ENGINE_CONTROL
2024-09-03T04:03:41.0759926Z AT-0409.5: Exception caught: Failed to attain RPM1 want 350.0, reached 0
2024-09-03T04:03:41.0760806Z Traceback (most recent call last):
2024-09-03T04:03:41.0761962Z   File "/__w/carbopilot_V2/carbopilot_V2/Tools/autotest/vehicle_test_suite.py", line 8309, in run_one_test_attempt
2024-09-03T04:03:41.0763147Z     test_function(**test_kwargs)
2024-09-03T04:03:41.0764410Z   File "/__w/carbopilot_V2/carbopilot_V2/Tools/autotest/quadplane.py", line 1116, in MAV_CMD_DO_ENGINE_CONTROL
2024-09-03T04:03:41.0765822Z     self.wait_rpm(1, expected_starter_rpm_min, expected_starter_rpm_max)
2024-09-03T04:03:41.0767135Z   File "/__w/carbopilot_V2/carbopilot_V2/Tools/autotest/vehicle_test_suite.py", line 6734, in wait_rpm
2024-09-03T04:03:41.0768213Z     self.wait_and_maintain(
2024-09-03T04:03:41.0769475Z   File "/__w/carbopilot_V2/carbopilot_V2/Tools/autotest/vehicle_test_suite.py", line 6902, in wait_and_maintain
2024-09-03T04:03:41.0770669Z     return self.wait_and_maintain_range(
2024-09-03T04:03:41.0771877Z   File "/__w/carbopilot_V2/carbopilot_V2/Tools/autotest/vehicle_test_suite.py", line 7097, in wait_and_maintain_range
2024-09-03T04:03:41.0773309Z     raise AutoTestTimeoutException(
2024-09-03T04:03:41.0774319Z vehicle_test_suite.AutoTestTimeoutException: Failed to attain RPM1 want 350.0, reached 0
@robertlong13 robertlong13 force-pushed the feature/SW-303-CX-specific-functionalities branch from fa6a80c to 38b582a Compare September 11, 2024 01:01
- Convert temperatures Celsius to match the docs
- Fix format specifier for CHT2
There is no crankshaft sensor status reported by this EFI. This line is
misleading and should be removed. The sensor health bitmask is already
logged elsewhere.
The extra colons are needed in master, but not in 4.5.
Copy link
Collaborator

@robertlong13 robertlong13 left a comment

Choose a reason for hiding this comment

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

LGTM

@robertlong13 robertlong13 merged commit 5d694e3 into CxPilot-7 Sep 11, 2024
47 checks passed
@robertlong13 robertlong13 deleted the feature/SW-303-CX-specific-functionalities branch September 11, 2024 05:52
@robertlong13 robertlong13 removed the needs upstream Upstream PR against ArduPilot needed label Sep 30, 2024
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.

6 participants