Skip to content

Commit 162fdd2

Browse files
kinn-edendevkinn-edendev
committed
fix: re-added timer because it was removed previous (how did this happen)
1 parent c7661b8 commit 162fdd2

6 files changed

Lines changed: 47 additions & 27 deletions

File tree

‎frontend/labmap2/.godot/editor/editor_layout.cfg‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ dock_5="Inspector,Node,History"
2727

2828
open_scenes=PackedStringArray("res://scenes/floor_map.tscn")
2929
current_scene="res://scenes/floor_map.tscn"
30-
center_split_offset=-288
30+
center_split_offset=-324
3131
selected_default_debugger_tab_idx=4
3232
selected_main_editor_idx=2
3333
selected_bottom_panel_item=1
3434

3535
[ScriptEditor]
3636

37-
open_scripts=["res://scripts/background_light.gd", "res://scenes/clock.gd", "res://scenes/http_get_lab_hours.gd", "res://scripts/http_request_node.gd", "res://name_dictionary.json"]
38-
selected_script="res://scripts/http_request_node.gd"
37+
open_scripts=["res://scripts/background_light.gd", "res://scenes/clock.gd", "res://scripts/devices.gd", "res://scripts/http_request_node.gd", "res://name_dictionary.json"]
38+
selected_script="res://scenes/clock.gd"
3939
open_help=[]
4040
script_split_offset=70
4141
list_split_offset=0

‎frontend/labmap2/.godot/editor/filesystem_cache8‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ea4bc82a6ad023ab7ee23ee620429895
2-
::res://::1757542631
2+
::res://::1757639556
33
export_presets.cfg::TextFile::-1::1756840323::0::1::::<><>::
44
icon.svg::CompressedTexture2D::8019015828006172325::1729218193::1756852168::1::::<><>::
55
name_dictionary.json::JSON::-1::1756858929::0::1::::<><>::
@@ -13,14 +13,14 @@ table_sheet.png::CompressedTexture2D::921768295176594968::1733372692::1756852168
1313
waddles-stand-back.png::CompressedTexture2D::4205090806430381745::1731433279::1756852168::1::::<><>::
1414
waddles-stand-front.png::CompressedTexture2D::2259515878044405065::1731433279::1756852168::1::::<><>::
1515
wall_sheet.png::CompressedTexture2D::7034852701591905200::1733372300::1756852168::1::::<><>::
16-
::res://export/::1757005065
17-
Labmap2.144x144.png::CompressedTexture2D::3033371992561294965::1756953568::1757005065::1::::<><>::
18-
Labmap2.180x180.png::CompressedTexture2D::5448115414281155812::1756953568::1757005065::1::::<><>::
19-
Labmap2.512x512.png::CompressedTexture2D::3088098711088801647::1756953568::1757005065::1::::<><>::
20-
Labmap2.apple-touch-icon.png::CompressedTexture2D::8947455212634037835::1756953568::1757005065::1::::<><>::
21-
Labmap2.icon.png::CompressedTexture2D::6108776289350885466::1756953568::1757005065::1::::<><>::
22-
Labmap2.manifest.json::JSON::-1::1756953568::0::1::::<><>::
23-
Labmap2.png::CompressedTexture2D::2903267927140575369::1756953568::1757005065::1::::<><>::
16+
::res://export/::1757638298
17+
Labmap2.144x144.png::CompressedTexture2D::3033371992561294965::1757544485::1757638298::1::::<><>::
18+
Labmap2.180x180.png::CompressedTexture2D::5448115414281155812::1757544485::1757638298::1::::<><>::
19+
Labmap2.512x512.png::CompressedTexture2D::3088098711088801647::1757544485::1757638298::1::::<><>::
20+
Labmap2.apple-touch-icon.png::CompressedTexture2D::8947455212634037835::1757544485::1757638298::1::::<><>::
21+
Labmap2.icon.png::CompressedTexture2D::6108776289350885466::1757544485::1757638298::1::::<><>::
22+
Labmap2.manifest.json::JSON::-1::1757544485::0::1::::<><>::
23+
Labmap2.png::CompressedTexture2D::2903267927140575369::1757544485::1757638298::1::::<><>::
2424
::res://paths/::1756859171
2525
to_bandit.tres::Curve2D::3964835214106076797::1733372300::0::1::::<><>::
2626
to_bolt.tres::Curve2D::212375828273240441::1733372300::0::1::::<><>::
@@ -52,19 +52,19 @@ to_spud.tres::Curve2D::5178034277345821971::1733372300::0::1::::<><>::
5252
to_sunny.tres::Curve2D::1867299367943324528::1733372300::0::1::::<><>::
5353
to_tabitha.tres::Curve2D::3352327448385657489::1733372300::0::1::::<><>::
5454
to_Windows.tres::Curve2D::396053016331995211::1733372300::0::1::::<><>::
55-
::res://scenes/::1757005630
55+
::res://scenes/::1757639167
5656
clock.gd::GDScript::-1::1756948383::0::1::::<>RichTextLabel<>::
57-
floor_map.tscn::PackedScene::7631678058768377369::1757005246::0::1::::<><>::res://scripts/floor_map.gd<>uid://cqt0vr61f2bxi::::res://art/floor_sheet.png<>uid://nernh4erw8au::::res://art/table_sheet.png<>uid://c7hy84ujceanw::::res://art/wall_sheet.png<>res://scripts/devices.gd<>res://scripts/logger.gd<>uid://r8t7n7pqbnov::::res://paths/to_misty.tres<>uid://brs2mnfeqqby3::::res://scenes/log_display.tscn<>res://scripts/http_request_node.gd<>uid://dtlrn0pyxevuv::::res://art/background.png<>res://scripts/background_light.gd<>uid://cuaj5txrl38kg::::res://art/background2.png<>res://scenes/clock.gd<>res://scenes/http_get_lab_hours.gd
57+
floor_map.tscn::PackedScene::7631678058768377369::1757639167::0::1::::<><>::res://scripts/floor_map.gd<>uid://cqt0vr61f2bxi::::res://art/floor_sheet.png<>uid://nernh4erw8au::::res://art/table_sheet.png<>uid://c7hy84ujceanw::::res://art/wall_sheet.png<>res://scripts/devices.gd<>res://scripts/logger.gd<>uid://r8t7n7pqbnov::::res://paths/to_misty.tres<>uid://brs2mnfeqqby3::::res://scenes/log_display.tscn<>res://scripts/http_request_node.gd<>uid://dtlrn0pyxevuv::::res://art/background.png<>res://scripts/background_light.gd<>uid://cuaj5txrl38kg::::res://art/background2.png<>res://scenes/clock.gd<>res://scenes/http_get_lab_hours.gd
5858
http_get_lab_hours.gd::GDScript::-1::1757005630::0::1::::<>HTTPRequest<>::
5959
log_display.tscn::PackedScene::3618451304175608720::1733440536::0::1::::<><>::res://scripts/log_display.gd
6060
node.gd::GDScript::-1::1733372300::0::1::::<>Node<>::
6161
waddles.tscn::PackedScene::1364462654114510386::1733440536::0::1::::<><>::res://scripts/waddles.gd<>uid://7gr5qh15e2r2::::res://art/waddles-stand-front.png<>uid://b058h4jq37mpd::::res://art/waddles-stand-back.png<>res://scripts/waddles_sprite.gd
62-
::res://scripts/::1756949892
62+
::res://scripts/::1757639167
6363
background_light.gd::GDScript::-1::1756949892::0::1::::<>Sprite2D<>::
6464
devices.gd::GDScript::-1::1733455604::0::1::::<>TileMapLayer<>::
6565
device_class.gd::GDScript::-1::1732162144::0::1::::Device<>Object<>::
6666
floor_map.gd::GDScript::-1::1733372300::0::1::::<>Node2D<>::
67-
http_request_node.gd::GDScript::-1::1756840323::0::1::::<>HTTPRequest<>::
67+
http_request_node.gd::GDScript::-1::1757639167::0::1::::<>HTTPRequest<>::
6868
logger.gd::GDScript::-1::1732162144::0::1::::<>Node<>::
6969
log_display.gd::GDScript::-1::1732162144::0::1::::<>Control<>::
7070
waddles.gd::GDScript::-1::1733372300::0::1::::<>Node2D<>::

‎frontend/labmap2/.godot/editor/project_metadata.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use_advanced_connections=false
66
[recent_files]
77

88
scenes=["res://scenes/floor_map.tscn"]
9-
scripts=["res://scripts/http_request_node.gd", "res://scripts/background_light.gd", "res://scenes/http_get_lab_hours.gd", "res://scenes/clock.gd", "res://scripts/devices.gd", "res://name_dictionary.json", "res://scripts/floor_map.gd"]
9+
scripts=["res://scripts/devices.gd", "res://scripts/http_request_node.gd", "res://scripts/background_light.gd", "res://scenes/http_get_lab_hours.gd", "res://scenes/clock.gd", "res://name_dictionary.json", "res://scripts/floor_map.gd"]
1010

1111
[export_options]
1212

‎frontend/labmap2/.godot/editor/script_editor_cache.cfg‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ state={
1717
state={
1818
"bookmarks": PackedInt32Array(),
1919
"breakpoints": PackedInt32Array(),
20-
"column": 0,
20+
"column": 15,
2121
"folded_lines": Array[int]([]),
2222
"h_scroll_position": 0,
23-
"row": 6,
24-
"scroll_position": 0.0,
23+
"row": 79,
24+
"scroll_position": 53.0,
2525
"selection": false,
2626
"syntax_highlighter": "GDScript"
2727
}
@@ -35,7 +35,7 @@ state={
3535
"folded_lines": Array[int]([]),
3636
"h_scroll_position": 0,
3737
"row": 28,
38-
"scroll_position": 0.0,
38+
"scroll_position": 10.0,
3939
"selection": false,
4040
"syntax_highlighter": "JSON"
4141
}
@@ -45,11 +45,11 @@ state={
4545
state={
4646
"bookmarks": PackedInt32Array(),
4747
"breakpoints": PackedInt32Array(),
48-
"column": 21,
48+
"column": 51,
4949
"folded_lines": Array[int]([]),
5050
"h_scroll_position": 0,
51-
"row": 15,
52-
"scroll_position": 16.0,
51+
"row": 184,
52+
"scroll_position": 174.0,
5353
"selection": false,
5454
"syntax_highlighter": "GDScript"
5555
}
@@ -59,11 +59,11 @@ state={
5959
state={
6060
"bookmarks": PackedInt32Array(),
6161
"breakpoints": PackedInt32Array(),
62-
"column": 57,
62+
"column": 3,
6363
"folded_lines": Array[int]([]),
6464
"h_scroll_position": 0,
65-
"row": 58,
66-
"scroll_position": 37.0,
65+
"row": 59,
66+
"scroll_position": 25.0,
6767
"selection": false,
6868
"syntax_highlighter": "GDScript"
6969
}

‎frontend/labmap2/scripts/devices.gd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ func _on_update_timer_timeout() -> void:
182182

183183
func _on_http_request_node_result_ready(endpoint: String) -> void:
184184
# Connecting from HTTPRequestNode
185+
print("_on_http_request_node_result_ready is ran")
185186
if endpoint == $HTTPRequestNode.GENERATE:
186187
_handle_generate_data()
187188
elif endpoint == $HTTPRequestNode.GET:

‎frontend/labmap2/scripts/http_request_node.gd‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ extends HTTPRequest
99

1010
@onready var http_generate := HTTPRequest.new()
1111
@onready var http_get := HTTPRequest.new()
12+
@onready var update_timer := Timer.new()
1213

1314
@onready var result_from_generate: Dictionary = {}
1415
@onready var result_from_get: Dictionary = {}
@@ -24,6 +25,11 @@ func _ready():
2425

2526
http_generate.request_completed.connect(_on_generate_completed)
2627
http_get.request_completed.connect(_on_get_completed)
28+
29+
update_timer.wait_time = 5.0 # 5 seconds
30+
update_timer.one_shot = false
31+
update_timer.timeout.connect(_on_update_timer_timeout)
32+
add_child(update_timer)
2733

2834
_send_http_request(http_generate, GENERATE)
2935
_send_http_request(http_get, GET)
@@ -49,6 +55,7 @@ func _on_generate_completed(result, response_code, _headers, body):
4955
emit_signal("result_ready", GENERATE)
5056
else:
5157
Logger.log("Error parsing generate response", "Error", "DATA_GENERATOR")
58+
update_timer.start()
5259

5360
func _on_get_completed(result, response_code, _headers, body):
5461
if result != HTTPRequest.RESULT_SUCCESS or response_code != 200:
@@ -61,3 +68,15 @@ func _on_get_completed(result, response_code, _headers, body):
6168
emit_signal("result_ready", GET)
6269
else:
6370
Logger.log("Error parsing get response", "Error", "DATA_GENERATOR")
71+
72+
func _on_update_timer_timeout() -> void:
73+
var generate_status = http_generate.get_http_client_status()
74+
var get_status = http_generate.get_http_client_status()
75+
print("_on_update_timer_timeout is ran")
76+
print("generate_status: ", generate_status, " get_status: ", get_status)
77+
if generate_status in [0, 5]:
78+
print("_send_http_request(http_generate, GENERATE) is ran")
79+
_send_http_request(http_generate, GENERATE)
80+
if get_status in [0, 5]:
81+
print("_send_http_request(http_generate, GET) is ran")
82+
_send_http_request(http_get, GET)

0 commit comments

Comments
 (0)