Skip to content

bump version to 1.83 for next release #88

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

Merged
damachine merged 2 commits into from
Oct 11, 2025
Merged

bump version to 1.83 for next release #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3078575
bump version to 1.83 for next release
damachine Oct 11, 2025
0e29271
fix
damachine Oct 11, 2025
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
2 changes: 1 addition & 1 deletion .SRCINFO
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgbase = coolerdash
pkgdesc = Extends CoolerControl with a polished LCD dashboard
pkgver = 1.82
pkgver = 1.83
pkgrel = 1
url = https://github.com/damachine/coolerdash
install = coolerdash.install
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.82
1.83
185 changes: 111 additions & 74 deletions src/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,8 @@
* @brief String configuration entry for lookup table.
* @details Structure for string configuration keys.
*/
typedef struct {
typedef struct
{
const char *key;
size_t offset;
size_t size;
Expand All @@ -186,14 +187,17 @@
* @brief Generic helper for string-based configuration sections.
* @details Processes string configuration keys using lookup table approach.
*/
static int handle_string_config(Config *config, const char *name, const char *value,
const StringConfigEntry *entries, size_t entry_count)
static int handle_string_config(Config *config, const char *name, const char *value,
const StringConfigEntry *entries, size_t entry_count)
{
if (!value || value[0] == '\0') return 1;

for (size_t i = 0; i < entry_count; i++) {
if (strcmp(name, entries[i].key) == 0) {
char *dest = (char*)config + entries[i].offset;
if (!value || value[0] == '\0')

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.1 rule Note

MISRA 12.1 rule

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 15.6 rule Note

MISRA 15.6 rule
return 1;

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 15.5 rule Note

MISRA 15.5 rule

for (size_t i = 0; i < entry_count; i++)
{
if (strcmp(name, entries[i].key) == 0)
{
char *dest = (char *)config + entries[i].offset;
cc_safe_strcpy(dest, entries[i].size, value);
return 1;
}
Expand All @@ -209,9 +213,8 @@
{
static const StringConfigEntry entries[] = {
{"address", offsetof(Config, daemon_address), sizeof(config->daemon_address)},
{"password", offsetof(Config, daemon_password), sizeof(config->daemon_password)}
};

{"password", offsetof(Config, daemon_password), sizeof(config->daemon_password)}};

return handle_string_config(config, name, value, entries, sizeof(entries) / sizeof(entries[0]));
}

Expand All @@ -225,8 +228,7 @@
{"images", offsetof(Config, paths_images), sizeof(config->paths_images)},
{"image_coolerdash", offsetof(Config, paths_image_coolerdash), sizeof(config->paths_image_coolerdash)},
{"image_shutdown", offsetof(Config, paths_image_shutdown), sizeof(config->paths_image_shutdown)},
{"pid", offsetof(Config, paths_pid), sizeof(config->paths_pid)}
};
{"pid", offsetof(Config, paths_pid), sizeof(config->paths_pid)}};

return handle_string_config(config, name, value, entries, sizeof(entries) / sizeof(entries[0]));
}
Expand All @@ -250,38 +252,45 @@
* @brief Display configuration handlers.
* @details Individual handlers for each display configuration key.
*/
static void handle_display_width(Config *config, const char *value) {
static void handle_display_width(Config *config, const char *value)
{
int width = safe_atoi(value, 0);
config->display_width = (width > 0) ? (uint16_t)width : 0;
}

static void handle_display_height(Config *config, const char *value) {
static void handle_display_height(Config *config, const char *value)
{
int height = safe_atoi(value, 0);
config->display_height = (height > 0) ? (uint16_t)height : 0;
}

static void handle_refresh_interval_sec(Config *config, const char *value) {
static void handle_refresh_interval_sec(Config *config, const char *value)
{
config->display_refresh_interval_sec = safe_atoi(value, 0);
}

static void handle_refresh_interval_nsec(Config *config, const char *value) {
static void handle_refresh_interval_nsec(Config *config, const char *value)
{
config->display_refresh_interval_nsec = safe_atoi(value, 0);
}

static void handle_brightness(Config *config, const char *value) {
static void handle_brightness(Config *config, const char *value)
{
int brightness = safe_atoi(value, 0);
config->lcd_brightness = (brightness >= 0 && brightness <= 100) ? (uint8_t)brightness : 0;
}

static void handle_orientation(Config *config, const char *value) {
static void handle_orientation(Config *config, const char *value)
{
int orientation = safe_atoi(value, 0);
config->lcd_orientation = is_valid_orientation(orientation) ? orientation : 0;
}

/**
* @brief Display configuration entry for lookup table.
*/
typedef struct {
typedef struct
{
const char *key;
DisplayConfigHandler handler;
} DisplayConfigEntry;
Expand All @@ -298,11 +307,12 @@
{"refresh_interval_sec", handle_refresh_interval_sec},
{"refresh_interval_nsec", handle_refresh_interval_nsec},
{"brightness", handle_brightness},
{"orientation", handle_orientation}
};
{"orientation", handle_orientation}};

for (size_t i = 0; i < sizeof(entries) / sizeof(entries[0]); i++) {
if (strcmp(name, entries[i].key) == 0) {
for (size_t i = 0; i < sizeof(entries) / sizeof(entries[0]); i++)
{
if (strcmp(name, entries[i].key) == 0)
{
entries[i].handler(config, value);
return 1;
}
Expand All @@ -313,10 +323,16 @@
/**
* @brief Mixed-type configuration entry for lookup table.
*/
typedef struct {
typedef struct
{
const char *key;
size_t offset;
enum { TYPE_UINT16, TYPE_FLOAT, TYPE_STRING } type;
enum
{
TYPE_UINT16,
TYPE_FLOAT,
TYPE_STRING
} type;
size_t string_size;
} MixedConfigEntry;

Expand All @@ -325,30 +341,37 @@
* @details Processes mixed-type configuration keys using lookup table approach.
*/
static int handle_mixed_config(Config *config, const char *name, const char *value,
const MixedConfigEntry *entries, size_t entry_count)
{
for (size_t i = 0; i < entry_count; i++) {
if (strcmp(name, entries[i].key) == 0) {
void *field_ptr = (void*)((char*)config + entries[i].offset);

switch (entries[i].type) {
case TYPE_UINT16: {
uint16_t *dest = (uint16_t*)field_ptr;
*dest = (uint16_t)safe_atoi(value, 0);
break;
}
case TYPE_FLOAT: {
float *dest = (float*)field_ptr;
*dest = safe_atof(value, 12.0f);
break;
}
case TYPE_STRING: {
if (value && value[0] != '\0') {
char *dest = (char*)field_ptr;
cc_safe_strcpy(dest, entries[i].string_size, value);
}
break;
const MixedConfigEntry *entries, size_t entry_count)
{
for (size_t i = 0; i < entry_count; i++)
{
if (strcmp(name, entries[i].key) == 0)
{
void *field_ptr = (void *)((char *)config + entries[i].offset);

switch (entries[i].type)

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 16.4 rule Note

MISRA 16.4 rule
{
case TYPE_UINT16:
{
uint16_t *dest = (uint16_t *)field_ptr;
*dest = (uint16_t)safe_atoi(value, 0);
break;
}
case TYPE_FLOAT:
{
float *dest = (float *)field_ptr;
*dest = safe_atof(value, 12.0f);
break;
}
case TYPE_STRING:
{
if (value && value[0] != '\0')

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.1 rule Note

MISRA 12.1 rule
{
char *dest = (char *)field_ptr;
cc_safe_strcpy(dest, entries[i].string_size, value);
}
break;
}
}
return 1;
}
Expand All @@ -369,8 +392,7 @@
{"bar_width", offsetof(Config, layout_bar_width), TYPE_UINT16, 0},
{"bar_height", offsetof(Config, layout_bar_height), TYPE_UINT16, 0},
{"bar_gap", offsetof(Config, layout_bar_gap), TYPE_UINT16, 0},
{"bar_border_width", offsetof(Config, layout_bar_border_width), TYPE_FLOAT, 0}
};
{"bar_border_width", offsetof(Config, layout_bar_border_width), TYPE_FLOAT, 0}};

return handle_mixed_config(config, name, value, entries, sizeof(entries) / sizeof(entries[0]));
}
Expand All @@ -384,8 +406,7 @@
static const MixedConfigEntry entries[] = {
{"font_face", offsetof(Config, font_face), TYPE_STRING, CONFIG_MAX_FONT_NAME_LEN},
{"font_size_temp", offsetof(Config, font_size_temp), TYPE_FLOAT, 0},
{"font_size_labels", offsetof(Config, font_size_labels), TYPE_FLOAT, 0}
};
{"font_size_labels", offsetof(Config, font_size_labels), TYPE_FLOAT, 0}};

return handle_mixed_config(config, name, value, entries, sizeof(entries) / sizeof(entries[0]));
}
Expand All @@ -394,7 +415,8 @@
* @brief Temperature configuration entry for lookup table.
* @details Structure for temperature threshold configuration keys.
*/
typedef struct {
typedef struct
{
const char *key;
size_t offset;
} TemperatureConfigEntry;
Expand All @@ -408,13 +430,14 @@
static const TemperatureConfigEntry entries[] = {
{"temp_threshold_1", offsetof(Config, temp_threshold_1)},
{"temp_threshold_2", offsetof(Config, temp_threshold_2)},
{"temp_threshold_3", offsetof(Config, temp_threshold_3)}
};
{"temp_threshold_3", offsetof(Config, temp_threshold_3)}};

for (size_t i = 0; i < sizeof(entries) / sizeof(entries[0]); i++) {
if (strcmp(name, entries[i].key) == 0) {
void *field_ptr = (void*)((char*)config + entries[i].offset);
float *dest = (float*)field_ptr;
for (size_t i = 0; i < sizeof(entries) / sizeof(entries[0]); i++)
{
if (strcmp(name, entries[i].key) == 0)
{
void *field_ptr = (void *)((char *)config + entries[i].offset);
float *dest = (float *)field_ptr;
*dest = safe_atof(value, 50.0f + i * 15.0f); // 50, 65, 80
return 1;
}
Expand All @@ -426,7 +449,8 @@
* @brief Color section mapping entry for lookup table.
* @details Structure for color section mapping.
*/
typedef struct {
typedef struct
{
const char *section_name;
size_t color_offset;
} ColorSectionEntry;
Expand All @@ -445,12 +469,13 @@
{"temp_threshold_1_bar", offsetof(Config, temp_threshold_1_bar)},
{"temp_threshold_2_bar", offsetof(Config, temp_threshold_2_bar)},
{"temp_threshold_3_bar", offsetof(Config, temp_threshold_3_bar)},
{"temp_threshold_4_bar", offsetof(Config, temp_threshold_4_bar)}
};
{"temp_threshold_4_bar", offsetof(Config, temp_threshold_4_bar)}};

for (size_t i = 0; i < sizeof(entries) / sizeof(entries[0]); i++) {
if (strcmp(section, entries[i].section_name) == 0) {
return (Color*)((char*)config + entries[i].color_offset);
for (size_t i = 0; i < sizeof(entries) / sizeof(entries[0]); i++)
{
if (strcmp(section, entries[i].section_name) == 0)
{
return (Color *)((char *)config + entries[i].color_offset);
}
}
return NULL;
Expand All @@ -462,12 +487,23 @@
*/
static void set_color_component(Color *color, const char *name, const char *value)
{
if (!color || !name || !value) return;
if (!color || !name || !value)

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 15.6 rule Note

MISRA 15.6 rule
return;

switch (name[0]) {
case 'r': if (strcmp(name, "r") == 0) parse_color_component(value, &color->r); break;
case 'g': if (strcmp(name, "g") == 0) parse_color_component(value, &color->g); break;
case 'b': if (strcmp(name, "b") == 0) parse_color_component(value, &color->b); break;
switch (name[0])

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 16.4 rule Note

MISRA 16.4 rule
{
case 'r':
if (strcmp(name, "r") == 0)

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 15.6 rule Note

MISRA 15.6 rule
parse_color_component(value, &color->r);
break;
case 'g':
if (strcmp(name, "g") == 0)

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 15.6 rule Note

MISRA 15.6 rule
parse_color_component(value, &color->g);
break;
case 'b':
if (strcmp(name, "b") == 0)

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 15.6 rule Note

MISRA 15.6 rule
parse_color_component(value, &color->b);
break;
}
}

Expand All @@ -478,7 +514,8 @@
static int get_color_config(Config *config, const char *section, const char *name, const char *value)
{
Color *color = get_color_pointer_from_section(config, section);
if (color) {
if (color)

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 14.4 rule Note

MISRA 14.4 rule
{
set_color_component(color, name, value);
}
return 1;
Expand Down Expand Up @@ -550,8 +587,8 @@
config->display_refresh_interval_nsec = 500000000;
if (config->lcd_brightness == 0)
config->lcd_brightness = 80;
if (config->lcd_orientation == 0)
config->lcd_orientation = 0;
if (!is_valid_orientation(config->lcd_orientation))

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 15.6 rule Note

MISRA 15.6 rule
config->lcd_orientation = 0; // Fallback to 0 if invalid
}

/**
Expand Down
13 changes: 12 additions & 1 deletion src/display.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,17 @@
#include "coolercontrol.h"
#include "monitor.h"

// Define mathematical constants if not defined
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#ifndef DISPLAY_M_PI
#define DISPLAY_M_PI M_PI
#endif
#ifndef DISPLAY_M_PI_2
#define DISPLAY_M_PI_2 (M_PI / 2.0)
#endif

/**
* @brief Convert color component to cairo format.
* @details Converts 8-bit color component (0-255) to cairo's double format (0.0-1.0) for rendering operations.
Expand Down Expand Up @@ -159,7 +170,7 @@ static void draw_temperature_displays(cairo_t *cr, const monitor_sensor_data_t *
return;

// temp_cpu display (CPU temperature) with validation
draw_temp(cr, config, data->temp_cpu, - DISPLAY_TEMP_DISPLAY_Y_OFFSET);
draw_temp(cr, config, data->temp_cpu, -DISPLAY_TEMP_DISPLAY_Y_OFFSET);

// temp_gpu display (GPU temperature) with validation
draw_temp(cr, config, data->temp_gpu, config->layout_box_height + DISPLAY_TEMP_DISPLAY_Y_OFFSET);
Expand Down
Loading