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.

Sign up for GitHub

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

cleanup & fix st7920 simulator (add klipper support) #705

Merged
merged 3 commits into from
May 23, 2020
Merged

cleanup & fix st7920 simulator (add klipper support) #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21a0350
fix bug
May 12, 2020
236c497
improve st7920 simulator for klipper
May 23, 2020
2350393
Merge branch 'master' into master
bigtreetech May 23, 2020
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
4 changes: 2 additions & 2 deletions TFT/src/User/API/Colors.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "Colors.h"
#include "Colors.h"

const u32 lcd_colors[LCD_COLOR_COUNT] = {
WHITE,
Expand Down Expand Up @@ -37,4 +37,4 @@ const LABEL lcd_color_names[LCD_COLOR_COUNT] =
LABEL_DARKGREEN,
LABEL_GRAY,
LABEL_DARKGRAY
};
};
2 changes: 1 addition & 1 deletion TFT/src/User/API/LCD_Encoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ bool encoder_CheckState(void);
void sendEncoder(uint8_t num);
void loopCheckEncoder(void);

#endif
#endif
2 changes: 1 addition & 1 deletion TFT/src/User/API/UI/Numpad.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,4 +234,4 @@ u32 numPadInt(u32 old_val)
}
loopBackEnd();
}
}
}
2 changes: 1 addition & 1 deletion TFT/src/User/API/UI/Numpad.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ float numPadFloat(float old_val, bool negative_val);

u32 numPadInt(u32 old_val);

#endif
#endif
Loading