Scott Lahteine 7 лет назад
Родитель
Сommit
0afd25a010
2 измененных файлов: 5 добавлений и 6 удалений
  1. 3
    4
      Marlin/Marlin_main.cpp
  2. 2
    2
      Marlin/ultralcd.cpp

+ 3
- 4
Marlin/Marlin_main.cpp Просмотреть файл

10097
   #ifndef INVERT_CASE_LIGHT
10097
   #ifndef INVERT_CASE_LIGHT
10098
     #define INVERT_CASE_LIGHT false
10098
     #define INVERT_CASE_LIGHT false
10099
   #endif
10099
   #endif
10100
-  int case_light_brightness;  // LCD routine wants INT
10100
+  uint8_t case_light_brightness;  // LCD routine wants INT
10101
   bool case_light_on;
10101
   bool case_light_on;
10102
 
10102
 
10103
   void update_case_light() {
10103
   void update_case_light() {
10104
     pinMode(CASE_LIGHT_PIN, OUTPUT); // digitalWrite doesn't set the port mode
10104
     pinMode(CASE_LIGHT_PIN, OUTPUT); // digitalWrite doesn't set the port mode
10105
-    uint8_t case_light_bright = (uint8_t)case_light_brightness;
10106
     if (case_light_on) {
10105
     if (case_light_on) {
10107
       if (USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) {
10106
       if (USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) {
10108
-        analogWrite(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? 255 - case_light_brightness : case_light_brightness );
10107
+        analogWrite(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? 255 - case_light_brightness : case_light_brightness);
10109
       }
10108
       }
10110
       else WRITE(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? LOW : HIGH);
10109
       else WRITE(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? LOW : HIGH);
10111
     }
10110
     }
10139
     }
10138
     }
10140
     else {
10139
     else {
10141
       if (!USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) SERIAL_ECHOLN("Case light: on");
10140
       if (!USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) SERIAL_ECHOLN("Case light: on");
10142
-      else SERIAL_ECHOLNPAIR("Case light: ", case_light_brightness);
10141
+      else SERIAL_ECHOLNPAIR("Case light: ", (int)case_light_brightness);
10143
     }
10142
     }
10144
 
10143
 
10145
   #else
10144
   #else

+ 2
- 2
Marlin/ultralcd.cpp Просмотреть файл

752
 
752
 
753
   #if ENABLED(MENU_ITEM_CASE_LIGHT)
753
   #if ENABLED(MENU_ITEM_CASE_LIGHT)
754
 
754
 
755
-    extern int case_light_brightness;
755
+    extern uint8_t case_light_brightness;
756
     extern bool case_light_on;
756
     extern bool case_light_on;
757
     extern void update_case_light();
757
     extern void update_case_light();
758
 
758
 
762
       // ^ Main
762
       // ^ Main
763
       //
763
       //
764
       MENU_BACK(MSG_MAIN);
764
       MENU_BACK(MSG_MAIN);
765
-      MENU_ITEM_EDIT_CALLBACK(int3, MSG_CASE_LIGHT_BRIGHTNESS, &case_light_brightness, 0, 255, update_case_light, true);
765
+      MENU_ITEM_EDIT_CALLBACK(int8, MSG_CASE_LIGHT_BRIGHTNESS, &case_light_brightness, 0, 255, update_case_light, true);
766
       MENU_ITEM_EDIT_CALLBACK(bool, MSG_CASE_LIGHT, (bool*)&case_light_on, update_case_light);
766
       MENU_ITEM_EDIT_CALLBACK(bool, MSG_CASE_LIGHT, (bool*)&case_light_on, update_case_light);
767
       END_MENU();
767
       END_MENU();
768
     }
768
     }

Загрузка…
Отмена
Сохранить