Skip to content

Last Submission #112

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

Merged
dan-moraru merged 4 commits into from
Apr 17, 2026
Merged

Last Submission #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a6d7cb
Add animated sprites, connected wall tiles, and updated icons
zajalist Apr 17, 2026
631d528
fixed stuff aniomation blender idk
zajalist Apr 17, 2026
814f425
changed config entity names to match
dan-moraru Apr 17, 2026
5778ec6
updated upper bound for max tasks to 50k
mfsohail12 Apr 17, 2026
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
6 changes: 3 additions & 3 deletions open-robotics/configs/..valid.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"config" : {
"runId" : "ebc72ee6-96dc-4bb3-a878-6f8e7df4cf02",
"runId" : "e0255128-8a9e-4f70-8141-13275f6f698a",
"runName" : "default_run",
"tickMs" : 100,
"maxTicks" : 5000,
Expand All @@ -15,14 +15,14 @@
"manualTaskAssignment" : false
},
"map" : {
"mapId" : "4ef3d4b7-a31b-4aab-8064-b16b7de126b6",
"mapId" : "7796b51c-148b-4555-a2cd-c3081fd033cc",
"width" : 8,
"height" : 8,
"tiles" : [ ]
},
"entities" : {
"robots" : [ {
"id" : "bb6e0a02-c19d-4200-9c79-8c2f0feb95e3",
"id" : "944fb9eb-0d4a-4551-89f3-55051269d0d0",
"name" : "R1",
"position" : {
"x" : 1,
Expand Down
16 changes: 8 additions & 8 deletions open-robotics/configs/observalble_deadlock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,63 +122,63 @@
} ],
"obstacles" : [ {
"id" : "f0000000-0000-4000-a000-000000000001",
"name" : "Shelf-L1",
"name" : "Wall-L1",
"position" : {
"x" : 4,
"y" : 3
},
"type" : null
}, {
"id" : "f0000000-0000-4000-a000-000000000002",
"name" : "Shelf-L2",
"name" : "Wall-L2",
"position" : {
"x" : 4,
"y" : 4
},
"type" : null
}, {
"id" : "f0000000-0000-4000-a000-000000000003",
"name" : "Shelf-L3",
"name" : "Wall-L3",
"position" : {
"x" : 4,
"y" : 5
},
"type" : null
}, {
"id" : "f0000000-0000-4000-a000-000000000004",
"name" : "Shelf-L4",
"name" : "Wall-L4",
"position" : {
"x" : 4,
"y" : 6
},
"type" : null
}, {
"id" : "f0000000-0000-4000-a000-000000000005",
"name" : "Shelf-R1",
"name" : "Wall-R1",
"position" : {
"x" : 7,
"y" : 3
},
"type" : null
}, {
"id" : "f0000000-0000-4000-a000-000000000006",
"name" : "Shelf-R2",
"name" : "Wall-R2",
"position" : {
"x" : 7,
"y" : 4
},
"type" : null
}, {
"id" : "f0000000-0000-4000-a000-000000000007",
"name" : "Shelf-R3",
"name" : "Wall-R3",
"position" : {
"x" : 7,
"y" : 5
},
"type" : null
}, {
"id" : "f0000000-0000-4000-a000-000000000008",
"name" : "Shelf-R4",
"name" : "Wall-R4",
"position" : {
"x" : 7,
"y" : 6
Expand Down
16 changes: 8 additions & 8 deletions open-robotics/configs/test3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,63 +117,63 @@
} ],
"obstacles" : [ {
"id" : "f0000000-0000-4000-a000-000000000001",
"name" : "Shelf-L1",
"name" : "Wall-L1",
"position" : {
"x" : 4,
"y" : 3
},
"type" : null
}, {
"id" : "f0000000-0000-4000-a000-000000000002",
"name" : "Shelf-L2",
"name" : "Wall-L2",
"position" : {
"x" : 4,
"y" : 4
},
"type" : null
}, {
"id" : "f0000000-0000-4000-a000-000000000003",
"name" : "Shelf-L3",
"name" : "Wall-L3",
"position" : {
"x" : 4,
"y" : 5
},
"type" : null
}, {
"id" : "f0000000-0000-4000-a000-000000000004",
"name" : "Shelf-L4",
"name" : "Wall-L4",
"position" : {
"x" : 4,
"y" : 6
},
"type" : null
}, {
"id" : "f0000000-0000-4000-a000-000000000005",
"name" : "Shelf-R1",
"name" : "Wall-R1",
"position" : {
"x" : 7,
"y" : 3
},
"type" : null
}, {
"id" : "f0000000-0000-4000-a000-000000000006",
"name" : "Shelf-R2",
"name" : "Wall-R2",
"position" : {
"x" : 7,
"y" : 4
},
"type" : null
}, {
"id" : "f0000000-0000-4000-a000-000000000007",
"name" : "Shelf-R3",
"name" : "Wall-R3",
"position" : {
"x" : 7,
"y" : 5
},
"type" : null
}, {
"id" : "f0000000-0000-4000-a000-000000000008",
"name" : "Shelf-R4",
"name" : "Wall-R4",
"position" : {
"x" : 7,
"y" : 6
Expand Down
2 changes: 1 addition & 1 deletion open-robotics/configs/test_scenario.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
} ],
"stations" : [ {
"id" : "00000000-0000-0000-0000-000000000010",
"name" : "Pickup-A",
"name" : "Delivery-A",
"position" : {
"x" : 0,
"y" : 4
Expand Down
2 changes: 1 addition & 1 deletion open-robotics/configs/warehouse_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
} ],
"obstacles" : [ {
"id" : "20000000-0000-0000-0000-000000000001",
"name" : "Obstacle-01",
"name" : "wall_0",
"position" : {
"x" : 6,
"y" : 3
Expand Down
2 changes: 1 addition & 1 deletion open-robotics/src/main/java/com/openrobotics/controllers/SetupController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,7 +976,7 @@ private boolean validate() {
}

// Integer Bounds
if (!checkIntBound(maxTasksField, "Max Tasks", 1, 500)) return false;
if (!checkIntBound(maxTasksField, "Max Tasks", 1, 50000)) return false;
if (!checkIntBound(maxTicksField, "Max Ticks", 1, 1000000)) return false;

// Float Bounds
Expand Down
Loading
Loading