Skip to content

Commit

Permalink
configuration: system1: Fix fan indexing problem (#74)
Browse files Browse the repository at this point in the history
The dual rotor fans are indexed by 1 rotor for each fan, followed by the
second rotor for those fans.

Tested on system1 hw
Before:
    Fan      Rotor     Present    RPM   PWM: %  Target  Zone
    ---     --------   -------   -----  ------  ------  ----
    Fan1    Fan1a_in    true      4102   39.22   100%   0 (CECIO)
    Fan1    Fan1b_in    true      4054
    Fan2    Fan2a_in    true      4032   39.22   100%   0 (CECIO)
    Fan2    Fan2b_in    true      4089
    Fan3    Fan3a_in    true      4040   39.22   100%   0 (CECIO)
    Fan3    Fan3b_in    true         0
    Fan4    Fan4a_in    true         0   39.22   100%   0 (CECIO)
    Fan4    Fan4b_in    true         0
    Fan5    Fan5a_in    true         0   39.22   100%   0 (CECIO)
    Fan5    Fan5b_in    true         0
    Fan6    Fan6_in     false        0   39.22   100%   1 (NVME)
    Fan7    Fan7_in     false        0   39.22   100%   1 (NVME)

After: Fan      Rotor     Present    RPM   PWM: %  Target  Zone
    ---     --------   -------   -----  ------  ------  ----
    Fan1    Fan1a_in    true      3972   39.22   100%   0 (CECIO)
    Fan1    Fan1b_in    true         0
    Fan2    Fan2a_in    true      4002   39.22   100%   0 (CECIO)
    Fan2    Fan2b_in    true         0
    Fan3    Fan3a_in    true      4054   39.22   100%   0 (CECIO)
    Fan3    Fan3b_in    true         0
    Fan4    Fan4a_in    true      4027   39.22   100%   0 (CECIO)
    Fan4    Fan4b_in    true         0
    Fan5    Fan5a_in    true      4054   39.22   100%   0 (CECIO)
    Fan5    Fan5b_in    true         0
    Fan6    Fan6_in     false        0   39.22   100%   1 (NVME)
    Fan7    Fan7_in     false        0   39.22   100%   1 (NVME)
Change-Id: Iee747f9b22099719f5d90296c5154b047b74880c
  • Loading branch information
cjcain authored and geissonator committed Nov 6, 2024
1 parent 4056d84 commit 0e2d1da
Showing 1 changed file with 24 additions and 24 deletions.
48 changes: 24 additions & 24 deletions configurations/system1_chassis.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@
},
{
"Address": "0x52",
"BindConnector": "Fan1 connector",
"BindConnector": "Fan2 connector",
"Bus": 6,
"Index": 1,
"MaxReading": 14500,
"Name": "Fan1b_in",
"Name": "Fan2a_in",
"PowerState": "Always",
"Presence": {
"MonitorType": "Polling",
"PinName": "FAN0_PRESENCE_R_N",
"PinName": "FAN1_PRESENCE_R_N",
"Polarity": "Low"
},
"Thresholds": [
Expand Down Expand Up @@ -84,15 +84,15 @@
},
{
"Address": "0x52",
"BindConnector": "Fan2 connector",
"BindConnector": "Fan3 connector",
"Bus": 6,
"Index": 2,
"MaxReading": 14500,
"Name": "Fan2a_in",
"Name": "Fan3a_in",
"PowerState": "Always",
"Presence": {
"MonitorType": "Polling",
"PinName": "FAN1_PRESENCE_R_N",
"PinName": "FAN2_PRESENCE_R_N",
"Polarity": "Low"
},
"Thresholds": [
Expand Down Expand Up @@ -125,15 +125,15 @@
},
{
"Address": "0x52",
"BindConnector": "Fan2 connector",
"BindConnector": "Fan4 connector",
"Bus": 6,
"Index": 3,
"MaxReading": 14500,
"Name": "Fan2b_in",
"Name": "Fan4a_in",
"PowerState": "Always",
"Presence": {
"MonitorType": "Polling",
"PinName": "FAN1_PRESENCE_R_N",
"PinName": "FAN3_PRESENCE_R_N",
"Polarity": "Low"
},
"Thresholds": [
Expand Down Expand Up @@ -166,15 +166,15 @@
},
{
"Address": "0x52",
"BindConnector": "Fan3 connector",
"BindConnector": "Fan5 connector",
"Bus": 6,
"Index": 4,
"MaxReading": 14500,
"Name": "Fan3a_in",
"Name": "Fan5a_in",
"PowerState": "Always",
"Presence": {
"MonitorType": "Polling",
"PinName": "FAN2_PRESENCE_R_N",
"PinName": "FAN4_PRESENCE_R_N",
"Polarity": "Low"
},
"Thresholds": [
Expand Down Expand Up @@ -207,15 +207,15 @@
},
{
"Address": "0x52",
"BindConnector": "Fan3 connector",
"BindConnector": "Fan1 connector",
"Bus": 6,
"Index": 5,
"MaxReading": 14500,
"Name": "Fan3b_in",
"Name": "Fan1b_in",
"PowerState": "Always",
"Presence": {
"MonitorType": "Polling",
"PinName": "FAN2_PRESENCE_R_N",
"PinName": "FAN0_PRESENCE_R_N",
"Polarity": "Low"
},
"Thresholds": [
Expand Down Expand Up @@ -248,15 +248,15 @@
},
{
"Address": "0x52",
"BindConnector": "Fan4 connector",
"BindConnector": "Fan2 connector",
"Bus": 6,
"Index": 6,
"MaxReading": 14500,
"Name": "Fan4a_in",
"Name": "Fan2b_in",
"PowerState": "Always",
"Presence": {
"MonitorType": "Polling",
"PinName": "FAN3_PRESENCE_R_N",
"PinName": "FAN1_PRESENCE_R_N",
"Polarity": "Low"
},
"Thresholds": [
Expand Down Expand Up @@ -289,15 +289,15 @@
},
{
"Address": "0x52",
"BindConnector": "Fan4 connector",
"BindConnector": "Fan3 connector",
"Bus": 6,
"Index": 7,
"MaxReading": 14500,
"Name": "Fan4b_in",
"Name": "Fan3b_in",
"PowerState": "Always",
"Presence": {
"MonitorType": "Polling",
"PinName": "FAN3_PRESENCE_R_N",
"PinName": "FAN2_PRESENCE_R_N",
"Polarity": "Low"
},
"Thresholds": [
Expand Down Expand Up @@ -330,15 +330,15 @@
},
{
"Address": "0x52",
"BindConnector": "Fan5 connector",
"BindConnector": "Fan4 connector",
"Bus": 6,
"Index": 8,
"MaxReading": 14500,
"Name": "Fan5a_in",
"Name": "Fan4b_in",
"PowerState": "Always",
"Presence": {
"MonitorType": "Polling",
"PinName": "FAN4_PRESENCE_R_N",
"PinName": "FAN3_PRESENCE_R_N",
"Polarity": "Low"
},
"Thresholds": [
Expand Down

0 comments on commit 0e2d1da

Please sign in to comment.