Make fan names more generic
darp10 demonstrates that a board without a dGPU may still have a second fan, so rename the CPU (PECI) fan to FAN1 and dGPU fan to FAN2. Signed-off-by: Tim Crawford <tcrawford@system76.com>
This commit is contained in:
		
				
					committed by
					
						 Tim Crawford
						Tim Crawford
					
				
			
			
				
	
			
			
			
						parent
						
							ceba69d7fa
						
					
				
				
					commit
					f8697a7ec4
				
			| @@ -34,23 +34,24 @@ CFLAGS+=\ | |||||||
| 	-DPOWER_LIMIT_DC=45 | 	-DPOWER_LIMIT_DC=45 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ |  | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -34,23 +34,24 @@ CFLAGS+=\ | |||||||
| 	-DPOWER_LIMIT_DC=45 | 	-DPOWER_LIMIT_DC=45 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ |  | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -43,27 +43,28 @@ CFLAGS+=\ | |||||||
| 	-DPOWER_LIMIT_DC=55 | 	-DPOWER_LIMIT_DC=55 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_HEATUP=5 | CFLAGS += -DBOARD_FAN1_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_COOLDOWN=20 | CFLAGS += -DBOARD_FAN1_COOLDOWN=20 | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_HEATUP=5 |  | ||||||
| CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 | CFLAGS += -DBOARD_FAN2_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN2_COOLDOWN=20 | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -39,31 +39,32 @@ CFLAGS += \ | |||||||
| 	-DPOWER_LIMIT_DC=45 | 	-DPOWER_LIMIT_DC=45 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS += -DBOARD_HEATUP=5 | CFLAGS += -DBOARD_FAN1_HEATUP=5 | ||||||
| CFLAGS += -DBOARD_COOLDOWN=20 | CFLAGS += -DBOARD_FAN1_COOLDOWN=20 | ||||||
| CFLAGS += -DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(60, 28), \ | 	FAN_POINT(60, 28), \ | ||||||
| 	FAN_POINT(65, 28), \ | 	FAN_POINT(65, 28), \ | ||||||
| 	FAN_POINT(70, 40), \ | 	FAN_POINT(70, 40), \ | ||||||
| 	FAN_POINT(75, 60), \ | 	FAN_POINT(75, 60), \ | ||||||
| 	FAN_POINT(80, 75), \ | 	FAN_POINT(80, 75), \ | ||||||
| 	FAN_POINT(85, 90), \ | 	FAN_POINT(85, 90), \ | ||||||
| 	FAN_POINT(90, 100) \ | 	FAN_POINT(90, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable DGPU support | # Enable DGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS += -DBOARD_DGPU_HEATUP=5 |  | ||||||
| CFLAGS += -DBOARD_DGPU_COOLDOWN=20 | CFLAGS += -DBOARD_FAN2_HEATUP=5 | ||||||
| CFLAGS += -DBOARD_DGPU_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN2_COOLDOWN=20 | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(60, 28), \ | 	FAN_POINT(60, 28), \ | ||||||
| 	FAN_POINT(65, 28), \ | 	FAN_POINT(65, 28), \ | ||||||
| 	FAN_POINT(70, 40), \ | 	FAN_POINT(70, 40), \ | ||||||
| 	FAN_POINT(75, 60), \ | 	FAN_POINT(75, 60), \ | ||||||
| 	FAN_POINT(80, 75), \ | 	FAN_POINT(80, 75), \ | ||||||
| 	FAN_POINT(85, 90), \ | 	FAN_POINT(85, 90), \ | ||||||
| 	FAN_POINT(90, 100) \ | 	FAN_POINT(90, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -34,23 +34,24 @@ CFLAGS+=\ | |||||||
| 	-DPOWER_LIMIT_DC=45 | 	-DPOWER_LIMIT_DC=45 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ |  | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -48,27 +48,28 @@ CFLAGS+=\ | |||||||
| 	-DPOWER_LIMIT_DC=55 | 	-DPOWER_LIMIT_DC=55 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_HEATUP=5 | CFLAGS += -DBOARD_FAN1_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_COOLDOWN=20 | CFLAGS += -DBOARD_FAN1_COOLDOWN=20 | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_HEATUP=5 |  | ||||||
| CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 | CFLAGS += -DBOARD_FAN2_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN2_COOLDOWN=20 | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -10,8 +10,8 @@ | |||||||
|  |  | ||||||
| bool fan_max = false; | bool fan_max = false; | ||||||
|  |  | ||||||
| static uint8_t last_duty_dgpu = 0; | static uint8_t last_fan1_duty = 0; | ||||||
| static uint8_t last_duty_peci = 0; | static uint8_t last_fan2_duty = 0; | ||||||
|  |  | ||||||
| #define FAN_POINT(T, D) { .temp = (int16_t)(T), .duty = PWM_DUTY(D) } | #define FAN_POINT(T, D) { .temp = (int16_t)(T), .duty = PWM_DUTY(D) } | ||||||
|  |  | ||||||
| @@ -26,29 +26,29 @@ static uint8_t last_duty_peci = 0; | |||||||
| #define MIN_SPEED_TO_SMOOTH PWM_DUTY(SMOOTH_FANS_MIN) | #define MIN_SPEED_TO_SMOOTH PWM_DUTY(SMOOTH_FANS_MIN) | ||||||
|  |  | ||||||
| // Fan speed is the lowest requested over HEATUP seconds | // Fan speed is the lowest requested over HEATUP seconds | ||||||
| #ifndef BOARD_HEATUP | #ifndef BOARD_FAN1_HEATUP | ||||||
| #define BOARD_HEATUP 4 | #define BOARD_FAN1_HEATUP 4 | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| static uint8_t FAN1_HEATUP[BOARD_HEATUP] = { 0 }; | static uint8_t FAN1_HEATUP[BOARD_FAN1_HEATUP] = { 0 }; | ||||||
|  |  | ||||||
| // Fan speed is the highest HEATUP speed over COOLDOWN seconds | // Fan speed is the highest HEATUP speed over COOLDOWN seconds | ||||||
| #ifndef BOARD_COOLDOWN | #ifndef BOARD_FAN1_COOLDOWN | ||||||
| #define BOARD_COOLDOWN 10 | #define BOARD_FAN1_COOLDOWN 10 | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| static uint8_t FAN1_COOLDOWN[BOARD_COOLDOWN] = { 0 }; | static uint8_t FAN1_COOLDOWN[BOARD_FAN1_COOLDOWN] = { 0 }; | ||||||
|  |  | ||||||
| // Fan curve with temperature in degrees C, duty cycle in percent | // Fan curve with temperature in degrees C, duty cycle in percent | ||||||
| static struct FanPoint __code FAN1_POINTS[] = { | static struct FanPoint __code FAN1_POINTS[] = { | ||||||
| #ifdef BOARD_FAN_POINTS | #ifdef BOARD_FAN1_POINTS | ||||||
|     BOARD_FAN_POINTS |     BOARD_FAN1_POINTS | ||||||
| #else | #else | ||||||
|     FAN_POINT(70, 40), |     FAN_POINT(70, 40), | ||||||
|     FAN_POINT(75, 50), |     FAN_POINT(75, 50), | ||||||
|     FAN_POINT(80, 60), |     FAN_POINT(80, 60), | ||||||
|     FAN_POINT(85, 65), |     FAN_POINT(85, 65), | ||||||
|     FAN_POINT(90, 65) |     FAN_POINT(90, 65), | ||||||
| #endif | #endif | ||||||
| }; | }; | ||||||
|  |  | ||||||
| @@ -65,29 +65,29 @@ static struct Fan __code FAN1 = { | |||||||
| #if CONFIG_HAVE_DGPU | #if CONFIG_HAVE_DGPU | ||||||
|  |  | ||||||
| // Fan speed is the lowest requested over HEATUP seconds | // Fan speed is the lowest requested over HEATUP seconds | ||||||
| #ifndef BOARD_DGPU_HEATUP | #ifndef BOARD_FAN2_HEATUP | ||||||
| #define BOARD_DGPU_HEATUP 4 | #define BOARD_FAN2_HEATUP 4 | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| static uint8_t FAN2_HEATUP[BOARD_DGPU_HEATUP] = { 0 }; | static uint8_t FAN2_HEATUP[BOARD_FAN2_HEATUP] = { 0 }; | ||||||
|  |  | ||||||
| // Fan speed is the highest HEATUP speed over COOLDOWN seconds | // Fan speed is the highest HEATUP speed over COOLDOWN seconds | ||||||
| #ifndef BOARD_DGPU_COOLDOWN | #ifndef BOARD_FAN2_COOLDOWN | ||||||
| #define BOARD_DGPU_COOLDOWN 10 | #define BOARD_FAN2_COOLDOWN 10 | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| static uint8_t FAN2_COOLDOWN[BOARD_DGPU_COOLDOWN] = { 0 }; | static uint8_t FAN2_COOLDOWN[BOARD_FAN2_COOLDOWN] = { 0 }; | ||||||
|  |  | ||||||
| // Fan curve with temperature in degrees C, duty cycle in percent | // Fan curve with temperature in degrees C, duty cycle in percent | ||||||
| static struct FanPoint __code FAN2_POINTS[] = { | static struct FanPoint __code FAN2_POINTS[] = { | ||||||
| #ifdef BOARD_DGPU_FAN_POINTS | #ifdef BOARD_FAN2_POINTS | ||||||
|     BOARD_DGPU_FAN_POINTS |     BOARD_FAN2_POINTS | ||||||
| #else | #else | ||||||
|     FAN_POINT(70, 40), |     FAN_POINT(70, 40), | ||||||
|     FAN_POINT(75, 50), |     FAN_POINT(75, 50), | ||||||
|     FAN_POINT(80, 60), |     FAN_POINT(80, 60), | ||||||
|     FAN_POINT(85, 65), |     FAN_POINT(85, 65), | ||||||
|     FAN_POINT(90, 65) |     FAN_POINT(90, 65), | ||||||
| #endif | #endif | ||||||
| }; | }; | ||||||
|  |  | ||||||
| @@ -209,7 +209,7 @@ static uint8_t fan_cooldown(const struct Fan *const fan, uint8_t duty) __reentra | |||||||
|     return highest; |     return highest; | ||||||
| } | } | ||||||
|  |  | ||||||
| static uint8_t peci_get_fan_duty(void) { | static uint8_t get_fan1_duty(void) { | ||||||
|     uint8_t duty; |     uint8_t duty; | ||||||
|  |  | ||||||
|     if (power_state == POWER_STATE_S0) { |     if (power_state == POWER_STATE_S0) { | ||||||
| @@ -228,7 +228,7 @@ static uint8_t peci_get_fan_duty(void) { | |||||||
| } | } | ||||||
|  |  | ||||||
| #if CONFIG_HAVE_DGPU | #if CONFIG_HAVE_DGPU | ||||||
| static uint8_t dgpu_get_fan_duty(void) { | static uint8_t get_fan2_duty(void) { | ||||||
|     uint8_t duty; |     uint8_t duty; | ||||||
|  |  | ||||||
|     if (power_state == POWER_STATE_S0) { |     if (power_state == POWER_STATE_S0) { | ||||||
| @@ -246,40 +246,40 @@ static uint8_t dgpu_get_fan_duty(void) { | |||||||
|     return duty; |     return duty; | ||||||
| } | } | ||||||
| #else | #else | ||||||
| static uint8_t dgpu_get_fan_duty(void) { | static uint8_t get_fan2_duty(void) { | ||||||
|     return PWM_DUTY(0); |     return PWM_DUTY(0); | ||||||
| } | } | ||||||
| #endif // CONFIG_HAVE_DGPU | #endif // CONFIG_HAVE_DGPU | ||||||
|  |  | ||||||
| static void fan_duty_set(uint8_t peci_fan_duty, uint8_t dgpu_fan_duty) __reentrant { | static void fan_duty_set(uint8_t fan1_duty, uint8_t fan2_duty) __reentrant { | ||||||
| #if SYNC_FANS != 0 | #if SYNC_FANS != 0 | ||||||
|     peci_fan_duty = peci_fan_duty > dgpu_fan_duty ? peci_fan_duty : dgpu_fan_duty; |     fan1_duty = fan1_duty > fan2_duty ? fan1_duty : fan2_duty; | ||||||
|     dgpu_fan_duty = peci_fan_duty > dgpu_fan_duty ? peci_fan_duty : dgpu_fan_duty; |     fan2_duty = fan1_duty > fan2_duty ? fan1_duty : fan2_duty; | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|     // set PECI fan duty |     // set FAN1 duty | ||||||
|     if (peci_fan_duty != DCR2) { |     if (fan1_duty != DCR2) { | ||||||
|         TRACE("PECI fan_duty_raw=%d\n", peci_fan_duty); |         TRACE("FAN1 fan_duty_raw=%d\n", fan1_duty); | ||||||
|         last_duty_peci = peci_fan_duty = fan_smooth(last_duty_peci, peci_fan_duty); |         last_fan1_duty = fan1_duty = fan_smooth(last_fan1_duty, fan1_duty); | ||||||
|         DCR2 = fan_max ? MAX_FAN_SPEED : peci_fan_duty; |         DCR2 = fan_max ? MAX_FAN_SPEED : fan1_duty; | ||||||
| #if HAVE_CPU_FAN2 | #if HAVE_CPU_FAN2 | ||||||
|         // FIXME: Handle better |         // FIXME: Handle better | ||||||
|         DCR3 = fan_max ? MAX_FAN_SPEED : peci_fan_duty; |         DCR3 = fan_max ? MAX_FAN_SPEED : fan1_duty; | ||||||
| #endif | #endif | ||||||
|         TRACE("PECI fan_duty_smoothed=%d\n", peci_fan_duty); |         TRACE("FAN1 fan_duty_smoothed=%d\n", fan1_duty); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     // set dGPU fan duty |     // set FAN2 duty | ||||||
|     if (dgpu_fan_duty != DCR4) { |     if (fan2_duty != DCR4) { | ||||||
|         TRACE("DGPU fan_duty_raw=%d\n", dgpu_fan_duty); |         TRACE("FAN2 fan_duty_raw=%d\n", fan2_duty); | ||||||
|         last_duty_dgpu = dgpu_fan_duty = fan_smooth(last_duty_dgpu, dgpu_fan_duty); |         last_fan2_duty = fan2_duty = fan_smooth(last_fan2_duty, fan2_duty); | ||||||
|         DCR4 = fan_max ? MAX_FAN_SPEED : dgpu_fan_duty; |         DCR4 = fan_max ? MAX_FAN_SPEED : fan2_duty; | ||||||
|         TRACE("DGPU fan_duty_smoothed=%d\n", dgpu_fan_duty); |         TRACE("FAN2 fan_duty_smoothed=%d\n", fan2_duty); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| void fan_update_duty(void) { | void fan_update_duty(void) { | ||||||
|     uint8_t fan1_duty = peci_get_fan_duty(); |     uint8_t fan1_duty = get_fan1_duty(); | ||||||
|     uint8_t fan2_duty = dgpu_get_fan_duty(); |     uint8_t fan2_duty = get_fan2_duty(); | ||||||
|     fan_duty_set(fan1_duty, fan2_duty); |     fan_duty_set(fan1_duty, fan2_duty); | ||||||
| } | } | ||||||
|   | |||||||
| @@ -40,23 +40,24 @@ CFLAGS+=\ | |||||||
| 	-DPOWER_LIMIT_DC=45 | 	-DPOWER_LIMIT_DC=45 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(70, 25), \ | 	FAN_POINT(70, 25), \ | ||||||
| 	FAN_POINT(80, 25), \ | 	FAN_POINT(80, 25), \ | ||||||
| 	FAN_POINT(80, 40), \ | 	FAN_POINT(80, 40), \ | ||||||
| 	FAN_POINT(88, 40), \ | 	FAN_POINT(88, 40), \ | ||||||
| 	FAN_POINT(88, 100) \ | 	FAN_POINT(88, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ |  | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(70, 25), \ | 	FAN_POINT(70, 25), \ | ||||||
| 	FAN_POINT(75, 40), \ | 	FAN_POINT(75, 40), \ | ||||||
| 	FAN_POINT(80, 75), \ | 	FAN_POINT(80, 75), \ | ||||||
| 	FAN_POINT(85, 90), \ | 	FAN_POINT(85, 90), \ | ||||||
| 	FAN_POINT(90, 100) \ | 	FAN_POINT(90, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -34,23 +34,24 @@ CFLAGS+=\ | |||||||
| 	-DPOWER_LIMIT_DC=45 | 	-DPOWER_LIMIT_DC=45 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ |  | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -39,27 +39,28 @@ CFLAGS+=\ | |||||||
| 	-DPOWER_LIMIT_DC=45 | 	-DPOWER_LIMIT_DC=45 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_HEATUP=5 | CFLAGS += -DBOARD_FAN1_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_COOLDOWN=20 | CFLAGS += -DBOARD_FAN1_COOLDOWN=20 | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_HEATUP=5 |  | ||||||
| CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 | CFLAGS += -DBOARD_FAN2_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN2_COOLDOWN=20 | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -42,27 +42,28 @@ CFLAGS+=\ | |||||||
| 	-DPOWER_LIMIT_DC=45 | 	-DPOWER_LIMIT_DC=45 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_HEATUP=5 | CFLAGS += -DBOARD_FAN1_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_COOLDOWN=20 | CFLAGS += -DBOARD_FAN1_COOLDOWN=20 | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_HEATUP=5 |  | ||||||
| CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 | CFLAGS+=-DBOARD_FAN2_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ | CFLAGS+=-DBOARD_FAN2_COOLDOWN=20 | ||||||
|  | CFLAGS+=-DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -39,27 +39,28 @@ CFLAGS+=\ | |||||||
| 	-DPOWER_LIMIT_DC=45 | 	-DPOWER_LIMIT_DC=45 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_HEATUP=5 | CFLAGS += -DBOARD_FAN1_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_COOLDOWN=20 | CFLAGS += -DBOARD_FAN1_COOLDOWN=20 | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_HEATUP=5 |  | ||||||
| CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 | CFLAGS += -DBOARD_FAN2_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN2_COOLDOWN=20 | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -42,31 +42,32 @@ CFLAGS+=\ | |||||||
| CFLAGS+=-DSMOOTH_FANS_MIN=20 | CFLAGS+=-DSMOOTH_FANS_MIN=20 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_HEATUP=5 | CFLAGS += -DBOARD_FAN1_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_COOLDOWN=20 | CFLAGS += -DBOARD_FAN1_COOLDOWN=20 | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(50, 28), \ | 	FAN_POINT(50, 28), \ | ||||||
| 	FAN_POINT(58, 28), \ | 	FAN_POINT(58, 28), \ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_HEATUP=5 |  | ||||||
| CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 | CFLAGS += -DBOARD_FAN2_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN2_COOLDOWN=20 | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(50, 28), \ | 	FAN_POINT(50, 28), \ | ||||||
| 	FAN_POINT(58, 28), \ | 	FAN_POINT(58, 28), \ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -43,27 +43,28 @@ CFLAGS+=\ | |||||||
| 	-DPOWER_LIMIT_DC=45 | 	-DPOWER_LIMIT_DC=45 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_HEATUP=5 | CFLAGS += -DBOARD_FAN1_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_COOLDOWN=20 | CFLAGS += -DBOARD_FAN1_COOLDOWN=20 | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_HEATUP=5 |  | ||||||
| CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 | CFLAGS += -DBOARD_FAN2_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN2_COOLDOWN=20 | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -40,27 +40,28 @@ CFLAGS+=\ | |||||||
| 	-DPOWER_LIMIT_DC=45 | 	-DPOWER_LIMIT_DC=45 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_HEATUP=5 | CFLAGS += -DBOARD_FAN1_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_COOLDOWN=20 | CFLAGS += -DBOARD_FAN1_COOLDOWN=20 | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_HEATUP=5 |  | ||||||
| CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 | CFLAGS += -DBOARD_FAN2_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN2_COOLDOWN=20 | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -42,27 +42,28 @@ CFLAGS+=\ | |||||||
| 	-DPOWER_LIMIT_DC=45 | 	-DPOWER_LIMIT_DC=45 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_HEATUP=5 | CFLAGS += -DBOARD_FAN1_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_COOLDOWN=20 | CFLAGS += -DBOARD_FAN1_COOLDOWN=20 | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_HEATUP=5 |  | ||||||
| CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 | CFLAGS += -DBOARD_FAN2_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN2_COOLDOWN=20 | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -44,13 +44,10 @@ CFLAGS+=\ | |||||||
| 	-DPOWER_LIMIT_AC=180 \ | 	-DPOWER_LIMIT_AC=180 \ | ||||||
| 	-DPOWER_LIMIT_DC=45 | 	-DPOWER_LIMIT_DC=45 | ||||||
|  |  | ||||||
| # Disable syncing fan speeds |  | ||||||
| #CFLAGS+=-DSYNC_FANS=0 |  | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_HEATUP=5 | CFLAGS += -DBOARD_FAN1_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_COOLDOWN=20 | CFLAGS += -DBOARD_FAN1_COOLDOWN=20 | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(50, 40), \ | 	FAN_POINT(50, 40), \ | ||||||
| 	FAN_POINT(55, 40), \ | 	FAN_POINT(55, 40), \ | ||||||
| 	FAN_POINT(60, 55), \ | 	FAN_POINT(60, 55), \ | ||||||
| @@ -64,9 +61,10 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ | |||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_HEATUP=5 |  | ||||||
| CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 | CFLAGS += -DBOARD_FAN2_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN2_COOLDOWN=20 | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(50, 40), \ | 	FAN_POINT(50, 40), \ | ||||||
| 	FAN_POINT(56, 40), \ | 	FAN_POINT(56, 40), \ | ||||||
| 	FAN_POINT(72, 100), \ | 	FAN_POINT(72, 100), \ | ||||||
|   | |||||||
| @@ -52,31 +52,32 @@ CFLAGS+=\ | |||||||
| CFLAGS+=-DSMOOTH_FANS_MIN=28 | CFLAGS+=-DSMOOTH_FANS_MIN=28 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_HEATUP=5 | CFLAGS += -DBOARD_FAN1_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_COOLDOWN=20 | CFLAGS += -DBOARD_FAN1_COOLDOWN=20 | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(60, 28), \ | 	FAN_POINT(60, 28), \ | ||||||
| 	FAN_POINT(65, 28), \ | 	FAN_POINT(65, 28), \ | ||||||
| 	FAN_POINT(70, 40), \ | 	FAN_POINT(70, 40), \ | ||||||
| 	FAN_POINT(75, 60), \ | 	FAN_POINT(75, 60), \ | ||||||
| 	FAN_POINT(80, 75), \ | 	FAN_POINT(80, 75), \ | ||||||
| 	FAN_POINT(85, 90), \ | 	FAN_POINT(85, 90), \ | ||||||
| 	FAN_POINT(90, 100) \ | 	FAN_POINT(90, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_HEATUP=5 |  | ||||||
| CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 | CFLAGS += -DBOARD_FAN2_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN2_COOLDOWN=20 | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(60, 28), \ | 	FAN_POINT(60, 28), \ | ||||||
| 	FAN_POINT(65, 28), \ | 	FAN_POINT(65, 28), \ | ||||||
| 	FAN_POINT(70, 40), \ | 	FAN_POINT(70, 40), \ | ||||||
| 	FAN_POINT(75, 60), \ | 	FAN_POINT(75, 60), \ | ||||||
| 	FAN_POINT(80, 75), \ | 	FAN_POINT(80, 75), \ | ||||||
| 	FAN_POINT(85, 90), \ | 	FAN_POINT(85, 90), \ | ||||||
| 	FAN_POINT(90, 100) \ | 	FAN_POINT(90, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -45,9 +45,9 @@ CFLAGS += \ | |||||||
| 	-DPOWER_LIMIT_DC=55 | 	-DPOWER_LIMIT_DC=55 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS += -DBOARD_HEATUP=5 | CFLAGS += -DBOARD_FAN1_HEATUP=5 | ||||||
| CFLAGS += -DBOARD_COOLDOWN=20 | CFLAGS += -DBOARD_FAN1_COOLDOWN=20 | ||||||
| CFLAGS += -DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(50, 30), \ | 	FAN_POINT(50, 30), \ | ||||||
| 	FAN_POINT(60, 30), \ | 	FAN_POINT(60, 30), \ | ||||||
| 	FAN_POINT(65, 40), \ | 	FAN_POINT(65, 40), \ | ||||||
| @@ -60,9 +60,10 @@ CFLAGS += -DBOARD_FAN_POINTS="\ | |||||||
| # Enable DGPU support | # Enable DGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS += -DBOARD_DGPU_HEATUP=5 |  | ||||||
| CFLAGS += -DBOARD_DGPU_COOLDOWN=20 | CFLAGS += -DBOARD_FAN2_HEATUP=5 | ||||||
| CFLAGS += -DBOARD_DGPU_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN2_COOLDOWN=20 | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(50, 30), \ | 	FAN_POINT(50, 30), \ | ||||||
| 	FAN_POINT(60, 30), \ | 	FAN_POINT(60, 30), \ | ||||||
| 	FAN_POINT(65, 40), \ | 	FAN_POINT(65, 40), \ | ||||||
|   | |||||||
| @@ -35,23 +35,24 @@ CFLAGS+=\ | |||||||
| 	-DPOWER_LIMIT_DC=45 | 	-DPOWER_LIMIT_DC=45 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ |  | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| 	FAN_POINT(65, 60), \ | 	FAN_POINT(65, 60), \ | ||||||
| 	FAN_POINT(70, 75), \ | 	FAN_POINT(70, 75), \ | ||||||
| 	FAN_POINT(75, 90), \ | 	FAN_POINT(75, 90), \ | ||||||
| 	FAN_POINT(80, 100) \ | 	FAN_POINT(80, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -37,27 +37,28 @@ CFLAGS+=\ | |||||||
| CFLAGS+=-DSMOOTH_FANS_MIN=25 | CFLAGS+=-DSMOOTH_FANS_MIN=25 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(55, 25), \ | 	FAN_POINT(55, 25), \ | ||||||
| 	FAN_POINT(65, 30), \ | 	FAN_POINT(65, 30), \ | ||||||
| 	FAN_POINT(70, 40), \ | 	FAN_POINT(70, 40), \ | ||||||
| 	FAN_POINT(75, 60), \ | 	FAN_POINT(75, 60), \ | ||||||
| 	FAN_POINT(80, 75), \ | 	FAN_POINT(80, 75), \ | ||||||
| 	FAN_POINT(85, 90), \ | 	FAN_POINT(85, 90), \ | ||||||
| 	FAN_POINT(90, 100) \ | 	FAN_POINT(90, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ |  | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(55, 25), \ | 	FAN_POINT(55, 25), \ | ||||||
| 	FAN_POINT(65, 30), \ | 	FAN_POINT(65, 30), \ | ||||||
| 	FAN_POINT(70, 40), \ | 	FAN_POINT(70, 40), \ | ||||||
| 	FAN_POINT(75, 60), \ | 	FAN_POINT(75, 60), \ | ||||||
| 	FAN_POINT(80, 75), \ | 	FAN_POINT(80, 75), \ | ||||||
| 	FAN_POINT(85, 90), \ | 	FAN_POINT(85, 90), \ | ||||||
| 	FAN_POINT(90, 100) \ | 	FAN_POINT(90, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -37,27 +37,28 @@ CFLAGS+=\ | |||||||
| CFLAGS+=-DSMOOTH_FANS_MIN=25 | CFLAGS+=-DSMOOTH_FANS_MIN=25 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(55, 25), \ | 	FAN_POINT(55, 25), \ | ||||||
| 	FAN_POINT(65, 30), \ | 	FAN_POINT(65, 30), \ | ||||||
| 	FAN_POINT(70, 40), \ | 	FAN_POINT(70, 40), \ | ||||||
| 	FAN_POINT(75, 60), \ | 	FAN_POINT(75, 60), \ | ||||||
| 	FAN_POINT(80, 75), \ | 	FAN_POINT(80, 75), \ | ||||||
| 	FAN_POINT(85, 90), \ | 	FAN_POINT(85, 90), \ | ||||||
| 	FAN_POINT(90, 100) \ | 	FAN_POINT(90, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ |  | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(55, 25), \ | 	FAN_POINT(55, 25), \ | ||||||
| 	FAN_POINT(65, 30), \ | 	FAN_POINT(65, 30), \ | ||||||
| 	FAN_POINT(70, 40), \ | 	FAN_POINT(70, 40), \ | ||||||
| 	FAN_POINT(75, 60), \ | 	FAN_POINT(75, 60), \ | ||||||
| 	FAN_POINT(80, 75), \ | 	FAN_POINT(80, 75), \ | ||||||
| 	FAN_POINT(85, 90), \ | 	FAN_POINT(85, 90), \ | ||||||
| 	FAN_POINT(90, 100) \ | 	FAN_POINT(90, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -40,27 +40,28 @@ CFLAGS+=\ | |||||||
| CFLAGS+=-DSMOOTH_FANS_MIN=25 | CFLAGS+=-DSMOOTH_FANS_MIN=25 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(55, 25), \ | 	FAN_POINT(55, 25), \ | ||||||
| 	FAN_POINT(65, 30), \ | 	FAN_POINT(65, 30), \ | ||||||
| 	FAN_POINT(70, 40), \ | 	FAN_POINT(70, 40), \ | ||||||
| 	FAN_POINT(75, 60), \ | 	FAN_POINT(75, 60), \ | ||||||
| 	FAN_POINT(80, 75), \ | 	FAN_POINT(80, 75), \ | ||||||
| 	FAN_POINT(85, 90), \ | 	FAN_POINT(85, 90), \ | ||||||
| 	FAN_POINT(90, 100) \ | 	FAN_POINT(90, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ |  | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(55, 25), \ | 	FAN_POINT(55, 25), \ | ||||||
| 	FAN_POINT(65, 30), \ | 	FAN_POINT(65, 30), \ | ||||||
| 	FAN_POINT(70, 40), \ | 	FAN_POINT(70, 40), \ | ||||||
| 	FAN_POINT(75, 60), \ | 	FAN_POINT(75, 60), \ | ||||||
| 	FAN_POINT(80, 75), \ | 	FAN_POINT(80, 75), \ | ||||||
| 	FAN_POINT(85, 90), \ | 	FAN_POINT(85, 90), \ | ||||||
| 	FAN_POINT(90, 100) \ | 	FAN_POINT(90, 100), \ | ||||||
| " | " | ||||||
|  |  | ||||||
| # Add system76 common code | # Add system76 common code | ||||||
|   | |||||||
| @@ -41,13 +41,10 @@ CFLAGS+=\ | |||||||
| 	-DPOWER_LIMIT_AC=180 \ | 	-DPOWER_LIMIT_AC=180 \ | ||||||
| 	-DPOWER_LIMIT_DC=45 | 	-DPOWER_LIMIT_DC=45 | ||||||
|  |  | ||||||
| # Disable syncing fan speeds |  | ||||||
| #CFLAGS+=-DSYNC_FANS=0 |  | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_HEATUP=5 | CFLAGS += -DBOARD_FAN1_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_COOLDOWN=20 | CFLAGS += -DBOARD_FAN1_COOLDOWN=20 | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(50, 40), \ | 	FAN_POINT(50, 40), \ | ||||||
| 	FAN_POINT(55, 40), \ | 	FAN_POINT(55, 40), \ | ||||||
| 	FAN_POINT(60, 55), \ | 	FAN_POINT(60, 55), \ | ||||||
| @@ -61,9 +58,10 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ | |||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_HEATUP=5 |  | ||||||
| CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 | CFLAGS += -DBOARD_FAN2_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN2_COOLDOWN=20 | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(50, 40), \ | 	FAN_POINT(50, 40), \ | ||||||
| 	FAN_POINT(56, 40), \ | 	FAN_POINT(56, 40), \ | ||||||
| 	FAN_POINT(72, 100), \ | 	FAN_POINT(72, 100), \ | ||||||
|   | |||||||
| @@ -49,9 +49,9 @@ CFLAGS+=\ | |||||||
| CFLAGS+=-DSMOOTH_FANS_MIN=28 | CFLAGS+=-DSMOOTH_FANS_MIN=28 | ||||||
|  |  | ||||||
| # Custom fan curve | # Custom fan curve | ||||||
| CFLAGS+=-DBOARD_HEATUP=5 | CFLAGS += -DBOARD_FAN1_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_COOLDOWN=20 | CFLAGS += -DBOARD_FAN1_COOLDOWN=20 | ||||||
| CFLAGS+=-DBOARD_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN1_POINTS="\ | ||||||
| 	FAN_POINT(50, 28), \ | 	FAN_POINT(50, 28), \ | ||||||
| 	FAN_POINT(55, 28), \ | 	FAN_POINT(55, 28), \ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
| @@ -63,9 +63,10 @@ CFLAGS+=-DBOARD_FAN_POINTS="\ | |||||||
| # Enable dGPU support | # Enable dGPU support | ||||||
| CONFIG_HAVE_DGPU = y | CONFIG_HAVE_DGPU = y | ||||||
| CFLAGS += -DI2C_DGPU=I2C_1 | CFLAGS += -DI2C_DGPU=I2C_1 | ||||||
| CFLAGS+=-DBOARD_DGPU_HEATUP=5 |  | ||||||
| CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 | CFLAGS += -DBOARD_FAN2_HEATUP=5 | ||||||
| CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ | CFLAGS += -DBOARD_FAN2_COOLDOWN=20 | ||||||
|  | CFLAGS += -DBOARD_FAN2_POINTS="\ | ||||||
| 	FAN_POINT(50, 28), \ | 	FAN_POINT(50, 28), \ | ||||||
| 	FAN_POINT(55, 28), \ | 	FAN_POINT(55, 28), \ | ||||||
| 	FAN_POINT(60, 40), \ | 	FAN_POINT(60, 40), \ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user