Skip to content

v15.13.0 #2480

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
gabrielburnworth merged 27 commits into from
Feb 21, 2025
Merged

v15.13.0 #2480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ffefa80
add points and weeds to 3D garden
gabrielburnworth Feb 1, 2025
11da0de
remove unreachable plant info code
gabrielburnworth Feb 1, 2025
408f403
hide saved garden HUD on mobile
gabrielburnworth Feb 3, 2025
06e8c55
use kitVersion param in promo
roryaronson Feb 5, 2025
7a0196c
promo greenhouse scene
roryaronson Feb 5, 2025
1a97591
lint
roryaronson Feb 5, 2025
07056c0
better low detail color
roryaronson Feb 5, 2025
2c7a5cc
tests
roryaronson Feb 5, 2025
74b527f
more tests
roryaronson Feb 5, 2025
29c2de6
3rd times the charm?
roryaronson Feb 5, 2025
3120745
lint
roryaronson Feb 5, 2025
e20cbff
refactor and mock group to improve tests
gabrielburnworth Feb 5, 2025
26f8f14
refactor people
gabrielburnworth Feb 5, 2025
990c228
fix typo
gabrielburnworth Feb 5, 2025
e05226a
people fixes and cleanup
gabrielburnworth Feb 5, 2025
6f15c3b
organize 3D code
gabrielburnworth Feb 7, 2025
a44f947
add more index files
gabrielburnworth Feb 7, 2025
5e01872
connect bot position updates to 3D model
gabrielburnworth Feb 7, 2025
2591c71
handle negative z coordinates in 3D
gabrielburnworth Feb 11, 2025
7263a8c
fix crash upon point search: fixes #2479
gabrielburnworth Feb 12, 2025
ce86fe6
use filtered count for point groups
gabrielburnworth Feb 12, 2025
8dd2079
fix add tool navigation bug
gabrielburnworth Feb 18, 2025
3153d82
add some 3D user tools
gabrielburnworth Feb 19, 2025
50a49d9
add dev camera setting
gabrielburnworth Feb 19, 2025
d93e7bb
add more tools and bays
gabrielburnworth Feb 20, 2025
bec24d7
adjust positions and add seed trough
gabrielburnworth Feb 20, 2025
bfb22e7
change map size y default
gabrielburnworth Feb 21, 2025
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ upgrade_deps.sh
# ActiveStorage blobs:
storage/*
tmp
module_graph.*
14 changes: 14 additions & 0 deletions .madgerc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"excludeRegExp": [
"^(?!.*three_d_garden)",
"[/\\\\]components\\.tsx$",
"[/\\\\]config\\.ts$",
"[/\\\\]helpers\\.ts$",
"[/\\\\]constants\\.ts$",
"[/\\\\]__tests__[/\\\\]"
],
"fileExtensions": [
"ts",
"tsx"
]
}
8 changes: 4 additions & 4 deletions app/mutations/devices/seeders/abstract_express.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ def settings_change_firmware_config_defaults
def tool_slots_slot_1
add_tool_slot(name: ToolNames::SEED_TROUGH_1,
x: 0,
y: 25,
z: -100,
y: TROUGH_Y,
z: TROUGH_Z,
tool: tools_seed_trough_1,
pullout_direction: ToolSlot::NONE,
gantry_mounted: true)
Expand All @@ -40,8 +40,8 @@ def tool_slots_slot_1
def tool_slots_slot_2
add_tool_slot(name: ToolNames::SEED_TROUGH_2,
x: 0,
y: 50,
z: -100,
y: TROUGH_Y + TROUGH_SPACING,
z: TROUGH_Z,
tool: tools_seed_trough_2,
pullout_direction: ToolSlot::NONE,
gantry_mounted: true)
Expand Down
38 changes: 19 additions & 19 deletions app/mutations/devices/seeders/abstract_genesis.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,49 +27,49 @@ def settings_change_firmware_config_defaults

def tool_slots_slot_1
add_tool_slot(name: ToolNames::SEEDER,
x: 50,
y: 100,
z: -200,
x: TOOL_X,
y: TOOL_Y + 1 * TOOL_SPACING,
z: TOOL_Z,
tool: tools_seeder)
end

def tool_slots_slot_2
add_tool_slot(name: ToolNames::SEED_BIN,
x: 50,
y: 200,
z: -200,
x: TOOL_X,
y: TOOL_Y + 2 * TOOL_SPACING,
z: TOOL_Z,
tool: tools_seed_bin)
end

def tool_slots_slot_3
add_tool_slot(name: ToolNames::SEED_TRAY,
x: 50,
y: 300,
z: -200,
x: TOOL_X,
y: TOOL_Y + 3 * TOOL_SPACING,
z: TOOL_Z,
tool: tools_seed_tray)
end

def tool_slots_slot_4
add_tool_slot(name: ToolNames::WATERING_NOZZLE,
x: 50,
y: 500,
z: -200,
x: TOOL_X,
y: TOOL_Y + 5 * TOOL_SPACING,
z: TOOL_Z,
tool: tools_watering_nozzle)
end

def tool_slots_slot_5
add_tool_slot(name: ToolNames::SOIL_SENSOR,
x: 50,
y: 600,
z: -200,
x: TOOL_X,
y: TOOL_Y + 6 * TOOL_SPACING,
z: TOOL_Z,
tool: tools_soil_sensor)
end

def tool_slots_slot_6
add_tool_slot(name: ToolNames::WEEDER,
x: 50,
y: 700,
z: -200,
x: TOOL_X,
y: TOOL_Y + 7 * TOOL_SPACING,
z: TOOL_Z,
tool: tools_weeder)
end

Expand Down Expand Up @@ -174,7 +174,7 @@ def settings_default_map_size_x
end

def settings_default_map_size_y
device.web_app_config.update!(map_size_y: 1_400)
device.web_app_config.update!(map_size_y: 1_230)
end

def pin_bindings_button_1
Expand Down
2 changes: 1 addition & 1 deletion app/mutations/devices/seeders/abstract_seeder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ def settings_change_firmware_config_defaults; end
def settings_soil_height; end

def settings_soil_height
device.fbos_config.update!(soil_height: -200)
device.fbos_config.update!(soil_height: -500)
end

def tool_slots_slot_1; end
Expand Down
9 changes: 9 additions & 0 deletions app/mutations/devices/seeders/constants.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ module Constants
ANALOG = CeleryScriptSettingsBag::ANALOG
DIGITAL = CeleryScriptSettingsBag::DIGITAL

TOOL_X = 6
TOOL_Y = 100
TOOL_Z = -340
TOOL_SPACING = 100

TROUGH_Y = 0
TROUGH_Z = -200
TROUGH_SPACING = 25

module Names
EXPRESS = "FarmBot Express"
EXPRESS_XL = "FarmBot Express XL"
Expand Down
8 changes: 4 additions & 4 deletions app/mutations/devices/seeders/genesis_one_five.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ def settings_firmware
def tool_slots_slot_7
add_tool_slot(name: ToolNames::SEED_TROUGH_1,
x: 0,
y: 25,
z: -100,
y: TROUGH_Y,
z: TROUGH_Z,
tool: tools_seed_trough_1,
pullout_direction: ToolSlot::NONE,
gantry_mounted: true)
Expand All @@ -20,8 +20,8 @@ def tool_slots_slot_7
def tool_slots_slot_8
add_tool_slot(name: ToolNames::SEED_TROUGH_2,
x: 0,
y: 50,
z: -100,
y: TROUGH_Y + TROUGH_SPACING,
z: TROUGH_Z,
tool: tools_seed_trough_2,
pullout_direction: ToolSlot::NONE,
gantry_mounted: true)
Expand Down
14 changes: 7 additions & 7 deletions app/mutations/devices/seeders/genesis_one_seven.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ def peripherals_rotary_tool_reverse

def tool_slots_slot_6
add_tool_slot(name: ToolNames::ROTARY_TOOL,
x: 50,
y: 700,
z: -200,
x: TOOL_X,
y: TOOL_Y + 7 * TOOL_SPACING,
z: TOOL_Z,
tool: tools_rotary)
end

def tool_slots_slot_7
add_tool_slot(name: ToolNames::SEED_TROUGH_1,
x: 0,
y: 25,
z: -100,
y: TROUGH_Y,
z: TROUGH_Z,
tool: tools_seed_trough_1,
pullout_direction: ToolSlot::NONE,
gantry_mounted: true)
Expand All @@ -36,8 +36,8 @@ def tool_slots_slot_7
def tool_slots_slot_8
add_tool_slot(name: ToolNames::SEED_TROUGH_2,
x: 0,
y: 50,
z: -100,
y: TROUGH_Y + TROUGH_SPACING,
z: TROUGH_Z,
tool: tools_seed_trough_2,
pullout_direction: ToolSlot::NONE,
gantry_mounted: true)
Expand Down
14 changes: 7 additions & 7 deletions app/mutations/devices/seeders/genesis_one_six.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ def peripherals_rotary_tool_reverse

def tool_slots_slot_7
add_tool_slot(name: ToolNames::ROTARY_TOOL,
x: 50,
y: 800,
z: -200,
x: TOOL_X,
y: TOOL_Y + 8 * TOOL_SPACING,
z: TOOL_Z,
tool: tools_rotary)
end

def tool_slots_slot_8
add_tool_slot(name: ToolNames::SEED_TROUGH_1,
x: 0,
y: 25,
z: -100,
y: TROUGH_Y,
z: TROUGH_Z,
tool: tools_seed_trough_1,
pullout_direction: ToolSlot::NONE,
gantry_mounted: true)
Expand All @@ -36,8 +36,8 @@ def tool_slots_slot_8
def tool_slots_slot_9
add_tool_slot(name: ToolNames::SEED_TROUGH_2,
x: 0,
y: 50,
z: -100,
y: TROUGH_Y + TROUGH_SPACING,
z: TROUGH_Z,
tool: tools_seed_trough_2,
pullout_direction: ToolSlot::NONE,
gantry_mounted: true)
Expand Down
10 changes: 5 additions & 5 deletions app/mutations/devices/seeders/genesis_xl_one_five.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ def settings_default_map_size_x
end

def settings_default_map_size_y
device.web_app_config.update!(map_size_y: 2_900)
device.web_app_config.update!(map_size_y: 2_730)
end

def tool_slots_slot_7
add_tool_slot(name: ToolNames::SEED_TROUGH_1,
x: 0,
y: 25,
z: -100,
y: TROUGH_Y,
z: TROUGH_Z,
tool: tools_seed_trough_1,
pullout_direction: ToolSlot::NONE,
gantry_mounted: true)
Expand All @@ -32,8 +32,8 @@ def tool_slots_slot_7
def tool_slots_slot_8
add_tool_slot(name: ToolNames::SEED_TROUGH_2,
x: 0,
y: 50,
z: -100,
y: TROUGH_Y + TROUGH_SPACING,
z: TROUGH_Z,
tool: tools_seed_trough_2,
pullout_direction: ToolSlot::NONE,
gantry_mounted: true)
Expand Down
2 changes: 1 addition & 1 deletion app/mutations/devices/seeders/genesis_xl_one_four.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def settings_default_map_size_x
end

def settings_default_map_size_y
device.web_app_config.update!(map_size_y: 2_900)
device.web_app_config.update!(map_size_y: 2_730)
end
end
end
Expand Down
16 changes: 8 additions & 8 deletions app/mutations/devices/seeders/genesis_xl_one_seven.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def settings_default_map_size_x
end

def settings_default_map_size_y
device.web_app_config.update!(map_size_y: 2_900)
device.web_app_config.update!(map_size_y: 2_730)
end

def peripherals_rotary_tool
Expand All @@ -29,17 +29,17 @@ def peripherals_rotary_tool_reverse

def tool_slots_slot_6
add_tool_slot(name: ToolNames::ROTARY_TOOL,
x: 50,
y: 700,
z: -200,
x: TOOL_X,
y: TOOL_Y + 7 * TOOL_SPACING,
z: TOOL_Z,
tool: tools_rotary)
end

def tool_slots_slot_7
add_tool_slot(name: ToolNames::SEED_TROUGH_1,
x: 0,
y: 25,
z: -100,
y: TROUGH_Y,
z: TROUGH_Z,
tool: tools_seed_trough_1,
pullout_direction: ToolSlot::NONE,
gantry_mounted: true)
Expand All @@ -48,8 +48,8 @@ def tool_slots_slot_7
def tool_slots_slot_8
add_tool_slot(name: ToolNames::SEED_TROUGH_2,
x: 0,
y: 50,
z: -100,
y: TROUGH_Y + TROUGH_SPACING,
z: TROUGH_Z,
tool: tools_seed_trough_2,
pullout_direction: ToolSlot::NONE,
gantry_mounted: true)
Expand Down
16 changes: 8 additions & 8 deletions app/mutations/devices/seeders/genesis_xl_one_six.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def settings_default_map_size_x
end

def settings_default_map_size_y
device.web_app_config.update!(map_size_y: 2_900)
device.web_app_config.update!(map_size_y: 2_730)
end

def peripherals_rotary_tool
Expand All @@ -29,17 +29,17 @@ def peripherals_rotary_tool_reverse

def tool_slots_slot_7
add_tool_slot(name: ToolNames::ROTARY_TOOL,
x: 50,
y: 800,
z: -200,
x: TOOL_X,
y: TOOL_Y + 8 * TOOL_SPACING,
z: TOOL_Z,
tool: tools_rotary)
end

def tool_slots_slot_8
add_tool_slot(name: ToolNames::SEED_TROUGH_1,
x: 0,
y: 25,
z: -100,
y: TROUGH_Y,
z: TROUGH_Z,
tool: tools_seed_trough_1,
pullout_direction: ToolSlot::NONE,
gantry_mounted: true)
Expand All @@ -48,8 +48,8 @@ def tool_slots_slot_8
def tool_slots_slot_9
add_tool_slot(name: ToolNames::SEED_TROUGH_2,
x: 0,
y: 50,
z: -100,
y: TROUGH_Y + TROUGH_SPACING,
z: TROUGH_Z,
tool: tools_seed_trough_2,
pullout_direction: ToolSlot::NONE,
gantry_mounted: true)
Expand Down
Loading