3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-08-07 14:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

🎨 Misc. cleanup, tweak unused LED_GraduallyControl (#27422)
Some checks are pending
CI - Build Tests / Build Test (push) Waiting to run
Details
CI - Unit Tests / Unit Test (push) Waiting to run
Details
CI - Validate Pins Files / Validate Pins Files (push) Waiting to run
Details

Browse source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
Andrew 2025-05-27 02:05:01 -04:00 • committed by GitHub
parent 3572fd75b5
commit 3494482cb0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Marlin/src/lcd/e3v2/common/encoder.cpp
View file

@ -137,9 +137,8 @@ EncoderState encoderReceiveAnalyze() {
// LED write data
void LED_WriteData() {
uint8_t tempCounter_LED, tempCounter_Bit;
for (tempCounter_LED = 0; tempCounter_LED < LED_NUM; tempCounter_LED++) {
for (tempCounter_Bit = 0; tempCounter_Bit < 24; tempCounter_Bit++) {
for (uint8_t tempCounter_LED = 0; tempCounter_LED < LED_NUM; tempCounter_LED++) {
for (uint8_t tempCounter_Bit = 0; tempCounter_Bit < 24; tempCounter_Bit++) {
if (LED_DataArray[tempCounter_LED] & (0x800000 >> tempCounter_Bit)) {
LED_DATA_HIGH;
DELAY_NS(300);
@ -190,20 +189,22 @@ EncoderState encoderReceiveAnalyze() {
}
}
struct { bool g, r, b; } led_flag = { false, false, false };
struct { bool g, r, b; } led_flag;
for (uint8_t i = 0; i < LED_NUM; i++) {
led_flag = { false, false, false };
while (1) {
const uint8_t g = uint8_t(LED_DataArray[i] >> 16),
r = uint8_t(LED_DataArray[i] >> 8),
b = uint8_t(LED_DataArray[i]);
if (g == led_data[i].g) led_flag.g = true;
else LED_DataArray[i] += (g > led_data[i].g) ? -0x010000 : 0x010000;
else LED_DataArray[i] += (g > led_data[i].g) ? -_BV32(16) : _BV32(16);
if (r == led_data[i].r) led_flag.r = true;
else LED_DataArray[i] += (r > led_data[i].r) ? -0x000100 : 0x000100;
else LED_DataArray[i] += (r > led_data[i].r) ? -_BV32(8) : _BV32(8);
if (b == led_data[i].b) led_flag.b = true;
else LED_DataArray[i] += (b > led_data[i].b) ? -0x000001 : 0x000001;
else LED_DataArray[i] += (b > led_data[i].b) ? -_BV32(0) : _BV32(0);
LED_WriteData();
if (led_flag.r && led_flag.g && led_flag.b) break;
if (led_flag.g && led_flag.r && led_flag.b) break;
delay(change_Interval);
}
}

2
Marlin/src/module/settings.cpp
View file

@ -655,7 +655,7 @@ typedef struct SettingsDataStruct {
// Fixed-Time Motion
//
#if ENABLED(FT_MOTION)
ft_config_t ftMotion_cfg; // M493
ft_config_t ftMotion_cfg; // M493
#endif
//

4
Marlin/src/module/stepper.cpp
View file

@ -1557,7 +1557,7 @@ void Stepper::isr() {
if (using_ftMotion) {
ftMotion_stepper(); // Run FTM Stepping
// Define 2.5 msec task for auxiliary functions.
if (!ftMotion_nextAuxISR) {
TERN_(BABYSTEPPING, if (babystep.has_steps()) babystepping_isr());
@ -1566,7 +1566,7 @@ void Stepper::isr() {
// Enable ISRs to reduce latency for higher priority ISRs
hal.isr_on();
interval = FTM_MIN_TICKS;
ftMotion_nextAuxISR -= interval;
}