From 1e05e1189d969ce08152b4f72c5beed508f91101 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Sat, 3 Nov 2018 22:44:42 +0100 Subject: [PATCH 1/2] Fix PFW644 - MK25 reports stopped, arduino 1.8.5. --- Firmware/adc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/adc.c b/Firmware/adc.c index 1798b083b..26728cef5 100644 --- a/Firmware/adc.c +++ b/Firmware/adc.c @@ -71,7 +71,7 @@ void adc_cycle(void) uint8_t index = adc_state & 0x0f; if ((adc_sim_mask & (1 << index)) == 0) adc_values[index] += ADC; - if (index++ >= ADC_CHAN_CNT) + if (++index >= ADC_CHAN_CNT) { index = 0; adc_count++; From 33a29cd416e13e79004027ed2d02f298f1e25127 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Sun, 4 Nov 2018 20:27:09 +0100 Subject: [PATCH 2/2] Fix PFW638 - remaining/elapsed time >100h displayed in hours --- Firmware/ultralcd.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index ee29fc5e2..4ced0b3d2 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -614,7 +614,10 @@ void lcdui_print_time(void) if (feedmultiply != 100) 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 chars = lcd_printf_P(_N("%c--:-- "), LCD_STR_CLOCK[0]);