Skip to content

Commit 0ac5f4f

Browse files
gabrielburnworthgabrielburnworth
authored
Merge pull request #2480 from FarmBot/staging
v15.13.0
2 parents 8161618 + bfb22e7 commit 0ac5f4f

File tree

157 files changed

+2518
-966
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+2518
-966
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ upgrade_deps.sh
3030
# ActiveStorage blobs:
3131
storage/*
3232
tmp
33+
module_graph.*

‎.madgerc

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"excludeRegExp": [
3+
"^(?!.*three_d_garden)",
4+
"[/\\\\]components\\.tsx$",
5+
"[/\\\\]config\\.ts$",
6+
"[/\\\\]helpers\\.ts$",
7+
"[/\\\\]constants\\.ts$",
8+
"[/\\\\]__tests__[/\\\\]"
9+
],
10+
"fileExtensions": [
11+
"ts",
12+
"tsx"
13+
]
14+
}

‎app/mutations/devices/seeders/abstract_express.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ def settings_change_firmware_config_defaults
3030
def tool_slots_slot_1
3131
add_tool_slot(name: ToolNames::SEED_TROUGH_1,
3232
x: 0,
33-
y: 25,
34-
z: -100,
33+
y: TROUGH_Y,
34+
z: TROUGH_Z,
3535
tool: tools_seed_trough_1,
3636
pullout_direction: ToolSlot::NONE,
3737
gantry_mounted: true)
@@ -40,8 +40,8 @@ def tool_slots_slot_1
4040
def tool_slots_slot_2
4141
add_tool_slot(name: ToolNames::SEED_TROUGH_2,
4242
x: 0,
43-
y: 50,
44-
z: -100,
43+
y: TROUGH_Y + TROUGH_SPACING,
44+
z: TROUGH_Z,
4545
tool: tools_seed_trough_2,
4646
pullout_direction: ToolSlot::NONE,
4747
gantry_mounted: true)

‎app/mutations/devices/seeders/abstract_genesis.rb

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,49 +27,49 @@ def settings_change_firmware_config_defaults
2727

2828
def tool_slots_slot_1
2929
add_tool_slot(name: ToolNames::SEEDER,
30-
x: 50,
31-
y: 100,
32-
z: -200,
30+
x: TOOL_X,
31+
y: TOOL_Y + 1 * TOOL_SPACING,
32+
z: TOOL_Z,
3333
tool: tools_seeder)
3434
end
3535

3636
def tool_slots_slot_2
3737
add_tool_slot(name: ToolNames::SEED_BIN,
38-
x: 50,
39-
y: 200,
40-
z: -200,
38+
x: TOOL_X,
39+
y: TOOL_Y + 2 * TOOL_SPACING,
40+
z: TOOL_Z,
4141
tool: tools_seed_bin)
4242
end
4343

4444
def tool_slots_slot_3
4545
add_tool_slot(name: ToolNames::SEED_TRAY,
46-
x: 50,
47-
y: 300,
48-
z: -200,
46+
x: TOOL_X,
47+
y: TOOL_Y + 3 * TOOL_SPACING,
48+
z: TOOL_Z,
4949
tool: tools_seed_tray)
5050
end
5151

5252
def tool_slots_slot_4
5353
add_tool_slot(name: ToolNames::WATERING_NOZZLE,
54-
x: 50,
55-
y: 500,
56-
z: -200,
54+
x: TOOL_X,
55+
y: TOOL_Y + 5 * TOOL_SPACING,
56+
z: TOOL_Z,
5757
tool: tools_watering_nozzle)
5858
end
5959

6060
def tool_slots_slot_5
6161
add_tool_slot(name: ToolNames::SOIL_SENSOR,
62-
x: 50,
63-
y: 600,
64-
z: -200,
62+
x: TOOL_X,
63+
y: TOOL_Y + 6 * TOOL_SPACING,
64+
z: TOOL_Z,
6565
tool: tools_soil_sensor)
6666
end
6767

6868
def tool_slots_slot_6
6969
add_tool_slot(name: ToolNames::WEEDER,
70-
x: 50,
71-
y: 700,
72-
z: -200,
70+
x: TOOL_X,
71+
y: TOOL_Y + 7 * TOOL_SPACING,
72+
z: TOOL_Z,
7373
tool: tools_weeder)
7474
end
7575

@@ -174,7 +174,7 @@ def settings_default_map_size_x
174174
end
175175

176176
def settings_default_map_size_y
177-
device.web_app_config.update!(map_size_y: 1_400)
177+
device.web_app_config.update!(map_size_y: 1_230)
178178
end
179179

180180
def pin_bindings_button_1

‎app/mutations/devices/seeders/abstract_seeder.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ def settings_change_firmware_config_defaults; end
227227
def settings_soil_height; end
228228

229229
def settings_soil_height
230-
device.fbos_config.update!(soil_height: -200)
230+
device.fbos_config.update!(soil_height: -500)
231231
end
232232

233233
def tool_slots_slot_1; end

‎app/mutations/devices/seeders/constants.rb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ module Constants
44
ANALOG = CeleryScriptSettingsBag::ANALOG
55
DIGITAL = CeleryScriptSettingsBag::DIGITAL
66

7+
TOOL_X = 6
8+
TOOL_Y = 100
9+
TOOL_Z = -340
10+
TOOL_SPACING = 100
11+
12+
TROUGH_Y = 0
13+
TROUGH_Z = -200
14+
TROUGH_SPACING = 25
15+
716
module Names
817
EXPRESS = "FarmBot Express"
918
EXPRESS_XL = "FarmBot Express XL"

‎app/mutations/devices/seeders/genesis_one_five.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ def settings_firmware
1010
def tool_slots_slot_7
1111
add_tool_slot(name: ToolNames::SEED_TROUGH_1,
1212
x: 0,
13-
y: 25,
14-
z: -100,
13+
y: TROUGH_Y,
14+
z: TROUGH_Z,
1515
tool: tools_seed_trough_1,
1616
pullout_direction: ToolSlot::NONE,
1717
gantry_mounted: true)
@@ -20,8 +20,8 @@ def tool_slots_slot_7
2020
def tool_slots_slot_8
2121
add_tool_slot(name: ToolNames::SEED_TROUGH_2,
2222
x: 0,
23-
y: 50,
24-
z: -100,
23+
y: TROUGH_Y + TROUGH_SPACING,
24+
z: TROUGH_Z,
2525
tool: tools_seed_trough_2,
2626
pullout_direction: ToolSlot::NONE,
2727
gantry_mounted: true)

‎app/mutations/devices/seeders/genesis_one_seven.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ def peripherals_rotary_tool_reverse
1717

1818
def tool_slots_slot_6
1919
add_tool_slot(name: ToolNames::ROTARY_TOOL,
20-
x: 50,
21-
y: 700,
22-
z: -200,
20+
x: TOOL_X,
21+
y: TOOL_Y + 7 * TOOL_SPACING,
22+
z: TOOL_Z,
2323
tool: tools_rotary)
2424
end
2525

2626
def tool_slots_slot_7
2727
add_tool_slot(name: ToolNames::SEED_TROUGH_1,
2828
x: 0,
29-
y: 25,
30-
z: -100,
29+
y: TROUGH_Y,
30+
z: TROUGH_Z,
3131
tool: tools_seed_trough_1,
3232
pullout_direction: ToolSlot::NONE,
3333
gantry_mounted: true)
@@ -36,8 +36,8 @@ def tool_slots_slot_7
3636
def tool_slots_slot_8
3737
add_tool_slot(name: ToolNames::SEED_TROUGH_2,
3838
x: 0,
39-
y: 50,
40-
z: -100,
39+
y: TROUGH_Y + TROUGH_SPACING,
40+
z: TROUGH_Z,
4141
tool: tools_seed_trough_2,
4242
pullout_direction: ToolSlot::NONE,
4343
gantry_mounted: true)

‎app/mutations/devices/seeders/genesis_one_six.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ def peripherals_rotary_tool_reverse
1717

1818
def tool_slots_slot_7
1919
add_tool_slot(name: ToolNames::ROTARY_TOOL,
20-
x: 50,
21-
y: 800,
22-
z: -200,
20+
x: TOOL_X,
21+
y: TOOL_Y + 8 * TOOL_SPACING,
22+
z: TOOL_Z,
2323
tool: tools_rotary)
2424
end
2525

2626
def tool_slots_slot_8
2727
add_tool_slot(name: ToolNames::SEED_TROUGH_1,
2828
x: 0,
29-
y: 25,
30-
z: -100,
29+
y: TROUGH_Y,
30+
z: TROUGH_Z,
3131
tool: tools_seed_trough_1,
3232
pullout_direction: ToolSlot::NONE,
3333
gantry_mounted: true)
@@ -36,8 +36,8 @@ def tool_slots_slot_8
3636
def tool_slots_slot_9
3737
add_tool_slot(name: ToolNames::SEED_TROUGH_2,
3838
x: 0,
39-
y: 50,
40-
z: -100,
39+
y: TROUGH_Y + TROUGH_SPACING,
40+
z: TROUGH_Z,
4141
tool: tools_seed_trough_2,
4242
pullout_direction: ToolSlot::NONE,
4343
gantry_mounted: true)

‎app/mutations/devices/seeders/genesis_xl_one_five.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ def settings_default_map_size_x
1616
end
1717

1818
def settings_default_map_size_y
19-
device.web_app_config.update!(map_size_y: 2_900)
19+
device.web_app_config.update!(map_size_y: 2_730)
2020
end
2121

2222
def tool_slots_slot_7
2323
add_tool_slot(name: ToolNames::SEED_TROUGH_1,
2424
x: 0,
25-
y: 25,
26-
z: -100,
25+
y: TROUGH_Y,
26+
z: TROUGH_Z,
2727
tool: tools_seed_trough_1,
2828
pullout_direction: ToolSlot::NONE,
2929
gantry_mounted: true)
@@ -32,8 +32,8 @@ def tool_slots_slot_7
3232
def tool_slots_slot_8
3333
add_tool_slot(name: ToolNames::SEED_TROUGH_2,
3434
x: 0,
35-
y: 50,
36-
z: -100,
35+
y: TROUGH_Y + TROUGH_SPACING,
36+
z: TROUGH_Z,
3737
tool: tools_seed_trough_2,
3838
pullout_direction: ToolSlot::NONE,
3939
gantry_mounted: true)

0 commit comments

Comments
 (0)