Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into rolling_detection
Browse files Browse the repository at this point in the history
  • Loading branch information
@Johannes-Thiel
Johannes-Thiel committed Jul 11, 2024
2 parents 3830b2c + 25ee98f commit a0ae72b
Show file tree
Hide file tree
Showing 127 changed files with 4,237 additions and 2,974 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Run Tests

on: [push]

jobs:
pytest:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- uses: actions/checkout@v2
- name: set up Python
uses: actions/setup-python@v2
with:
python-version: "3.11"
- name: set up Poetry
uses: abatilo/[email protected]
with:
poetry-version: "1.2.2"
- name: install dependencies
run: |
pip install -r requirements.txt
pip install pytest pytest-asyncio
- name: run pytests
env:
PYTHONPATH: ${{ github.workspace }}
run: pytest
3 changes: 2 additions & 1 deletion .syncignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ config.hjson
sync.sh
nicegui
rosys
.nicegui
.nicegui
.venv
301 changes: 278 additions & 23 deletions backup/rb34/field_friend.automations.field_provider.json
View file
Original file line number Diff line number Diff line change
@@ -1,51 +1,306 @@
{
"fields": [
{
"id": "8c03eee7-0e38-4631-9f0d-0a12093c1136",
"name": "field_1",
"id": "c3be3dd5-bb8c-4e30-9e2b-39ad124d53a9",
"name": "Field #2",
"points": [
{
"lat": 51.983051981357704,
"long": 7.434361841651423
"lat": 51.63392058814559,
"long": 8.297697657586907
},
{
"lat": 51.98310476777581,
"long": 7.434305516193765
"lat": 51.6339107854391,
"long": 8.297612104802273
},
{
"lat": 51.98315920370432,
"long": 7.434420849273772
"lat": 51.63395157535874,
"long": 8.297579545858067
},
{
"lat": 51.98307837457452,
"long": 7.43447181040213
"lat": 51.633961378088905,
"long": 8.297665098712425
}
],
"reference": {
"lat": 51.983051981357704,
"long": 7.434361841651423
"lat": 51.63392538262116,
"long": 8.297662823529397
},
"visualized": false,
"obstacles": [],
"rows": [
{
"id": "b5b278aa-af86-4ad2-aad9-a20b7e09ae75",
"name": "row_1",
"id": "393b1c16-130e-4647-83ee-782af3b6fe7a",
"name": "Row #0",
"points": [
{
"lat": 51.98308566666667,
"long": 7.434426511666667
"lat": 51.63392538262116,
"long": 8.297662823529397
},
{
"lat": 51.983132855,
"long": 7.434380535
"lat": 51.633920462566984,
"long": 8.297619883963137
}
],
"reverse": false,
"crops": []
"reverse": false
},
{
"id": "416b7dd2-c956-41b5-a2b7-5285302125b5",
"name": "Row #1",
"points": [
{
"lat": 51.63392940740777,
"long": 8.297659610909747
},
{
"lat": 51.63392448735242,
"long": 8.297616671340034
}
],
"reverse": false
},
{
"id": "6eb75d3f-4e40-4e8b-9498-2715411760aa",
"name": "Row #2",
"points": [
{
"lat": 51.63393343219428,
"long": 8.297656398289531
},
{
"lat": 51.633928512137764,
"long": 8.297613458716365
}
],
"reverse": false
},
{
"id": "8f9a2cd3-8c20-447d-8111-1da8b606e336",
"name": "Row #3",
"points": [
{
"lat": 51.6339374569807,
"long": 8.297653185668745
},
{
"lat": 51.63393253692303,
"long": 8.297610246092125
}
],
"reverse": false
},
{
"id": "87f76a44-b9e5-4f56-b5ec-ff06b582ce98",
"name": "Row #4",
"points": [
{
"lat": 51.63394148176704,
"long": 8.29764997304739
},
{
"lat": 51.633936561708175,
"long": 8.297607033467317
}
],
"reverse": false
},
{
"id": "8dd8db29-1d5c-457c-bf59-ed4b05dd4b79",
"name": "Row #5",
"points": [
{
"lat": 51.633945506553296,
"long": 8.297646760425465
},
{
"lat": 51.63394058649327,
"long": 8.29760382084194
}
],
"reverse": false
},
{
"id": "59a653cd-040f-4e0d-b334-ba8fbdb8b10a",
"name": "Row #6",
"points": [
{
"lat": 51.63394953133945,
"long": 8.297643547802974
},
{
"lat": 51.63394461127824,
"long": 8.297600608215996
}
],
"reverse": false
}
],
"crop": null
},
{
"id": "e88f6e0f-5cc9-460a-bc8a-75c3900b966f",
"name": "Field Zauberzeug",
"points": [
{
"lat": 51.98323286168432,
"long": 7.434266819581134
},
{
"lat": 51.983141931231444,
"long": 7.434329741290544
},
{
"lat": 51.9831006212419,
"long": 7.434270811514319
},
{
"lat": 51.98319155166395,
"long": 7.434207889743467
}
],
"reference": {
"lat": 51.98320958833333,
"long": 7.434268636666666
},
"visualized": false,
"obstacles": [],
"rows": [
{
"id": "c0b5553d-853c-4c04-82f2-470a81b7409e",
"name": "Row #0",
"points": [
{
"lat": 51.98320958833333,
"long": 7.434268636666666
},
{
"lat": 51.98314345166666,
"long": 7.434314401666668
}
],
"reverse": false
},
{
"id": "27555a38-7de7-45c1-9582-bca8f6a2564a",
"name": "Row #1",
"points": [
{
"lat": 51.9832062162508,
"long": 7.434263826298281
},
{
"lat": 51.98314007958596,
"long": 7.43430959130193
}
],
"reverse": false
},
{
"id": "3462a4a6-e320-4ec1-9dda-6821e2987460",
"name": "Row #2",
"points": [
{
"lat": 51.98320284416806,
"long": 7.434259015930618
},
{
"lat": 51.98313670750506,
"long": 7.434304780937915
}
],
"reverse": false
},
{
"id": "91dd09dc-a6f2-4589-aecf-3a6e2efb1378",
"name": "Row #3",
"points": [
{
"lat": 51.98319947208513,
"long": 7.434254205563676
},
{
"lat": 51.98313333542396,
"long": 7.434299970574622
}
],
"reverse": false
},
{
"id": "3bbc0357-bce9-4dfc-a382-6e796050cccb",
"name": "Row #4",
"points": [
{
"lat": 51.983196100002004,
"long": 7.434249395197458
},
{
"lat": 51.98312996334266,
"long": 7.434295160212051
}
],
"reverse": false
},
{
"id": "f7ca0c15-a817-45a7-846d-33a8403cf342",
"name": "Row #5",
"points": [
{
"lat": 51.98319272791868,
"long": 7.434244584831962
},
{
"lat": 51.983126591261176,
"long": 7.434290349850204
}
],
"reverse": false
},
{
"id": "9cad7475-eae6-4271-91dd-f43af566035f",
"name": "Row #6",
"points": [
{
"lat": 51.983189355835165,
"long": 7.434239774467189
},
{
"lat": 51.983123219179475,
"long": 7.434285539489078
}
],
"reverse": false
},
{
"id": "b87e4d0e-7def-4ca1-b0f5-320cc633cc51",
"name": "Row #7",
"points": [
{
"lat": 51.98318598375143,
"long": 7.434234964103138
},
{
"lat": 51.983119847097576,
"long": 7.434280729128675
}
],
"reverse": false
},
{
"id": "6c3bb8e4-4293-48d4-86e9-cc0f5b3d4a8e",
"name": "Row #8",
"points": [
{
"lat": 51.983182611667516,
"long": 7.434230153739809
},
{
"lat": 51.9831164750155,
"long": 7.434275918768995
}
],
"reverse": false
}
]
],
"crop": null
}
],
"active_field": "8c03eee7-0e38-4631-9f0d-0a12093c1136"
]
}
9 changes: 9 additions & 0 deletions backup/rb34/field_friend.automations.implements.weeding_screw.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"with_drilling": false,
"with_chopping": false,
"chop_if_no_crops": false,
"cultivated_crop": null,
"weed_screw_depth": 0.14,
"crop_safety_distance": 0.02,
"max_crop_distance": 0.08
}
Loading

0 comments on commit a0ae72b

Please sign in to comment.