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

event LEDs mode, pragma once, PID knob_led interaction, preheatdone sound, small fixes and cleanup #1209

Closed
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
581595f
new start, added new files
traffic-light Oct 25, 2020
92e0a1f
Added sequential mode
traffic-light Oct 25, 2020
6e65543
Cleanup code
traffic-light Oct 26, 2020
218a346
Futher clean up
traffic-light Oct 26, 2020
b2558c3
Moved setSequential to the correct location
traffic-light Oct 26, 2020
df5f664
Merge branch 'master' into neopixel_sequential_whileprint
traffic-light Nov 1, 2020
dbcfd94
Merge branch 'master' into neopixel_sequential_whileprint
traffic-light Nov 3, 2020
2af1720
Fix bugs
guruathwal Nov 4, 2020
5689fb6
misc update
guruathwal Nov 4, 2020
169b8d1
Update TFT/src/User/API/config.c
traffic-light Nov 4, 2020
b1f8fdc
Merge branch 'master' into neopixel_sequential_whileprint
traffic-light Nov 4, 2020
89e6500
Merge pull request #1 from guruathwal/traffic-light-PR
traffic-light Nov 5, 2020
7504b51
Merge pull request #2 from bigtreetech/master
traffic-light Nov 5, 2020
1559082
SEQ 'works', knob_led in PID, added pragmaonce
traffic-light Nov 8, 2020
3436834
Solved led knob bug on not supported screens
traffic-light Nov 8, 2020
14e25cc
Made sequential correct. Neopixels still not working
traffic-light Nov 9, 2020
c5cd4e8
Small clean up and better retrun management
traffic-light Nov 9, 2020
767ce76
Clean up somecode
traffic-light Nov 9, 2020
2551f64
Merged master into branch
traffic-light Nov 11, 2020
adc3738
if( >> if (| )return >> ) return| some changes in seq
traffic-light Nov 15, 2020
ee62ab4
Succesful first build of notification sound for preheat done
traffic-light Nov 15, 2020
0e215eb
Added preheat done notification to the languages files
traffic-light Nov 15, 2020
878173a
small cleanup
traffic-light Nov 15, 2020
42be971
Added styleguide to this PR
traffic-light Nov 15, 2020
0c6f7d3
Small fix for current error
traffic-light Nov 15, 2020
8e99ade
Added styleguide for real this time
traffic-light Nov 15, 2020
52ea266
small fix for the current error
traffic-light Nov 15, 2020
80e11b8
Commit before merge master
traffic-light Dec 3, 2020
6752d86
Merged all the additions/ edits
traffic-light Dec 3, 2020
2d18fc3
Added some files that were lost :-P
traffic-light Dec 3, 2020
70dcb75
Fixed some merge conflicts. Still need to do for alle the languages
traffic-light Dec 3, 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
Prev Previous commit
Next Next commit
Merge branch 'master' into neopixel_sequential_whileprint
traffic-light authored Nov 1, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit df5f6648aa3d4dc661416530d34b240a84b9facc
Original file line number Diff line number Diff line change
@@ -232,11 +232,11 @@ label_120_seconds:2 Min.
label_300_seconds:5 Min.
label_custom_seconds:Benutz.
label_sequential_mode:Sequential mode
label_st7920_fullscreen:Marlin mode in fullscreen
label_plr_en:Power loss recovery
label_setting_save:Save settings
label_setting_reset:Reset default settings
label_setting_restore:Restore settings
label_st7920_fullscreen:Marlin Mode im Vollbild
label_plr_en:Wiederherstellung nach Stromausfall
label_setting_save:Einstellungen speichern
label_setting_reset:Einstellungen zurücksetzten
label_setting_restore:Einstellungen wiederherstellen
label_eeprom_settings:EEPROM
label_eeprom_save_info:Einstellungen im\nEEPROM speichern?
label_eeprom_restore_info:Einstellungen aus\nEEPROM laden?
Original file line number Diff line number Diff line change
@@ -232,11 +232,11 @@ label_120_seconds:2 Min.
label_300_seconds:5 Min.
label_custom_seconds:Benutz.
label_sequential_mode:Sequential mode
label_st7920_fullscreen:Marlin mode in fullscreen
label_plr_en:Power loss recovery
label_setting_save:Save settings
label_setting_reset:Reset default settings
label_setting_restore:Restore settings
label_st7920_fullscreen:Marlin Mode im Vollbild
label_plr_en:Wiederherstellung nach Stromausfall
label_setting_save:Einstellungen speichern
label_setting_reset:Einstellungen zurücksetzten
label_setting_restore:Einstellungen wiederherstellen
label_eeprom_settings:EEPROM
label_eeprom_save_info:Einstellungen im\nEEPROM speichern?
label_eeprom_restore_info:Einstellungen aus\nEEPROM laden?
10 changes: 5 additions & 5 deletions TFT/src/User/API/Language/language_de.h
Original file line number Diff line number Diff line change
@@ -230,11 +230,11 @@
#define STRING_300_SECONDS "5 Min."
#define STRING_CUSTOM_SECONDS "Benutz."
#define STRING_SEQUENTIAL_MODE "Sequential mode"
#define STRING_ST7920_FULLSCREEN "Marlin mode in fullscreen"
#define STRING_PLR_EN "Power loss recovery"
#define STRING_SETTING_SAVE "Save settings"
#define STRING_SETTING_RESET "Reset default settings"
#define STRING_SETTING_RESTORE "Restore settings"
#define STRING_ST7920_FULLSCREEN "Marlin Mode im Vollbild"
#define STRING_PLR_EN "Wiederherstellung nach Stromausfall"
#define STRING_SETTING_SAVE "Einstellungen speichern"
#define STRING_SETTING_RESET "Einstellungen zurücksetzten"
#define STRING_SETTING_RESTORE "Einstellungen wiederherstellen"
#define STRING_EEPROM_SETTINGS "EEPROM"
#define STRING_EEPROM_SAVE_INFO "Einstellungen im\nEEPROM speichern?"
#define STRING_EEPROM_RESTORE_INFO "Einstellungen aus\nEEPROM laden?"
2 changes: 1 addition & 1 deletion TFT/src/User/API/flashStore.c
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
#include "STM32_Flash.h"

#define TSC_SIGN 0x20200512 // DO NOT MODIFY
#define PARA_SIGN 0x20201025 // (YYYYMMDD) If a new setting parameter is added,
#define PARA_SIGN 0x20201101 // (YYYYMMDD) If a new setting parameter is added,
// modify here and initialize the initial value
// in the "infoSettingsReset()" function

10 changes: 5 additions & 5 deletions TFT/src/User/Language Packs/language_de.ini
Original file line number Diff line number Diff line change
@@ -232,11 +232,11 @@ label_120_seconds:2 Min.
label_300_seconds:5 Min.
label_custom_seconds:Benutz.
label_sequential_mode:Sequential mode
label_st7920_fullscreen:Marlin mode in fullscreen
label_plr_en:Power loss recovery
label_setting_save:Save settings
label_setting_reset:Reset default settings
label_setting_restore:Restore settings
label_st7920_fullscreen:Marlin Mode im Vollbild
label_plr_en:Wiederherstellung nach Stromausfall
label_setting_save:Einstellungen speichern
label_setting_reset:Einstellungen zurücksetzten
label_setting_restore:Einstellungen wiederherstellen
label_eeprom_settings:EEPROM
label_eeprom_save_info:Einstellungen im\nEEPROM speichern?
label_eeprom_restore_info:Einstellungen aus\nEEPROM laden?
3 changes: 3 additions & 0 deletions TFT/src/User/includes.h
Original file line number Diff line number Diff line change
@@ -117,8 +117,11 @@
#include "Pid.h"
#include "TuneExtruder.h"
#include "ConnectionSettings.h"

#include "sequential_mode.h"

#include "MeshTuner.h"
#include "MeshEditor.h"

#define MAX_MENU_DEPTH 10 // max sub menu depth
typedef void (*FP_MENU)(void);
You are viewing a condensed version of this merge commit. You can view the full changes here.