josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1301 from XPila/V3_5 

PFW644 + PFW638
This commit is contained in:
PavelSindler 2018-11-04 23:10:10 +01:00 committed by GitHub
parent 35fae8be1c 33a29cd416
commit 515f2723d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/adc.c
View File

@ -71,7 +71,7 @@ void adc_cycle(void)
uint8_t index = adc_state & 0x0f; uint8_t index = adc_state & 0x0f;
if ((adc_sim_mask & (1 << index)) == 0) if ((adc_sim_mask & (1 << index)) == 0)
adc_values[index] += ADC; adc_values[index] += ADC;
if (index++ >= ADC_CHAN_CNT) if (++index >= ADC_CHAN_CNT)
{ {
index = 0; index = 0;
adc_count++; adc_count++;

5
Firmware/ultralcd.cpp
View File

@ -614,7 +614,10 @@ void lcdui_print_time(void)
if (feedmultiply != 100) if (feedmultiply != 100)
suff_doubt = '?'; suff_doubt = '?';
} }
chars = lcd_printf_P(_N("%c%02u:%02u%c%c"), LCD_STR_CLOCK[0], print_t / 60, print_t % 60, suff, suff_doubt); if (print_t < 6000) //time<100h
chars = lcd_printf_P(_N("%c%02u:%02u%c%c"), LCD_STR_CLOCK[0], print_t / 60, print_t % 60, suff, suff_doubt);
else //time>=100h
chars = lcd_printf_P(_N("%c%3uh %c%c"), LCD_STR_CLOCK[0], print_t / 60, suff, suff_doubt);
} }
else else
chars = lcd_printf_P(_N("%c--:-- "), LCD_STR_CLOCK[0]); chars = lcd_printf_P(_N("%c--:-- "), LCD_STR_CLOCK[0]);