robossembler/wirewinder
7
0
Fork 0
Code Issues 6 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Resolve "Разработать эл.схему станка в KiCAD" #38

Open
Nikita2002 wants to merge 1 commit from 7-kicad_machine_sch into main
pull from: 7-kicad_machine_sch
merge into: robossembler:main
Conversation 11 Commits 1 Files changed 8 +34086
Nikita2002 commented 2024-09-26 12:58:19 +03:00 (Migrated from gitlab.com)
Copy link

Разработана схема станка с соединениями элементов

Разработана схема станка с соединениями элементов
Nikita2002 commented 2024-09-26 12:59:12 +03:00 (Migrated from gitlab.com)
Copy link

added 3 commits

  • dcc476fc - 1 commit from branch main
  • 539c9b8d - Добавлена схема станка
  • b0485c5f - Добавлен gitignore

Compare with previous version

added 3 commits <ul><li>dcc476fc - 1 commit from branch <code>main</code></li><li>539c9b8d - Добавлена схема станка</li><li>b0485c5f - Добавлен gitignore</li></ul> [Compare with previous version](/robossembler/cnc/motor-wire-winder/-/merge_requests/14/diffs?diff_id=1131911324&start_sha=fd98490da63bd682b7f83e43b494289dc2cf1d06)
Nikita2002 commented 2024-10-01 12:57:10 +03:00 (Migrated from gitlab.com)
Copy link

added 4 commits

  • ff29a2e3 - Добавлена схема станка
  • fd98490d - Добавлен gitignore
  • 33adfbad - Добавлены соединения элементов с платой
  • df122cba - Добавлены соединения элементов со станком

Compare with previous version

added 4 commits <ul><li>ff29a2e3 - Добавлена схема станка</li><li>fd98490d - Добавлен gitignore</li><li>33adfbad - Добавлены соединения элементов с платой</li><li>df122cba - Добавлены соединения элементов со станком</li></ul> [Compare with previous version](/robossembler/cnc/motor-wire-winder/-/merge_requests/14/diffs?diff_id=1136147396&start_sha=b0485c5f430505f170cd551863ff59fb8bca6ea7)
Nikita2002 commented 2024-10-01 18:37:13 +03:00 (Migrated from gitlab.com)
Copy link

changed the description

changed the description
movefasta commented 2024-10-23 22:47:53 +03:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 7db8a50d - Почистил бэкапы схем

Compare with previous version

added 1 commit <ul><li>7db8a50d - Почистил бэкапы схем</li></ul> [Compare with previous version](/robossembler/cnc/motor-wire-winder/-/merge_requests/14/diffs?diff_id=1158954071&start_sha=df122cba58baf9fd254407c6fea60bfbf5b6054b)
movefasta commented 2024-10-24 15:35:31 +03:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 3e976866 - Переименована директория с схемами

Compare with previous version

added 1 commit <ul><li>3e976866 - Переименована директория с схемами</li></ul> [Compare with previous version](/robossembler/cnc/motor-wire-winder/-/merge_requests/14/diffs?diff_id=1159775588&start_sha=7db8a50d4ae1bbddcdd6e28362e63efbffb9c743)
movefasta commented 2024-10-24 15:36:17 +03:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • b72d1787 - add zip to .gitignore

Compare with previous version

added 1 commit <ul><li>b72d1787 - add zip to .gitignore</li></ul> [Compare with previous version](/robossembler/cnc/motor-wire-winder/-/merge_requests/14/diffs?diff_id=1159776808&start_sha=3e97686608f4b6744c1a656a6af7d01f5eeb49bb)
movefasta commented 2025-02-27 17:27:17 +03:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 0d3126a9 - remove .bak

Compare with previous version

added 1 commit <ul><li>0d3126a9 - remove .bak</li></ul> [Compare with previous version](/robossembler/cnc/motor-wire-winder/-/merge_requests/14/diffs?diff_id=1278855725&start_sha=1600c0da02dc0b120e4a44c03155bdd64a4da244)
movefasta commented 2025-02-27 17:29:24 +03:00 (Migrated from gitlab.com)
Copy link

requested review from @vlatukhin

requested review from @vlatukhin
movefasta commented 2025-02-27 17:29:26 +03:00 (Migrated from gitlab.com)
Copy link

assigned to @movefasta

assigned to @movefasta
movefasta commented 2025-02-28 11:47:12 +03:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 132c1410 - Clean Up

Compare with previous version

added 1 commit <ul><li>132c1410 - Clean Up</li></ul> [Compare with previous version](/robossembler/cnc/motor-wire-winder/-/merge_requests/14/diffs?diff_id=1279754482&start_sha=0d3126a9c4f81f35510bc6583be489db69d2e8fc)
movefasta commented 2025-02-28 12:01:38 +03:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • be5ddccb - Добавлена схема станка и соединения элементов с платой

Compare with previous version

added 1 commit <ul><li>be5ddccb - Добавлена схема станка и соединения элементов с платой</li></ul> [Compare with previous version](/robossembler/cnc/motor-wire-winder/-/merge_requests/14/diffs?diff_id=1279771237&start_sha=132c14107083c1b28009100145e72f293317a3bf)
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 7-kicad_machine_sch:7-kicad_machine_sch
git checkout 7-kicad_machine_sch

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout main
git merge --no-ff 7-kicad_machine_sch
git checkout 7-kicad_machine_sch
git rebase main
git checkout main
git merge --ff-only 7-kicad_machine_sch
git checkout 7-kicad_machine_sch
git rebase main
git checkout main
git merge --no-ff 7-kicad_machine_sch
git checkout main
git merge --squash 7-kicad_machine_sch
git checkout main
git merge --ff-only 7-kicad_machine_sch
git checkout main
git merge 7-kicad_machine_sch
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
construct

   
design

   
doc

   
integration

   
programming

   
research

   
schematics

   
test
No labels
construct
design
doc
integration
programming
research
schematics
test
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: robossembler/wirewinder#38
No description provided.
Delete branch "7-kicad_machine_sch"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?