Skip to content

Commit

Permalink
Merge pull request #2480 from FarmBot/staging
Browse files Browse the repository at this point in the history 
v15.13.0
  • Loading branch information
@gabrielburnworth
gabrielburnworth authored Feb 21, 2025
2 parents 8161618 + bfb22e7 commit 0ac5f4f
Show file tree
Hide file tree
Showing 157 changed files with 2,518 additions and 966 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
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
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
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
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
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
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
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
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
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
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
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
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
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

0 comments on commit 0ac5f4f

Please sign in to comment.