CreatBot/CreatBotKlipperScreen
7
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,092 Commits 4 Branches 16 Tags
Commit Graph

76 Commits

Author SHA1 Message Date
zkk
7f8d113e74 修复耗材检测显示偶尔不正确的问题，有些弹窗会异常问题，以及一点翻译优化 
Squashed commit of the following:

commit cf7cafefbcd2274c9a481e58042d11db8cd79961
Merge: dc3478b4 8d259cea
Author: zkk <1007518571@qq.com>
Date:   Tue Jan 7 17:26:59 2025 +0800

    Merge commit '8d259ceadd5026cecc1dc61224d91aef4f3877b4' into release

commit 8d259ceadd5026cecc1dc61224d91aef4f3877b4
Author: zkk <1007518571@qq.com>
Date:   Tue Jan 7 17:15:46 2025 +0800

    实现 打印中恢复喷头温度 提示语的翻译

commit dd11c9683cb5af5407e650eea9b683b1066256c7
Author: zkk <1007518571@qq.com>
Date:   Tue Jan 7 16:52:04 2025 +0800

    优化单个喷头时不显示喷头偏移菜单

commit c3ec7a81bbe1490b76202485d0502a4829a3cee5
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 3 17:52:24 2025 +0800

    修复屏幕耗材检测显示偶尔不准确的问题

commit 413bf6fc4a740f53d265c63abe7c51eaad483cb0
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 3 15:00:54 2025 +0800

    修复耗材检测弹窗异常问题

commit dc3478b48c7da1dbae120d1270c9ab64646d6647
Merge: 02c7556c 3bfc1aa7
Author: zkk <1007518571@qq.com>
Date:   Thu Jan 2 11:18:07 2025 +0800

    Merge commit '3bfc1aa714e282d74b801155d830377ca58d8f59' into release

commit 3bfc1aa714e282d74b801155d830377ca58d8f59
Author: zkk <1007518571@qq.com>
Date:   Thu Jan 2 11:17:15 2025 +0800

    修复移轴页面移轴功能失效问题

commit 02c7556cdadf8de1ef3c54d2831920927cadbe30
Merge: 6bfa42e0 991003e6
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 15:07:54 2024 +0800

    Merge commit '991003e6cbea335eca73d3783aa1837059614724' into release

commit 991003e6cbea335eca73d3783aa1837059614724
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 15:03:34 2024 +0800

    优化完整 简体中文和繁体中文的翻译

commit 1a177e90d09b9b9949bff2a1e3c6b12173420620
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 14:10:03 2024 +0800

    优化排除对象的英文语法错误

commit e8d509cb6c2883b1fadb5ab9f9ca658e61849055
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 16:40:52 2024 +0800

    优化耗材检测显示内容

commit 1b7670485a918cb334119175777525f768e670be
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 14:56:25 2024 +0800

    完善断料自动切头功能描述

commit ecc0c3dd16442497e56f5f8ab3a0c6be00bd180e
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 13:40:01 2024 +0800

    实现弹窗翻译功能

commit bc6d60fa183af50b7b16fea685139ca9d5df90ea
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 09:53:16 2024 +0800

    优化不合理名称和不合理大小写

commit 2e650926bdba1c65baa506be1b1dd09621e8d8ea
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 26 15:06:11 2024 +0800

    修复10寸屏幕偏移值微调页面出界问题

commit c481b551f777a3a6cadf7be3bfcab38448b51694
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 15:28:26 2024 +0800

    优化移轴设置页面没有返回按钮的问题

commit 2b3c9936bd693c8fc265d6352799f382680f4920
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 10:05:04 2024 +0800

    删除移动设置页面中轴反转的选项

commit 5e37d59497c54086d3f1e215cbabc03254857a58
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 09:05:03 2024 +0800

    优化选择语言标题

commit 5214c3697baac78bd0a465e33d6f4f3c1e30862e
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 24 10:57:41 2024 +0800

    增加设置hostname功能

commit 3709a7465cc2e0d677ecc9979fb18144f7e0ec33
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 24 10:43:46 2024 +0800

    增加工厂设置中打包模式

commit 0c2a2618beb68d50601e433beef06122fb0ffd40
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 23 16:25:37 2024 +0800

    实现恢复出厂设置功能

commit e3a38f85613d53a4a063e835c34c701196010c6e
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 23 15:48:17 2024 +0800

    一点格式化

commit 4e9e452e8bed4b53eaaae8f0a69142de8aa50611
Author: zkk <1007518571@qq.com>
Date:   Sat Dec 21 14:20:22 2024 +0800

    优化探针偏移值校准时如果当前激活为第一个喷头时不会重复激活喷头

commit 3b85e8e8d59b0d4eae75f80d9e637fe9dc272cbe
Merge: 882850db 10ec2029
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 18 17:26:08 2024 +0800

    Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

commit 882850dbde648598e5f91281101d0ea01fd56d56
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 18 17:21:16 2024 +0800

    补充双喷头偏移校准页面二维码图片

commit 10ec2029eb73e66874d5a0ec492c016480641110
Author: ruipeng <1041589370@qq.com>
Date:   Wed Dec 18 17:17:18 2024 +0800

    增加自动切换喷头开关选项

commit 3d6eed9d9526b77472ba7df29014b5768c594026
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 16 16:33:34 2024 +0800

    喷头偏移值校准功能的实现

commit 40ecbb3ea4827c9bac1aa271cccc958c94c1114a
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 13 09:20:00 2024 +0800

    z探针校准时指定默认激活工具头为第一个头

commit bce3caa409618ef5bc2067865940d14a1441c0f8
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 13 09:19:19 2024 +0800

    优化z探针校准时候移动过慢问题

commit 6bfa42e036a521c8ff7db1bf8ccb65500eabb6ea
Merge: 1a87ced3 4f3aa9aa
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 12 10:33:58 2024 +0800

    Merge commit '4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f' into release

commit 4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f
Merge: e3fd413d 1a69b518
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 12 10:30:00 2024 +0800

    Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

commit 1a69b5180de733f15550a1294a7221d6070306a0
Author: ruipeng <1041589370@qq.com>
Date:   Wed Dec 11 11:44:36 2024 +0800

    新增D600pro2、D1000的V0版机型

commit e3fd413d6256414441e9fe653c1132b1799a5cb2
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 10 14:34:13 2024 +0800

    修复打印时没有修改z偏移值 仍提示保存z偏移的按钮的bug

commit 594fb668fe94fe907c028bf65ecced43ea8660cb
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 10 14:25:04 2024 +0800

    设置自适应调平选项默认为关闭状态

commit 1a87ced3f5725569a6b9a7ee5f5250044d01d852
Merge: 629416d1 6064a6e1
Author: zkk <1007518571@qq.com>
Date:   Fri Nov 29 10:18:32 2024 +0800

    Merge branch 'develop' into release

# Conflicts:
#	config/main_menu.conf
#	ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.mo   resolved by cf7cafefbcd2274c9a481e58042d11db8cd79961 version
#	ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.po
#	ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.mo   resolved by cf7cafefbcd2274c9a481e58042d11db8cd79961 version
#	ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.po
#	ks_includes/prompts_text.py
#	ks_includes/widgets/prompts.py
#	screen.py
 2025-01-07 17:35:27 +08:00
zkk
d822333489 优化翻译，耗材检测提示和一些细节问题 
Squashed commit of the following:

commit 02c7556cdadf8de1ef3c54d2831920927cadbe30
Merge: 6bfa42e0 991003e6
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 15:07:54 2024 +0800

    Merge commit '991003e6cbea335eca73d3783aa1837059614724' into release

commit 991003e6cbea335eca73d3783aa1837059614724
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 15:03:34 2024 +0800

    优化完整 简体中文和繁体中文的翻译

commit 1a177e90d09b9b9949bff2a1e3c6b12173420620
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 14:10:03 2024 +0800

    优化排除对象的英文语法错误

commit e8d509cb6c2883b1fadb5ab9f9ca658e61849055
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 16:40:52 2024 +0800

    优化耗材检测显示内容

commit 1b7670485a918cb334119175777525f768e670be
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 14:56:25 2024 +0800

    完善断料自动切头功能描述

commit ecc0c3dd16442497e56f5f8ab3a0c6be00bd180e
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 13:40:01 2024 +0800

    实现弹窗翻译功能

commit bc6d60fa183af50b7b16fea685139ca9d5df90ea
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 09:53:16 2024 +0800

    优化不合理名称和不合理大小写

commit 2e650926bdba1c65baa506be1b1dd09621e8d8ea
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 26 15:06:11 2024 +0800

    修复10寸屏幕偏移值微调页面出界问题

commit c481b551f777a3a6cadf7be3bfcab38448b51694
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 15:28:26 2024 +0800

    优化移轴设置页面没有返回按钮的问题

commit 2b3c9936bd693c8fc265d6352799f382680f4920
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 10:05:04 2024 +0800

    删除移动设置页面中轴反转的选项

commit 5e37d59497c54086d3f1e215cbabc03254857a58
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 09:05:03 2024 +0800

    优化选择语言标题

commit 5214c3697baac78bd0a465e33d6f4f3c1e30862e
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 24 10:57:41 2024 +0800

    增加设置hostname功能

commit 3709a7465cc2e0d677ecc9979fb18144f7e0ec33
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 24 10:43:46 2024 +0800

    增加工厂设置中打包模式

commit 0c2a2618beb68d50601e433beef06122fb0ffd40
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 23 16:25:37 2024 +0800

    实现恢复出厂设置功能

commit e3a38f85613d53a4a063e835c34c701196010c6e
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 23 15:48:17 2024 +0800

    一点格式化

commit 4e9e452e8bed4b53eaaae8f0a69142de8aa50611
Author: zkk <1007518571@qq.com>
Date:   Sat Dec 21 14:20:22 2024 +0800

    优化探针偏移值校准时如果当前激活为第一个喷头时不会重复激活喷头

commit 3b85e8e8d59b0d4eae75f80d9e637fe9dc272cbe
Merge: 882850db 10ec2029
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 18 17:26:08 2024 +0800

    Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

commit 882850dbde648598e5f91281101d0ea01fd56d56
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 18 17:21:16 2024 +0800

    补充双喷头偏移校准页面二维码图片

commit 10ec2029eb73e66874d5a0ec492c016480641110
Author: ruipeng <1041589370@qq.com>
Date:   Wed Dec 18 17:17:18 2024 +0800

    增加自动切换喷头开关选项

commit 3d6eed9d9526b77472ba7df29014b5768c594026
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 16 16:33:34 2024 +0800

    喷头偏移值校准功能的实现

commit 40ecbb3ea4827c9bac1aa271cccc958c94c1114a
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 13 09:20:00 2024 +0800

    z探针校准时指定默认激活工具头为第一个头

commit bce3caa409618ef5bc2067865940d14a1441c0f8
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 13 09:19:19 2024 +0800

    优化z探针校准时候移动过慢问题

commit 6bfa42e036a521c8ff7db1bf8ccb65500eabb6ea
Merge: 1a87ced3 4f3aa9aa
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 12 10:33:58 2024 +0800

    Merge commit '4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f' into release

commit 4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f
Merge: e3fd413d 1a69b518
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 12 10:30:00 2024 +0800

    Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

commit 1a69b5180de733f15550a1294a7221d6070306a0
Author: ruipeng <1041589370@qq.com>
Date:   Wed Dec 11 11:44:36 2024 +0800

    新增D600pro2、D1000的V0版机型

commit e3fd413d6256414441e9fe653c1132b1799a5cb2
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 10 14:34:13 2024 +0800

    修复打印时没有修改z偏移值 仍提示保存z偏移的按钮的bug

commit 594fb668fe94fe907c028bf65ecced43ea8660cb
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 10 14:25:04 2024 +0800

    设置自适应调平选项默认为关闭状态

commit 1a87ced3f5725569a6b9a7ee5f5250044d01d852
Merge: 629416d1 6064a6e1
Author: zkk <1007518571@qq.com>
Date:   Fri Nov 29 10:18:32 2024 +0800

    Merge branch 'develop' into release

# Conflicts:
#	panels/advanced.py
#	panels/nozzle_offset.py
#	panels/offset_fine_tune.py
#	panels/zcalibrate.py
 2024-12-31 15:14:35 +08:00
zkk
54298660a7 实现耗材页面点击当前激活的喷头可以设置温度功能 2024-11-09 13:52:32 +08:00
Alfredo Monclus
be2a3f664e extrude: use a custom temp update func 2024-06-12 11:22:18 -03:00
Alfredo Monclus
ac6f34acb0 extrude: move firmware retraction into the panel, add pressure advance control closes #724 2024-06-04 14:51:27 -03:00
Alfredo Monclus
2d2e80c3fd panels: allow to call them without name 2024-06-04 11:16:50 -03:00
alfrix
1afc67b354 panels: simplificate panel sub-menu system 2024-05-12 15:53:45 -03:00
alfrix
616574ed3b drop set_dev_stat and get_dev_stat 
this creates a parallel set of data that could become desynced
 2024-05-02 19:01:39 -03:00
Alfredo Monclus
14a02e5bcf
widgets: create autogrid: a custom grid that arranges itself (#1307) 2024-03-20 23:14:43 -03:00
Alfredo Monclus
5b7da9a9b8
extrude: add an extruder selector for machines with more than 5 extruders (#1249) 
makes the extrude panel support more extruders (unlimited, but icons from 0-11)
close #1195
 2024-01-25 22:53:16 -03:00
alfrix
81e76b1815 extrude: fix activate may not enable buttons 2024-01-15 14:42:10 -03:00
alfrix
d1168b5405 themes: get rid of the unused vertical selector buttons, simplify and rename the horizontal toggle strip 2024-01-10 23:30:39 -03:00
alfrix
05cd9a6d34 remove fallback values 
with an empty string re will not match
 2024-01-07 17:27:59 -03:00
alfrix
6cf639c083 refactor widget creation 
improves performance and makes the code cleaner

* add parameters instead of calling methods afterwards
* remove a a lot of size requests
* remove parameters that are being set to the default value
* simplify dialogs containers
 2024-01-02 08:14:51 -03:00
alfrix
6f32cdacbe layout: fix issues 2023-10-13 23:24:03 -03:00
alfrix
e01b6e5f26 macros: hide the panel if there are no elegible macros 2023-08-31 22:27:12 -03:00
alfrix
f3c2736f9f refactor temp updates for devices fix extruder_stepper icon error 2023-08-26 13:05:44 -03:00
Blonďák
af1de12f28
Spoolman support close #1060 
Refactor post_requrest
Switching to TreeView
More spool info
redesign toggle buttons
Allow spoolman while printing
Styling checkbox as switch
render Toggle switch-like
Fixed wrong timezones
Filtering spools
Removed translations of Spoolman
Spool image can be overided in theme
Added switch-on/off symbols to toggle
rename iter to i to avoid shadowing built-in function
remove redundant parenthesis
convert spoolcompare to static
merge check and treeview shared props
reduce spacing of buttons very useful for vertical/portrait
fix issue with remainings
add spoolman shortcut to extrude
Using backports.zoneinfo for python < 3.9
use decorators for properties
extract format_date function
change top row
last used sort
rebase on upstream
Fix for never used spools


Co-authored-by: alfrix <alfredomonclus@gmail.com>
 2023-08-19 18:43:45 -03:00
alfrix
e3cbc1ea8c extrude: show during printing but disable buttons during printing, this allows disabling and checking the filament sensor 2023-08-18 11:48:37 -03:00
alfrix
90fc3288d7 Use callbacks to disable and enable buttons to improve user feedback 
buttons now show a spinner if watiting for callback
 2023-08-18 11:48:37 -03:00
alfrix
e7b58edfbf klippygcodes: simplify and remove some alias that are irrelevant 2023-08-18 11:48:37 -03:00
alfrix
8d9236a2df screen: simplify panel loading 
this removes create_panel function from panels and mandates a class name Panel

remove panel_type param and only use a panel_name that is it's filename

remove load_panel dict

always reinit panel, (simpler and safer but slower)
 2023-07-30 12:22:58 -03:00
Chad Condon
e8a2d3443e
Improve name presentation (#1055) 
* Preserve manual capitalization

Avoid re-capitalizing names that already include uppercase letters.
This improves the presentation of names like "TMC2209", etc. when the
user has manually capitalized the name.

* Use title case

Use title case instead of only capitalizing the first character.
Ex. `heater_bed` now becomes "Heater Bed" instead of "Heater bed".
 2023-07-24 17:00:12 -03:00
alfrix
797ea99f33 extrude: change style to hexpand 2023-07-08 17:09:05 -03:00
alfrix
ffc5ff3c06 extrude: do not call T0 if there is only one extruder 2023-07-07 23:48:37 -03:00
alfrix
70d7564a78 shorten _screen.printer to _printer 2022-12-11 09:17:18 -03:00
alfrix
7120c424d4 gtk: resizability 
doesn't rescale the fonts or images
 2022-12-11 09:17:18 -03:00
alfrix
4dceeb77b6 extrude: fix filament sensor showing status when disabled 
alongside the initialization fixes this should be enough to close #825
 2022-11-30 11:00:10 -03:00
alfrix
b1a6d5c182 improve panel initialization 
just make a notify_status_update from printer data, it's much simpler
 2022-11-30 11:00:10 -03:00
alfrix
f8cde7bfe1 Add busy state, and disable buttons that usually take time during the state 2022-11-26 00:17:30 -03:00
alfrix
33fd5f9576 fix extrude speed buttons with no labels after 593d8c678be 2022-11-22 15:21:14 -03:00
alfrix
593d8c678b gtk: merge buttonimage and button 2022-11-22 14:55:42 -03:00
alfrix
d0d79a64df base_panel: simplify action bar buttons enable-disable 2022-11-21 09:20:05 -03:00
alfrix
dbd1474d63 screen_panel: share ks_printer_cfg between panels 2022-11-20 14:17:48 -03:00
alfrix
fc0f153023 reorder imports 2022-11-20 07:28:05 -03:00
alfrix
45ab86204b panels: remove initialize from the panels that do not have a menu 2022-11-18 00:53:53 -03:00
marcin-koziol
1dc3433e02
Set distance and speed variables after config is loaded (#782) 
Co-authored-by: Marcin Kozioł <marcin.koziol@outi.pl>
 2022-11-08 17:32:54 -03:00
alfrix
723662074e Change togglebuttons to regular buttons to simplify code 2022-10-14 10:19:44 -03:00
alfrix
2e026aef56 extrude: make the speed and distance configurable close #673 2022-10-14 10:19:44 -03:00
Laurenz
2cce477e5b
Add current heater power % to job status (#708) 
* Add current heater power % to job status

* Add show_heater_power config option and move update_temp()s to ScreenPanel

* Add the option to the UI config instead of the docs

* Prefer extra items on job_status over the power

There is not a lot of space, it's a trade off, and people will likely prefer extra_items

* Remove the comma, none of the other buttons have it

* job_status: inherit the parent config

* screen: create reload_panels to avoid some service restarts

* extrude: fix power breaking multi-extruder setups

* main and temp: remove degrees char from the table

* main and temp: revert removal of the header

Co-authored-by: alfrix <alfredomonclus@gmail.com>
 2022-09-09 11:34:50 -03:00
alfrix
eb17bb58ad screen_panel: remove unused parameters 2022-08-01 12:23:40 -03:00
alfrix
6510b2ec6b Refactor 
Use f-strings
Avoid unnecessary casts to str()bool()int()
Ensure file closure
Merge nested ifs
Simplify for-assigns-appends with comprehensions and internal functions
Avoid shadowing internal function names
Initialize variables
Return value directly instead of assign then return
Make some methods static
 2022-08-01 12:23:40 -03:00
alfrix
784253ca77 extrude: use macro naming when there is no temp 2022-07-03 12:03:50 -03:00
alfrix
5ad82a64d4 Translations: install _() 2022-07-03 12:03:50 -03:00
alfrix
831db2403d Fix potential issues with variables 2022-07-03 12:03:50 -03:00
alfrix
5a02ac75ae basic support for extruder_stepper 2022-07-03 12:03:50 -03:00
alfrix
3775dbd44e extruder: fix issue with filament_sensors fixes #634 2022-06-04 11:43:52 -03:00
alfrix
5a36729b76 PEP8, typos and warnings fixes 2022-05-31 11:14:42 -03:00
alfrix
7c8d4ea4d7 extrude: add filament sensor support 2022-05-31 11:14:42 -03:00
alfrix
6aa7f56231 extruder: fix temp overlap multi-extruder 2022-04-25 13:33:20 -03:00