Skip to content
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

Dev #1

Open
wants to merge 21 commits into
base: dev
Choose a base branch
from
Open

Dev #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
dd97632
Попытка установки ШИМа
May 18, 2018
7020d58
Регулировка работы ШИМа и получения результатов с дальномеров
May 22, 2018
10a318c
Перевод скорости в метры в секунду.
May 22, 2018
9813d71
Регулятор скорости.
May 30, 2018
6b6d3a0
Рефакторинг_2.0.0
Jul 11, 2018
eb59d15
Удаление ненужного счетчика
Jul 11, 2018
c48b85d
Удалены папки билда и настроек IDE
CodeMunke Jul 11, 2018
03c327a
Добавлен .ini в .gitignore
CodeMunke Jul 11, 2018
347f78e
Добавление счетчика на регулировку скорости колёс
Jul 11, 2018
d6602e2
Не знаю, что там поменялось, вот
Jul 12, 2018
5cc8da4
Вот
Jul 12, 2018
2b4df2f
Revert "Вот"
Jul 12, 2018
95a2862
Гандам объединение!
Jul 12, 2018
658b68d
Добавление интегральной и дифференциальной сотсавляющей ПИД-регулятора
Jul 15, 2018
7979c5f
Желаемая скорость выбирается при помощи кейсов
Jul 16, 2018
52a9107
Бесполезный коммит
Jul 17, 2018
f8d7b66
Рефактор и переделывание кейсов
Jul 18, 2018
f1331e4
Верификация регулятора скорости
CodeMunke Jul 18, 2018
8c1adac
Изменение регулятора желаемой скорости
Jul 18, 2018
0affd90
Тест ШИМа
Jul 19, 2018
fdae223
Добавление конфигурации прерываний от энкодеров
Jul 20, 2018
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
51 changes: 33 additions & 18 deletions .cproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="de.innot.avreclipse.configuration.app.debug.557665899">
Expand Down Expand Up @@ -52,11 +52,8 @@
<tool id="de.innot.avreclipse.tool.avrdude.app.debug.860401494" name="AVRDude" superClass="de.innot.avreclipse.tool.avrdude.app.debug"/>
</toolChain>
</folderInfo>
<fileInfo id="de.innot.avreclipse.configuration.app.debug.557665899.1155729596" name="detector.cpp" rcbsApplicability="disable" resourcePath="detector.cpp" toolsToInvoke="de.innot.avreclipse.tool.cppcompiler.app.debug.1999440130.1236658096">
<tool id="de.innot.avreclipse.tool.cppcompiler.app.debug.1999440130.1236658096" name="AVR C++ Compiler" superClass="de.innot.avreclipse.tool.cppcompiler.app.debug.1999440130"/>
</fileInfo>
<sourceEntries>
<entry excluding="Source.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry excluding="detector.cpp|Source.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
Expand Down Expand Up @@ -114,34 +111,52 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="detector.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry excluding="PWM.cpp|adjust_speed.cpp|CalculateWishSpeed.cpp|detector_new.cpp|detector.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="AVR_car.de.innot.avreclipse.project.winavr.elf_2.1.0.701397005" name="AVR Cross Target Application" projectType="de.innot.avreclipse.project.winavr.elf_2.1.0"/>
</storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<scannerConfigBuildInfo instanceId="de.innot.avreclipse.configuration.app.release.1432576812;de.innot.avreclipse.configuration.app.release.1432576812.;de.innot.avreclipse.tool.cppcompiler.app.release.2077710697;de.innot.avreclipse.cppcompiler.input.938907856">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="de.innot.avreclipse.core.AVRGCCManagedMakePerProjectProfileCPP"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="de.innot.avreclipse.configuration.app.release.1432576812;de.innot.avreclipse.configuration.app.release.1432576812.;de.innot.avreclipse.tool.compiler.winavr.app.release.1659116190;de.innot.avreclipse.compiler.winavr.input.1619118215">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="de.innot.avreclipse.core.AVRGCCManagedMakePerProjectProfileC"/>
</scannerConfigBuildInfo>
<project id="AVR.de.innot.avreclipse.project.winavr.elf_2.1.0.1613824777" name="AVR Cross Target Application" projectType="de.innot.avreclipse.project.winavr.elf_2.1.0"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Debug">
<resource resourceType="PROJECT" workspacePath="/AVR_car"/>
<resource resourceType="PROJECT" workspacePath="/AVR"/>
</configuration>
<configuration configurationName="Release">
<resource resourceType="PROJECT" workspacePath="/AVR_car"/>
<resource resourceType="PROJECT" workspacePath="/AVR"/>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<scannerConfigBuildInfo instanceId="de.innot.avreclipse.configuration.app.release.1255097841;de.innot.avreclipse.configuration.app.release.1255097841.;de.innot.avreclipse.tool.compiler.winavr.app.release.400285947;de.innot.avreclipse.compiler.winavr.input.1989056460">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="de.innot.avreclipse.core.AVRGCCManagedMakePerProjectProfileC"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="de.innot.avreclipse.configuration.app.debug.557665899;de.innot.avreclipse.configuration.app.debug.557665899.;de.innot.avreclipse.tool.compiler.winavr.app.debug.276520179;de.innot.avreclipse.compiler.winavr.input.1443927110">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="de.innot.avreclipse.core.AVRGCCManagedMakePerProjectProfileC"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="de.innot.avreclipse.configuration.app.release.335473570;de.innot.avreclipse.configuration.app.release.335473570.;de.innot.avreclipse.tool.compiler.winavr.app.release.497765684;de.innot.avreclipse.compiler.winavr.input.504109372">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="de.innot.avreclipse.core.AVRGCCManagedMakePerProjectProfileC"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="de.innot.avreclipse.configuration.app.release.1255097841;de.innot.avreclipse.configuration.app.release.1255097841.;de.innot.avreclipse.tool.cppcompiler.app.release.1001599930;de.innot.avreclipse.cppcompiler.input.1514795898">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="de.innot.avreclipse.core.AVRGCCManagedMakePerProjectProfileCPP"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="de.innot.avreclipse.configuration.app.debug.557665899;de.innot.avreclipse.configuration.app.debug.557665899.;de.innot.avreclipse.tool.cppcompiler.app.debug.1999440130;de.innot.avreclipse.cppcompiler.input.1498230473">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="de.innot.avreclipse.core.AVRGCCManagedMakePerProjectProfileCPP"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="de.innot.avreclipse.configuration.app.release.1432576812;de.innot.avreclipse.configuration.app.release.1432576812.;de.innot.avreclipse.tool.compiler.winavr.app.release.1659116190;de.innot.avreclipse.compiler.winavr.input.1619118215">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="de.innot.avreclipse.core.AVRGCCManagedMakePerProjectProfileC"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="de.innot.avreclipse.configuration.app.release.335473570;de.innot.avreclipse.configuration.app.release.335473570.;de.innot.avreclipse.tool.cppcompiler.app.release.1732352422;de.innot.avreclipse.cppcompiler.input.714278367">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="de.innot.avreclipse.core.AVRGCCManagedMakePerProjectProfileCPP"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="de.innot.avreclipse.configuration.app.release.1432576812;de.innot.avreclipse.configuration.app.release.1432576812.;de.innot.avreclipse.tool.cppcompiler.app.release.2077710697;de.innot.avreclipse.cppcompiler.input.938907856">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="de.innot.avreclipse.core.AVRGCCManagedMakePerProjectProfileCPP"/>
</scannerConfigBuildInfo>
</storageModule>
</cproject>
6 changes: 4 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/Debug/
/Release/
/.settings/*
/Debug/*
/Release/*
*.ini
23 changes: 0 additions & 23 deletions .settings/de.innot.avreclipse.core.prefs
View file
Open in desktop

This file was deleted.

Binary file removed Debug/AVR_car.elf
View file
Open in desktop
Binary file not shown.
55 changes: 0 additions & 55 deletions Debug/AVR_car.hex
View file
Open in desktop

This file was deleted.

Loading