Skip to content

Fix incomplete handling of 4v, new peripheral documentation for MCU, bug fix in ZMON power alarm (c and yaml)#279

Merged
pwittich merged 7 commits intomasterfrom
bugfix/4vcheck
Apr 23, 2026
Merged

Fix incomplete handling of 4v, new peripheral documentation for MCU, bug fix in ZMON power alarm (c and yaml)#279
pwittich merged 7 commits intomasterfrom
bugfix/4vcheck

Conversation

@pwittich
Copy link
Copy Markdown
Contributor

This pull request introduces several improvements and corrections to the Firefly (FF) power control and monitoring logic, MCU peripheral documentation, and ZynqMon data reporting. The main changes include a more robust check for Firefly presence and power wiring, improved error handling, expanded ZynqMon sensor reporting, and updated documentation for hardware pin assignments.

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR updates the CM MCU ↔ ZynqMon monitoring map and Firefly power/alarms handling, and adds a new hardware-peripheral/pin assignment reference document for the TM4C1290.

Changes:

  • Fold Firefly power-alarm reporting into the existing firefly_info ZynqMon block (YAML + firmware), removing the separate power-alarm block.
  • Tighten Rev2/3 Firefly 4V0/3V8 slot validation during power-up by checking both “25G needs 4V0” and “4V0 slot must not contain non‑25G” conditions.
  • Add mcu_peripherals.md documenting MCU peripheral and pin assignments.

Reviewed changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
sm_cm_config/data/PL_MEM_CM_rev3.yml Expands firefly block size, adds POWER_ALARM postfixes, shifts subsequent start offsets, removes separate power-alarm block.
sm_cm_config/data/PL_MEM_CM_rev2.yml Same as rev3: expands firefly block, shifts offsets, removes separate power-alarm block.
projects/cm_mcu/ZynqMonTask.c Adds POWER_ALARM_0/1 reporting into zm_set_firefly_info; removes standalone zm_set_firefly_power_alarm.
projects/cm_mcu/Tasks.h Removes prototype for deleted zm_set_firefly_power_alarm.
projects/cm_mcu/PowerSupplyTask.c Updates Rev2/3 Firefly slot validation logic using both “25G mask” and “presence mask”; improves failure handling path.
projects/cm_mcu/FireflyUtils.h Declares new getFF12ChPresentTxMask() helper for Rev2/3.
projects/cm_mcu/FireflyUtils.c Implements getFF12ChPresentTxMask() based on present_bit_mask.
mcu_peripherals.md New documentation describing UART/I2C/ADC/timer usage and detailed pin assignments across revisions.

Comment on lines +437 to 439
log_error(LOG_PWRCTL, "FF 4V0 part check failed: part present without 4V0 switch"
" (f1: sel=%x parts=%x, f2: sel=%x parts=%x), power off\r\n",
f1_ff12xmit_4v0_sel, pair_mask_f1, f2_ff12xmit_4v0_sel, pair_mask_f2);
Comment thread mcu_peripherals.md Outdated
Comment thread mcu_peripherals.md Outdated
Comment thread mcu_peripherals.md Outdated
@pwittich pwittich merged commit 9865b22 into master Apr 23, 2026
3 checks passed
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