Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various LCD / backlight adjustments #26086

Merged
Merged
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
5d871ee
Fix JyersUI setMeshViewerStatus()
classicrocker883 Jul 14, 2023
f2b9754
Fix ProUI functions not used
classicrocker883 Jul 14, 2023
125451e
Add, rename hostShutDown
classicrocker883 Jul 14, 2023
f65e52a
Update dwin.cpp
classicrocker883 Jul 14, 2023
3e1bfd1
Revert dwin.cpp, Remove setMeshViewerStatus dwin.h
classicrocker883 Jul 14, 2023
9067105
cleanup
thinkyhead Jul 15, 2023
d57ff7f
Defer until later
thinkyhead Jul 15, 2023
9385663
declare mesh_conf in place
thinkyhead Jul 15, 2023
feba819
toggle with xor
thinkyhead Jul 15, 2023
7b7efda
use targetTooColdToExtrude
thinkyhead Jul 15, 2023
ef776f1
cleanup
thinkyhead Jul 15, 2023
cb171c3
use getters
thinkyhead Jul 15, 2023
dfe61d0
Fix view mesh range
classicrocker883 Jul 16, 2023
7ee1605
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jul 16, 2023
0444c61
Remove asymmetric (unused), same fix with range
classicrocker883 Jul 16, 2023
2f6f663
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jul 17, 2023
0d59183
revert unwanted changes
classicrocker883 Jul 17, 2023
5ed838b
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jul 23, 2023
c282a4f
LCD_BACKLIGHT_TIMEOUT_MINS to work w/DWIN displays
classicrocker883 Jul 23, 2023
f463a1f
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jul 25, 2023
dfaf0b1
proui/meshviewer.cpp draws actual value
classicrocker883 Jul 25, 2023
05e3100
proui/meshviewer draws gradiant "rainbow-y" colors
classicrocker883 Jul 25, 2023
253cb97
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jul 27, 2023
eee44d8
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jul 28, 2023
f8adcdf
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jul 28, 2023
9baf92c
Fix missing `str_1` error
classicrocker883 Jul 28, 2023
32d5759
Rearrange ProUI dwin.cpp to fix Adv_Pause_Feat.
classicrocker883 Jul 28, 2023
4d3e812
Update CMakeLists.txt cmake_min v3.5, fix warning
classicrocker883 Jul 29, 2023
85d1be3
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jul 30, 2023
a632cbd
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Aug 3, 2023
f39ad7d
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Aug 4, 2023
821fde0
Merge branch 'MarlinFirmware:bugfix-2.1.x' into bugfix-2.1.x-fix
classicrocker883 Aug 5, 2023
a6a1e1c
misc. adjustments
thinkyhead Aug 7, 2023
3b0d5fb
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Aug 7, 2023
b3e6a53
small updates
classicrocker883 Aug 7, 2023
d742ed1
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Aug 8, 2023
0345295
Update SanityCheck.h
classicrocker883 Aug 10, 2023
5425fb6
Update ubl_G29.cpp
classicrocker883 Aug 10, 2023
b8fa4bf
Update bedlevel_tools.cpp
classicrocker883 Aug 11, 2023
b9c9fd8
Update dwin.cpp
classicrocker883 Aug 12, 2023
7c87e3a
Update meshviewer.cpp
classicrocker883 Aug 13, 2023
05713f5
revert unwanted changes in meshviewer.cpp
classicrocker883 Aug 13, 2023
6174b2b
Update meshviewer.cpp - tested: works!
classicrocker883 Aug 16, 2023
b8e0436
revert meshviewer.cpp
classicrocker883 Aug 16, 2023
429ae63
etc
thinkyhead Aug 23, 2023
1e89856
Merge remote-tracking branch 'upstream/bugfix-2.1.x' into pr/26086
thinkyhead Aug 23, 2023
5e0c0a1
squash, range + 1
thinkyhead Aug 23, 2023
8298732
fixes and rename
classicrocker883 Aug 23, 2023
7c07504
roll back range/ omit `rmin` for color gradiant
classicrocker883 Aug 23, 2023
74c7f3a
Preview updates
thinkyhead Aug 24, 2023
33aff88
Rename Class Plot, fixes
classicrocker883 Aug 25, 2023
48a325e
Update Interval fix
classicrocker883 Aug 25, 2023
32649cb
Merge branch 'bugfix-2.1.x' into pr/26086
thinkyhead Aug 25, 2023
4fbcd45
Fix stack corruption
thinkyhead Aug 25, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update CMakeLists.txt cmake_min v3.5, fix warning
  • Loading branch information
classicrocker883 committed Jul 29, 2023
commit 4d3e81208bdcdaa91e143c7fe7f8438b7936a3a9
17 changes: 15 additions & 2 deletions buildroot/share/cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.5)
#====================================================================#
# Usage under Linux: #
# #
Expand Down Expand Up @@ -82,7 +82,7 @@ message("-- Running CMake version: " ${CMAKE_VERSION})

# Replace the CMake Ver. in the Arduino.cmake
file(READ "${CMAKE_CURRENT_LIST_DIR}/marlin-cmake/Platform/Arduino.cmake" ORIGINAL_FILE_CONTENTS)
string(REPLACE "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 2.8.12)" NEW_FILE_CONTENTS "${ORIGINAL_FILE_CONTENTS}")
string(REPLACE "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.5)" NEW_FILE_CONTENTS "${ORIGINAL_FILE_CONTENTS}")
file(WRITE "${CMAKE_CURRENT_LIST_DIR}/marlin-cmake/Platform/Arduino.cmake" "${NEW_FILE_CONTENTS}")

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake/modules)
Expand All @@ -95,6 +95,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/marlin-cma
set(ARDUINO_SDK_PATH ${CMAKE_CURRENT_LIST_DIR}/arduino-1.8.19)
#set(ARDUINO_SDK_PATH /Applications/Arduino.app/Contents/Java)
#set(ARDUINO_SDK_PATH $HOME/ArduinoAddons/Arduino_1.6.x)

#====================================================================#
# Set included cmake files #
#====================================================================#
Expand All @@ -108,6 +109,18 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake/toolchain/Arduin

#====================================================================#
# Setup Project #
# #
# If you receive this error: #
# 'Unknown CMake command "_cmake_record_install_prefix".' #
# go to the file in your CMake directory. #
# #
# For Windows: cmake\Modules\Platform\WindowsPaths.cmake #
# For Linux: cmake/Modules/Platform/UnixPaths.cmake #
# #
# Comment out "_cmake_record_install_prefix()" #
# - OR - #
# Add "include(CMakeSystemSpecificInformation)" above the line. #
# #
#====================================================================#
project(Marlin C CXX)

Expand Down