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.

Sign up for GitHub

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

Fix bug in how the PG is handled for the 3.8V firefly supply #189

Merged
merged 14 commits into from
Jun 28, 2023
Merged

Fix bug in how the PG is handled for the 3.8V firefly supply #189

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
66340b2
remove OK from 3.8V since it logically means something different than…
pwittich Jun 16, 2023
228a4f8
interim commit
pwittich Jun 16, 2023
0af15f0
Update AlarmUtilities.c
pwittich Jun 16, 2023
42c3024
Update Readme since FreeRTOS is now a submodule
pwittich Jun 17, 2023
2f2a107
Update power_ctl.c
pwittich Jun 17, 2023
69483e8
Update AlarmUtilities.c
pwittich Jun 17, 2023
0669e34
Update AlarmUtilities.c
pwittich Jun 18, 2023
7959d83
Update power_ctl.h
pwittich Jun 18, 2023
b1a1758
add more comments on 4v0 and how it is handled
pwittich Jun 20, 2023
1b29303
try to satisfy clang-format
pwittich Jun 20, 2023
715b3fc
remove all PS_OKS_*_MASK_L6 conflicting oks[] + only last PS w/ blade…
pkotamnives Jun 21, 2023
cd4bf7a
fix PS stuck at PS6 waiting for sem in enablev38 and OFF
pkotamnives Jun 23, 2023
d0aa0db
fix MONI2C based on PR comments
pkotamnives Jun 26, 2023
4a04ac5
get rid of some dead code
pwittich Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 31 additions & 28 deletions projects/cm_mcu/MonitorI2CTask.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,15 @@ void MonitorI2CTask(void *parameters)

bool good = false;
for (;;) {

log_debug(LOG_MONI2C, "%s: grab semaphore\r\n", args->name);

// grab the semaphore to ensure unique access to I2C controller
if (acquireI2CSemaphore(args->xSem) == pdFAIL) {
log_warn(LOG_SERVICE, "%s could not get semaphore in time; continue\r\n", args->name);
continue;
if (args->xSem != NULL) {
if (acquireI2CSemaphore(args->xSem) == pdFAIL) {
log_warn(LOG_SERVICE, "%s could not get semaphore in time; continue\r\n", args->name);
continue;
}
}
pwittich marked this conversation as resolved.
Show resolved Hide resolved

// -------------------------------
Expand All @@ -98,8 +101,33 @@ void MonitorI2CTask(void *parameters)
log_debug(LOG_MONI2C, "%s: device %d\r\n", args->name, ps);

if (ps == args->n_devices - 1 && getPowerControlState() != POWER_ON) { // avoid continues to infinite loops due to multi-threading when pwr is not on
pwittich marked this conversation as resolved.
Show resolved Hide resolved
if (xSemaphoreGetMutexHolder(args->xSem) == xTaskGetCurrentTaskHandle()) {
xSemaphoreGive(args->xSem);
}
break;
}

log_debug(LOG_MONI2C, "%s: powercheck\r\n", args->name);

if (getPowerControlState() != POWER_ON) {
if (good) {
log_info(LOG_MONI2C, "%s: PWR off. Disabling I2C monitoring.\r\n", args->name);
good = false;
task_watchdog_unregister_task(kWatchdogTaskID_MonitorI2CTask);
}
if (xSemaphoreGetMutexHolder(args->xSem) == xTaskGetCurrentTaskHandle()) {
xSemaphoreGive(args->xSem);
}
break;
}
else if (getPowerControlState() == POWER_ON) { // power is on, and ...
if (!good) { // ... was not good, but is now good
task_watchdog_register_task(kWatchdogTaskID_MonitorI2CTask);
log_info(LOG_MONI2C, "%s: PWR on. (Re)starting I2C monitoring.\r\n", args->name);
good = true;
}
}

if (!IsCLK) { // Fireflies need to be checked if the links are connected or not
if (args->i2c_dev == I2C_DEVICE_F1) { // FPGA #1
#ifdef REV1
Expand All @@ -125,31 +153,6 @@ void MonitorI2CTask(void *parameters)
#endif
}
}
log_debug(LOG_MONI2C, "%s: powercheck\r\n", args->name);

if (getPowerControlState() != POWER_ON) {
if (good) {
log_info(LOG_MONI2C, "%s: PWR off. Disabling I2C monitoring.\r\n", args->name);
good = false;
task_watchdog_unregister_task(kWatchdogTaskID_MonitorI2CTask);
}
vTaskDelay(pdMS_TO_TICKS(500));
continue;
}
else if (getPowerControlState() == POWER_ON) { // power is on, and ...
if (!good) { // ... was not good, but is now good
task_watchdog_register_task(kWatchdogTaskID_MonitorI2CTask);
log_info(LOG_MONI2C, "%s: PWR on. (Re)starting I2C monitoring.\r\n", args->name);
good = true;
}
}
// if the power state is unknown, don't do anything
else {
log_info(LOG_MONI2C, "%s: power state %d unknown\r\n", args->name,
getPowerControlState());
vTaskDelay(10);
continue;
}

if (!IsCLK) {
// mux setting
Expand Down
4 changes: 2 additions & 2 deletions projects/cm_mcu/PowerSupplyTask.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,8 +496,8 @@ void PowerSupplyTask(void *parameters)
setPSStatus(N_PS_OKS - 1, PWR_FAILED);
#endif
if (currentState != nextState) {
log_info(LOG_PWRCTL, "%s: change from state %s to %s\r\n", pcTaskGetName(NULL),
power_system_state_names[currentState], power_system_state_names[nextState]);
log_debug(LOG_PWRCTL, "%s: change from state %s to %s\r\n", pcTaskGetName(NULL),
power_system_state_names[currentState], power_system_state_names[nextState]);
}
currentState = nextState;

Expand Down