Narcissus/nwipe
2
0
Fork 0
mirror of https://github.com/martijnvanbrummelen/nwipe.git synced 2026-02-20 13:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #503 from PartialVolume/Fix_temperature_colour_part2

Browse Source 
Fix_temperature_colour_part2
This commit is contained in:
PartialVolume
2023-10-17 19:43:39 +01:00
committed by GitHub
parent d9785d2b84 1ee1bb1966
commit 193cc8f0b2
1 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/gui.c
View File

@@ -7014,39 +7014,65 @@ void wprintw_temperature( nwipe_context_t* c )
}
}
/* if drive temperature has exceeded the max temperature if available
/* if drive temperature has exceeded the critical temperature if available
*/
if( ( local_temp1_input >= temp_high_limit ) && ( local_temp1_input != NO_TEMPERATURE_DATA )
&& ( temp_high_limit != NO_TEMPERATURE_DATA ) )
if( ( local_temp1_input >= temp_highest_limit ) && ( local_temp1_input != NO_TEMPERATURE_DATA )
&& ( temp_highest_limit != NO_TEMPERATURE_DATA ) )
{
/* red on blue */
wattron( main_window, COLOR_PAIR( 3 ) );
/* white on red */
wattron( main_window, COLOR_PAIR( 6 ) );
wprintw( main_window, "[%dC]", local_temp1_input );
wattroff( main_window, COLOR_PAIR( 3 ) );
wattroff( main_window, COLOR_PAIR( 6 ) );
}
else
{
/* if drive temperature is below the low temperature limit if available
/* if drive temperature has exceeded the max temperature if available
*/
if( ( local_temp1_input <= temp_lowest_limit ) && ( temp_lowest_limit != NO_TEMPERATURE_DATA )
&& ( local_temp1_input != NO_TEMPERATURE_DATA ) )
if( ( local_temp1_input >= temp_high_limit ) && ( local_temp1_input <= temp_highest_limit )
&& ( local_temp1_input != NO_TEMPERATURE_DATA ) && ( temp_high_limit != NO_TEMPERATURE_DATA ) )
{
/* white on black */
wattron( main_window, COLOR_PAIR( 14 ) );
/* red on blue */
wattron( main_window, COLOR_PAIR( 3 ) );
wprintw( main_window, "[%dC]", local_temp1_input );
wattroff( main_window, COLOR_PAIR( 14 ) );
wattroff( main_window, COLOR_PAIR( 3 ) );
}
else
{
if( local_temp1_input != NO_TEMPERATURE_DATA )
/* if drive temperature is below the lowest critical temperature and the critical value is present
*/
if( ( local_temp1_input <= temp_lowest_limit ) && ( temp_lowest_limit != NO_TEMPERATURE_DATA )
&& ( local_temp1_input != NO_TEMPERATURE_DATA ) )
{
/* Default white on blue */
/* white on black */
wattron( main_window, COLOR_PAIR( 14 ) );
wprintw( main_window, "[%dC]", local_temp1_input );
wattroff( main_window, COLOR_PAIR( 14 ) );
}
else
{
/* Default white on blue */
wprintw( main_window, "[--C]" );
/* if drive temperature is below the minimum but above the lowest temperature and the value is present
*/
if( ( ( local_temp1_input <= temp_low_limit ) && ( local_temp1_input >= temp_lowest_limit )
&& ( local_temp1_input != NO_TEMPERATURE_DATA ) && ( temp_low_limit != NO_TEMPERATURE_DATA ) ) )
{
/* black on blue */
wattron( main_window, COLOR_PAIR( 11 ) );
wprintw( main_window, "[%dC]", local_temp1_input );
wattroff( main_window, COLOR_PAIR( 11 ) );
}
else
{
if( local_temp1_input != NO_TEMPERATURE_DATA )
{
/* Default white on blue */
wprintw( main_window, "[%dC]", local_temp1_input );
}
else
{
/* Default white on blue */
wprintw( main_window, "[--C]" );
}
}
}
}
}