File tree Expand file tree Collapse file tree 6 files changed +426
-463
lines changed
Expand file tree Collapse file tree 6 files changed +426
-463
lines changed Original file line number Diff line number Diff line change 426426#elif TEMP_SENSOR_0 == -1
427427 #define TEMP_SENSOR_0_IS_AD595 1
428428#elif TEMP_SENSOR_0 == -18
429- #warning "Config is TEMP_SENSOR_0 == -18"
430429 #define HAS_ADS1118 1
431- #define TEMP_SENSOR_0_IS_ADS1118 1
430+ #define TEMP_SENSOR_0_IS_ADS1118 1
432431 #define TEMP_SENSOR_0_ADS_TMIN 0
433- #define TEMP_SENSOR_0_ADS_TMAX 1024
432+ #define TEMP_SENSOR_0_ADS_TMAX 1024
434433#elif TEMP_SENSOR_0 > 0
435434 #define TEMP_SENSOR_0_IS_THERMISTOR 1
436435 #if TEMP_SENSOR_0 == 1000
475474#elif TEMP_SENSOR_1 == -1
476475 #define TEMP_SENSOR_1_IS_AD595 1
477476#elif TEMP_SENSOR_1 == -18
478- #warning "Config is TEMP_SENSOR_1 == -18"
479477 #define HAS_ADS1118 1
480- #define TEMP_SENSOR_1_IS_ADS1118 1
478+ #define TEMP_SENSOR_1_IS_ADS1118 1
481479 #define TEMP_SENSOR_1_ADS_TMIN 0
482- #define TEMP_SENSOR_1_ADS_TMAX 1024
480+ #define TEMP_SENSOR_1_ADS_TMAX 1024
483481#elif TEMP_SENSOR_1 > 0
484482 #define TEMP_SENSOR_1_IS_THERMISTOR 1
485483 #if TEMP_SENSOR_1 == 1000
Original file line number Diff line number Diff line change 114114 #warning "Warning! Don't use dummy thermistors (998/999) for final build!"
115115#endif
116116
117- #if ENABLED(HAS_ADS1118)
118- #warning "ADS1118 support is in development"
119- #endif
120-
121117#if ANY_THERMISTOR_IS(-18)
122118 #warning "ADS1118 support (-18) is in development"
123119#endif
Original file line number Diff line number Diff line change @@ -452,11 +452,11 @@ bool MarlinUI::detected() {
452452 #if ENABLED(LCD_I2C_TYPE_MCP23017)
453453 // Reading these buttons is too slow for interrupt context
454454 // so they are read during LCD update in the main loop.
455- uint8_t slow_bits = lcd.readButtons ()
455+ uint8_t slow_bits = ( lcd.readButtons ()
456456 #if !BUTTON_EXISTS(ENC)
457457 << B_I2C_BTN_OFFSET
458458 #endif
459- ;
459+ ) ;
460460 #if ENABLED(LCD_I2C_VIKI)
461461 if ((slow_bits & (B_MI | B_RI)) && PENDING (millis (), next_button_update_ms)) // LCD clicked
462462 slow_bits &= ~(B_MI | B_RI); // Disable LCD clicked buttons if screen is updated
You can’t perform that action at this time.
0 commit comments