Merge pull request #1301 from XPila/V3_5

PFW644 + PFW638

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++;

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]);