comparison Discovery/Src/settings.c @ 994:bad5561c0c59 GasConsumption

Fix a compilation error occurring on non-Windows platforms, caused by incorrect case in '#include' file names. Also fix some compiler warnings from non-safe use of 'memcpy'. (mikeller)
author heinrichsweikamp
date Sun, 27 Apr 2025 09:56:22 +0200
parents df052f0347fb
children 2f7531a8e922
comparison
equal deleted inserted replaced
993:df052f0347fb 994:bad5561c0c59
461 pSettings->gasConsumption_travel_l_min = pStandard->gasConsumption_travel_l_min; 461 pSettings->gasConsumption_travel_l_min = pStandard->gasConsumption_travel_l_min;
462 pSettings->gasConsumption_bottom_l_min = pStandard->gasConsumption_bottom_l_min; 462 pSettings->gasConsumption_bottom_l_min = pStandard->gasConsumption_bottom_l_min;
463 pSettings->gasConsumption_deco_l_min = pStandard->gasConsumption_deco_l_min; 463 pSettings->gasConsumption_deco_l_min = pStandard->gasConsumption_deco_l_min;
464 // no break 464 // no break
465 case 0xFFFF000C: 465 case 0xFFFF000C:
466 memcpy(pSettings->customtext, " hwOS 4\n\r" " welcome\n\r", 60); 466 strncpy(pSettings->customtext, " hwOS 4\n\r" " welcome\n\r", sizeof(pSettings->customtext));
467 // no break 467 // no break
468 case 0xFFFF000D: // nothing to do from 0xFFFF000D to 0xFFFF000E, just about header :-) 468 case 0xFFFF000D: // nothing to do from 0xFFFF000D to 0xFFFF000E, just about header :-)
469 case 0xFFFF000E: 469 case 0xFFFF000E:
470 pSettings->debugModeOnStart = 0; 470 pSettings->debugModeOnStart = 0;
471 // no break 471 // no break