Skip to content

Commit

Permalink
Update 20210107
Browse files Browse the repository at this point in the history
save/load infoSettings Struct instead of save/load every variable individually, Fix Screen freezes/Click to Resume message/damaged M105 command in Marlin mode bigtreetech#1468
  • Loading branch information
Uz45 committed Jan 9, 2021
1 parent 03fc9a6 commit 5264174
Show file tree
Hide file tree
Showing 84 changed files with 1,101 additions and 1,091 deletions.
28 changes: 22 additions & 6 deletions .github/workflows/buildBinary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,19 @@ name: Build Binaries
on:
push:
branches: [ master ]
paths-ignore:
- .devcontainer/**
- .github/**
- Bootloader/**
- Copy to SD Card root directory to update/**
- images/**
- readme/**
- '**/*.md'

jobs:
main:
name: Main
name: Build Binaries
if: github.repository == 'bigtreetech/BIGTREETECH-TouchScreenFirmware'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
Expand Down Expand Up @@ -54,14 +64,20 @@ jobs:
run: platformio run --environment MKS_32_V1_4_NOBL
- name: Build MKS TFT28 V1.0
run: platformio run --environment MKS_28_V1_0
- name: Clean Up Folder
- name: Remove Old Binaries
run: find "Copy to SD Card root directory to update/" -name '*.bin' -print -delete
- name: Copy Files
- name: Remove Old Config
run: find "Copy to SD Card root directory to update/" -name 'config.ini' -print -delete
- name: Copy New Binaries
run: find .pio/build/ -name '*.bin' -exec cp -vf '{}' "./Copy to SD Card root directory to update/" ";"
- name: Stage Changes
run: git config user.email "[email protected]" && git config user.name "Github Actions" && find "Copy to SD Card root directory to update/" -name '*.bin' -exec git add {} \;
- name: Copy New Config
run: find TFT/src/User/ -name 'config.ini' -exec cp -vf '{}' "./Copy to SD Card root directory to update/" ";"
- name: Stage New Binaries
run: git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && git config user.name "${GITHUB_ACTOR}" && find "Copy to SD Card root directory to update/" -name '*.bin' -exec git add {} \;
- name: Stage New Config
run: git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && git config user.name "${GITHUB_ACTOR}" && find "Copy to SD Card root directory to update/" -name 'config.ini' -exec git add {} \;
- name: Push
uses: actions-x/commit@v2
with:
message: Update prebuilt binaries
message: Update prebuilt binaries and config
token: ${{ secrets.MY_SECRET_TOKEN }}
19 changes: 17 additions & 2 deletions .github/workflows/buildTest.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
name: Build Test
on: [pull_request, push]
on:
pull_request:
paths-ignore:
- Bootloader/**
- Copy to SD Card root directory to update/**
- images/**
- readme/**
- '**/*.md'

push:
paths-ignore:
- Bootloader/**
- Copy to SD Card root directory to update/**
- images/**
- readme/**
- '**/*.md'

jobs:
main:
name: Main
name: Build Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ label_send_start_gcode:Gcode vor Druck
label_send_end_gcode:Gcode nach Druck
label_send_cancel_gcode:Gcode bei Abbruch
label_persistent_status_info:Speicherungs-Status
label_file_listmode:Datein als Liste
label_file_listmode:Dateien als Liste
label_current_setting:Treiber Strom (mA)
label_steps_setting:Steps pro mm
label_maxfeedrate:max. Geschwindigkeit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ label_language:Magyar
label_heat:Fűtés
label_move:Mozgás
label_home:Végállás
label_disable_steppers:Léptetők
label_disable_steppers:Mot.tilt
label_print:Nyomtatás
label_extrude:Adagolás
label_fan:Hűtés
Expand Down Expand Up @@ -89,7 +89,7 @@ label_resume:Folytatás
label_load:Betöltés
label_unload:Kiadás
label_load_unload:Betöltés/Kiadás
label_load_unload_short:Fil. Ki/Be
label_load_unload_short:Be/Ki
label_slow_speed:Lassú
label_normal_speed:Normál
label_fast_speed:Gyors
Expand Down Expand Up @@ -164,7 +164,7 @@ label_adjust_ok:Kalibrálás sikeres.
label_adjust_failed:A kalibrálás sikertelen, próbáld újra
label_warning:Figyelem!
label_stop_print:Megállítod a nyomtatást?
label_confirm:Igen
label_confirm:Oké
label_tftsd:TFT-SD
label_read_tftsd_error:TFT-SD olvasási hiba!
label_tftsd_inserted:SD-Kártya behelyezve!
Expand Down Expand Up @@ -256,16 +256,16 @@ label_start_print:Elindítod a %s\nfájl nyomtatását?
label_ack_notification:ACK egyéb típus
label_leveling_edge_distance:Ágy szélének távolsága
label_xy_unlock:Felold XY
label_tuning:Tuning
label_tuning:Hangolás
label_pid:PID
label_pid_title:PID Automatikus Hangolás
label_pid_start_info:A PID önhangolása elindul.\nPercekig is eltarthat.\nFolytatod?
label_pid_start_info_2:PID Automatikus hangolása zajlik!
label_pid_start_info_3:NE ÉRINTSD meg a kijelzőt míg nincs kész! (zöld LED jelzi)!
label_tune_extruder:Lépés hangolás
label_tune_extruder:Adagoló
label_tune_ext_extrude_100:Kiad 100mm
label_tune_ext_temp:Adagoló hangolás | Fűt
label_tune_ext_templow:Túl alacsony a kívánt hőfok!\nMinimum hőmérséklet: %d C
label_tune_ext_templow:Túl alacsony a kívánt hőfok!\nMinimum hőmérséklet: %d
label_tune_ext_desiredval:A hőfok még nem érte el a kívánt értéket
label_tune_ext_mark120mm:A 120mm-t jelöld be a szálon\nNyomd '%s' ha kész\nMérd meg a hátralévő hosszt\nadagolás után.
label_tune_ext_heatoff:Kikapcsolod a fűtést?
Expand All @@ -284,17 +284,17 @@ label_case_light:Gépház Világítás
label_load_started:A filament betöltése folyamatban van,\nnem lehetséges további művelet,\nmíg véget nem ér.\nKérlek várj!
label_unload_started:A filament kiadása folyamatban van,\nnem lehetséges további művelet,\nmíg véget nem ér.\nKérlek várj!
label_heaters_on:Néhány fűtőelem még üzemel.\nKikapcsolod a fűtőelemeket?
label_print_finished: Printing\n finished.
label_main_screen:Main
label_print_finished: Nyomtatás\n elkészült.
label_main_screen:Főoldal
label_previous_print_data:Összegzés
label_file_name:File:
label_print_time:Print Time:
label_filament_length:Filament length: %1.2fm
label_filament_weight:Filament weight: %1.2fg
label_filament_cost:Filament cost: %1.2f
label_no_filament_stats:No filament statistics.
label_click_for_more:Click for more.
label_ext_templow:Hotend temperature is below\nminimum temperature (%d℃).
label_cold_ext:Cold extrusion prevented
label_heat_hotend:Heat hotend to %d℃?
label_file_name:Fájl:
label_print_time:Nyomtatási idő:
label_filament_length:Szál hossza: %1.2fm
label_filament_weight:Szál súlya: %1.2fg
label_filament_cost:Szál költség: %1.2f
label_no_filament_stats:Nincs szál statisztika.
label_click_for_more:Kattints a részletekért.
label_ext_templow:Fejhőfok alacsonyabb, mint a\nminimális hőfok (%d℃).
label_cold_ext:Hideg adagolás tiltva
label_heat_hotend:Fűtöd a fejet %d℃-ra?

Original file line number Diff line number Diff line change
Expand Up @@ -284,16 +284,16 @@ label_case_light:Luce
label_load_started:Carico filamento in corso...\nNon sono possibili altre\nazioni fino al termine.\nAttendere prego.
label_unload_started:Scarico filamento in corso...\nNon sono possibili altre\nazioni fino al termine.\nAttendere prego.
label_heaters_on:Alcuni riscaldatori sono ancora accesi\nVuoi spegnerli?
label_print_finished: Printing\n finished.
label_main_screen:Main
label_previous_print_data:Brief
label_print_finished: Stampa\n finita.
label_main_screen:Principale
label_previous_print_data:Ultima stampa
label_file_name:File:
label_print_time:Print Time:
label_filament_length:Filament length: %1.2fm
label_filament_weight:Filament weight: %1.2fg
label_filament_cost:Filament cost: %1.2f
label_no_filament_stats:No filament statistics.
label_click_for_more:Click for more.
label_print_time:Durata stampa:
label_filament_length:Lunghezza filamento: %1.2fm
label_filament_weight:Peso filamento: %1.2fg
label_filament_cost:Costo filamento: %1.2f
label_no_filament_stats:Nessuna statistica del filamento.
label_click_for_more:Clicca per piu' info.
label_ext_templow:La temperatura dell'hotend\nè al di sotto della temperatura\nminima (%d℃).
label_cold_ext:Prevenzione dell'estrusione a freddo
label_heat_hotend:Heat hotend to %d℃?
Expand Down
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_32_V1_1.26.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_32_V1_2.26.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_32_V1_3.26.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_32_V1_4.26.x.bin
Binary file not shown.
Loading

0 comments on commit 5264174

Please sign in to comment.