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.

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

Dev2 정리 #1

Open
wants to merge 124 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
d416a47
-파일수정
jaesikyoon May 25, 2016
c82b005
Revert "-파일수정"
jaesikyoon May 25, 2016
7bf0345
QT PC 프로그램 실험용.
jaesikyoon May 25, 2016
2a248c0
MAVLINK 메제시 정의 - 실험용
jaesikyoon May 25, 2016
bd430a2
Merge branch 'master' into oroca_bldc
jaesikyoon May 25, 2016
89be57a
tt
jaesikyoon May 25, 2016
c17edf7
gui 와꾸 잡고 있습니다
paulbhpark Jun 29, 2016
d5878cd
제어코드중 불필요한 것 정리
paulbhpark Jun 29, 2016
64d1556
홀센서 3고조파 제거를 위한 ANF필터 설계
paulbhpark Jun 30, 2016
8e8e938
ANF_PLL 시뮬레이션
paulbhpark Jul 3, 2016
1264912
ANF_PLL 시뮬레이션
paulbhpark Jul 3, 2016
135a0b3
hallsensor 시뮬레이션 완료......
paulbhpark Jul 6, 2016
775d97a
spi_dac 컴파일 동작 하도록 수정.
jaesikyoon Jul 20, 2016
ef0db5b
현재까지 작업된 상태에서 불필요한 코드를 삭제하고
paulbhpark Aug 9, 2016
7bed4a1
-모터 인터럽트쪽 불필요한 코드 정리
paulbhpark Aug 18, 2016
29a6b9e
컴파일은 생각 안하고 필요없는 코드를 막 지우는 중입니다....
paulbhpark Sep 11, 2016
4f95b83
- 인터럽트 정리
paulbhpark Sep 12, 2016
bd89320
파일더 삭제하고 오픈루프로 동작시험까지 완료~~
paulbhpark Sep 30, 2016
20f2d99
uart3 살리는 중
paulbhpark Oct 2, 2016
3202919
uart3 serial 동작완료
paulbhpark Oct 5, 2016
49c1c98
close loop 테스트
paulbhpark Oct 5, 2016
65280c6
servo_dec 포팅중
paulbhpark Oct 7, 2016
b81ead9
계속~~
paulbhpark Oct 9, 2016
0a78786
servo_dec, app_ppm 파일을 에러없이 포팅함
paulbhpark Oct 9, 2016
3a2c8f3
일단 주파수 계산하는 것하고 회전각 계산식 추가함
paulbhpark Oct 12, 2016
f588b47
-필요없는 변수 다시 정리함
paulbhpark Oct 14, 2016
e48f546
1차 데모.....
paulbhpark Apr 10, 2017
d7e4422
app단 프로그램중......
paulbhpark Apr 10, 2017
18796d8
박현서 때문에 직업 중단 ㅠㅠ
paulbhpark Apr 16, 2017
be264c4
- 쓰레드쪽 함수구조(?) 변경
paulbhpark Apr 17, 2017
712fbb3
타이머 이벤트 관련 task 추가~~
paulbhpark Apr 18, 2017
a05d88d
servo interface 동작
paulbhpark Apr 21, 2017
2517640
폴더정리
paulbhpark Apr 27, 2017
5af1ad9
can 소스
paulbhpark May 10, 2017
6bee816
uart + 마브링크 테스트중
idonno2k Jun 10, 2017
db44bfb
마브링크 프로토콜 테스트....마브링크 xml편집해서 코드생성후 코드에 추가 컴파일 완료...
idonno2k Jun 20, 2017
937a329
gui c# 에 마브링크 올리기...
idonno2k Jun 20, 2017
d24681c
마브링크를 C#에 올려보려고 하고있는데
idonno2k Jun 20, 2017
282a56a
c# gui에 마브링크 올림
idonno2k Jun 21, 2017
cb57101
C#GUI ->c# 마브링크 -> uart -> stm32 uart -> c 마브링크 -> 모터제어
idonno2k Jun 21, 2017
ce5a4a4
can 수신코드 추가
idonno2k Jun 29, 2017
c5147f8
소스코드정리
idonno2k Oct 22, 2017
120fbb2
컴파일 완료 저장
idonno2k Oct 22, 2017
cf987fd
임시저장
idonno2k Oct 22, 2017
d2db5b1
임시저장
idonno2k Oct 22, 2017
1abdb32
임시 저장
idonno2k Oct 23, 2017
847ae8d
임시저장
idonno2k Oct 23, 2017
43579c1
임시저장
idonno2k Oct 23, 2017
fe7a2f3
mcpwm -> mc_interface -> app_configure /mc_configure -> mavlink
idonno2k Oct 24, 2017
537066c
벤자민 최신코드를 거의 살리는 중
idonno2k Oct 24, 2017
ed512c0
servo_simple 코드가 추가 커밋
idonno2k Oct 24, 2017
3edeb50
mcu os hal config값을 벤자민 코드로 수정
idonno2k Oct 25, 2017
7c0e58f
기존 ui를 수정하는데
idonno2k Oct 25, 2017
1614224
어플리케이션쪽 수정
idonno2k Oct 25, 2017
07a0685
임시저장
idonno2k Oct 25, 2017
278db70
임시저장
idonno2k Oct 25, 2017
60fd7b2
1. 컴파일에 필요한 모든 코드를 올림
idonno2k Oct 25, 2017
d15e2cc
마브링크 삽입포인트 체크완료
idonno2k Oct 25, 2017
4988dac
폴더구조변경
idonno2k Oct 26, 2017
5705fa0
usb serial을 시작으로 기능을 살려가고 있는 중
idonno2k Nov 15, 2017
1bb9191
readme update
idonno2k Nov 15, 2017
8fd92f3
readme 수정
idonno2k Nov 15, 2017
3c8d979
Delete Untitled Project.IAB
idonno2k Nov 15, 2017
f424613
Delete Untitled Project.IAD
idonno2k Nov 15, 2017
956ce68
Delete Untitled Project.IMB
idonno2k Nov 15, 2017
1ab51e1
Delete Untitled Project.IMD
idonno2k Nov 15, 2017
3a403bf
Delete Untitled Project.PFI
idonno2k Nov 15, 2017
cbc5986
Delete Untitled Project.PO
idonno2k Nov 15, 2017
f1dad99
Delete Untitled Project.PR
idonno2k Nov 15, 2017
4e4c912
Delete Untitled Project.PRI
idonno2k Nov 15, 2017
6a8b54e
Delete Untitled Project.PS
idonno2k Nov 15, 2017
b843f73
Delete Untitled Project.SearchResults
idonno2k Nov 15, 2017
2f6d279
Delete Untitled Project.WK3
idonno2k Nov 15, 2017
65ffb2d
Delete oroca_bldc.bin
idonno2k Nov 15, 2017
7beb6fc
Delete oroca_bldc.dmp
idonno2k Nov 15, 2017
25c0a67
Delete oroca_bldc.elf
idonno2k Nov 15, 2017
ca09669
Delete oroca_bldc.hex
idonno2k Nov 15, 2017
e70882e
Delete oroca_bldc.list
idonno2k Nov 15, 2017
4c7b077
Delete oroca_bldc.map
idonno2k Nov 15, 2017
a00c88c
- mcpwm init에서 멈추는 현상은 do_dc_cal() 내에 while문 때문이라서 일단 주석처리함
idonno2k Nov 16, 2017
b509dc7
- kicad를 이용하여 회로도 작성(최종상태 반영)
idonno2k Nov 22, 2017
278cb97
kicad 라이브러리 업로드
idonno2k Nov 23, 2017
e387af0
kicad라이브러리 업로드
idonno2k Nov 23, 2017
92ecbc6
마브링크 수정
idonno2k Nov 23, 2017
06c80e4
gui쪽 마브링크정리
idonno2k Nov 24, 2017
2355407
pdf 회로도 추가
idonno2k Nov 24, 2017
a7df9be
마브링크 송수신 테스트
idonno2k Nov 26, 2017
da84458
pdf회로도
idonno2k Nov 27, 2017
a6f19f9
gui 마브링크디버깅중
idonno2k Nov 27, 2017
5d5f548
마브링크 기능구현
idonno2k Jan 19, 2018
5244c7d
하루한줄코딩
idonno2k Feb 6, 2018
a898ce3
datagridview 테스트중
idonno2k Feb 9, 2018
8967f25
데이터그리드뷰 테스트
idonno2k Feb 9, 2018
ae3b12a
그리드뷰 데이터 로드
idonno2k Feb 13, 2018
81beac8
컴파일 오류가 있음
idonno2k Feb 13, 2018
12f7c76
헤더파일 순환참조 조심
idonno2k Feb 18, 2018
ce2d3dd
모터쪽 코드 새롭게 리비젼중...
idonno2k Feb 21, 2018
07fb507
하루한줄 코딩 실천
idonno2k Feb 23, 2018
1e79b92
mavlink->mcinterface->mcpwm
idonno2k Feb 28, 2018
fc9f408
모터제어코드 수정/정리...
idonno2k Mar 7, 2018
2dd5e93
마브링크 명령어 추가
idonno2k Mar 8, 2018
896144f
pwm엔코더 타이머4 캡처모드로 설정하고
idonno2k Mar 9, 2018
8945d2c
gui편집
idonno2k Mar 14, 2018
219a56e
아이콘 만들기
idonno2k Mar 14, 2018
32e65d7
새로운보드 살리기...LED동작확인
idonno2k May 27, 2018
52e9a5a
마브링크 테스트
idonno2k Jun 21, 2018
3bc9b7c
-spi살려서 as5048a동작테스트중
idonno2k Jul 12, 2018
2db9d07
마이크로칩1078b문서23쪽 그림처럼 오픈루프 스타트 코드 수정
idonno2k Jul 17, 2018
1694363
테스트결과
idonno2k Jul 23, 2018
2feed97
엔코더 동작테스트
idonno2k Jul 26, 2018
0db5d0d
git test...
idonno2k Jul 26, 2018
30f8912
속도제어기 까지 추가
idonno2k Aug 9, 2018
d1e9ca7
pll쪽 pi제어기 게인값 수정
idonno2k Oct 22, 2018
cb66c0f
sd카드 예제가 파일시스템 기반으로 되어있어서
idonno2k Oct 22, 2018
f381395
endcoder에 pll로 수정
idonno2k Nov 2, 2018
c9cb796
칼만필터 코딩중
idonno2k Nov 21, 2018
39e08fb
엔코더쪽 수정
idonno2k Dec 14, 2018
f1a5cc1
코드 정리....
idonno2k Jan 9, 2019
a0d4547
코드정리
idonno2k Jan 10, 2019
e14a4ce
TrueSTUDIO 프로젝트 추가
chcbaram Jan 24, 2019
40525c4
투루스튜디오 링커파일 패스 변경
chcbaram Jan 24, 2019
d48fa4a
FPU 정의 추가
chcbaram Jan 24, 2019
23a0bf1
폴더청리
idonno2k Jan 29, 2019
adda175
컴파일테스트
idonno2k Jan 29, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 0 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +0,0 @@
oroca_bldc/.dep/*
oroca_bldc/build/lst/*
oroca_bldc/build/oroca_bldc.dmp
oroca_bldc/build/oroca_bldc.elf
oroca_bldc/build/oroca_bldc.hex
oroca_bldc/build/oroca_bldc.map
oroca_bldc/build/obj/*
104 changes: 104 additions & 0 deletions MAVLINK_msg/oroca_bldc.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<?xml version='1.0'?>
<mavlink>
<!--include>common.xml</include-->
<!--version>3</version-->
<enums>
</enums>

<messages>
<!-- Messages for system -->
<message id="0" name="DEBUG_STRING">
<description>debug String</description>
<field type="char[250]" name="dbg_str">string</field>
</message>

<message id="1" name="ACK">
<description>ACK</description>
<field type="uint8_t" name="msg_id"></field>
<field type="uint16_t" name="err_code"></field>
<field type="uint8_t" name="length"></field>
<field type="uint8_t[16]" name="data"></field>
</message>

<message id="11" name="READ_VERSION">
<description>READ_VERSION</description>
<field type="uint8_t" name="resp">0:No Resp, 1:Resp</field>
<field type="uint8_t[8]" name="param"></field>
</message>

<message id="12" name="READ_BOARD_NAME">
<description>READ_BOARD_NAME</description>
<field type="uint8_t" name="resp">0:No Resp, 1:Resp</field>
<field type="uint8_t[8]" name="param"></field>
</message>

<message id="13" name="READ_TAG">
<description>READ_TAG</description>
<field type="uint8_t" name="resp">0:No Resp, 1:Resp</field>
<field type="uint8_t" name="type"></field>
<field type="uint8_t[8]" name="param"></field>
</message>

<message id="20" name="WRITE_EEPROM">
<description>WRITE_EEPROM</description>
<field type="uint8_t" name="resp">0:No Resp, 1:Resp</field>
<field type="uint8_t" name="param"></field>
</message>

<!-- Messages for OROCA BLDC -->
<message id="121" name="SET_MCCONF">
<description>SET_MCCONF</description>
<field type="uint8_t" name="resp">0:No Resp, 1:Resp</field>
<field type="uint8_t" name="uVDD">x10^1 </field>
<field type="uint16_t" name="uRSHUNT">x10^3 </field>
<field type="uint16_t" name="uPWMFREQUENCY">x10^3 </field>

<field type="uint16_t" name="uDKP">x10^3 </field>
<field type="uint16_t" name="uDKI">x10^3 </field>
<field type="uint16_t" name="uDKC">x10^3 </field>
<field type="uint16_t" name="uDOUTMAX">x10^3 </field>

<field type="uint16_t" name="uQKP">x10^3 </field>
<field type="uint16_t" name="uQKI">x10^3 </field>
<field type="uint16_t" name="uQKC">x10^3 </field>
<field type="uint16_t" name="uQOUTMAX">x10^3 </field>

<field type="uint16_t" name="uWKP">x10^3 </field>
<field type="uint16_t" name="uWKI">x10^3 </field>
<field type="uint16_t" name="uWKC">x10^3 </field>
<field type="uint16_t" name="uWOUTMAX">x10^3 </field>

<field type="uint16_t" name="uPLLKP">x10^3 </field>
<field type="uint16_t" name="uPLLKI">x10^3 </field>
<field type="uint16_t" name="uPLLKC">x10^3 </field>
<field type="uint16_t" name="uPLLOUTMAX">x10^3 </field>
</message>

<message id="122" name="SET_APPCONF">
<description>SET_APPCONF</description>
<field type="uint8_t" name="resp">0:No Resp, 1:Resp</field>
<field type="uint16_t[128]" name="data"></field>
</message>

<message id="220" name="SET_VELOCITY">
<description>SET_VELOCITY</description>
<field type="uint8_t" name="resp">0:No Resp, 1:Resp</field>
<field type="uint16_t" name="ref_angular_velocity">velocity value</field>
</message>

<message id="221" name="SET_OPENLOOP">
<description>SET_OPENLOOP</description>
<field type="uint8_t" name="resp">0:No Resp, 1:Resp</field>
<field type="uint8_t" name="openLoopMode">0:closedloop 1:openloop </field>
</message>

<message id="222" name="SET_ENCODERMODE">
<description>SET_ENCODERMODE</description>
<field type="uint8_t" name="resp">0:No Resp, 1:Resp</field>
<field type="uint8_t" name="encoderMode">0:none 1:ABI 2:AS50XX 3:AJALL 4:PWM </field>
</message>


</messages>

</mavlink>
Binary file added PSIM_simulation/05715872.pdf
Binary file not shown.
Binary file added PSIM_simulation/ANF_PLL.psimsch
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
D:\git\oroca_bldc_dev\PSIM_simulation\hallsensor\code\Debug\cl.command.1.tlog
D:\git\oroca_bldc_dev\PSIM_simulation\hallsensor\code\Debug\CL.read.1.tlog
D:\git\oroca_bldc_dev\PSIM_simulation\hallsensor\code\Debug\CL.write.1.tlog
D:\git\oroca_bldc_dev\PSIM_simulation\hallsensor\code\Debug\rms_dll.write.1.tlog
D:\git\oroca_bldc_dev\PSIM_simulation\hallsensor\code\Debug\vc100.idb
D:\GIT\OROCA_BLDC_DEV\PSIM_SIMULATION\HALLSENSOR\CODE\DEBUG\VC100.PDB
Binary file not shown.
Binary file added PSIM_simulation/hallsensor/code/Debug/rms_dll.exp
Binary file not shown.
Binary file added PSIM_simulation/hallsensor/code/Debug/rms_dll.ilk
Binary file not shown.
2 changes: 2 additions & 0 deletions PSIM_simulation/hallsensor/code/Debug/rms_dll.lastbuildstate
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#v4.0:v100:false
Debug|Win32|D:\git\oroca_bldc_dev\PSIM_simulation\hallsensor\code\|
Binary file added PSIM_simulation/hallsensor/code/Debug/rms_dll.lib
Binary file not shown.
31 changes: 31 additions & 0 deletions PSIM_simulation/hallsensor/code/Debug/rms_dll.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
빌드 시작: 2016-07-02 오전 3:55:31
1>2 노드의 "D:\git\oroca_bldc_dev\PSIM_simulation\hallsensor\code\rms_dll.vcxproj" 프로젝트(build 대상)입니다.
1>InitializeBuildStatus:
"AlwaysCreate"이(가) 지정되었기 때문에 ".\Debug\rms_dll.unsuccessfulbuild"을(를) 만들고 있습니다.
ClCompile:
C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /ZI /nologo /W3 /WX- /Od /Oy- /D WIN32 /D _DEBUG /D _WINDOWS /D _USRDLL /D RMS_DLL_EXPORTS /D _VC80_UPGRADE=0x0600 /D _WINDLL /D _MBCS /Gm /EHsc /RTC1 /MTd /GS /Gy- /fp:precise /Zc:wchar_t /Zc:forScope /Fo".\Debug\\" /Fd".\Debug\vc100.pdb" /Gd /TP /analyze- /errorReport:prompt rms_dll.cpp
rms_dll.cpp
1>d:\git\oroca_bldc_dev\psim_simulation\hallsensor\code\rms_dll.cpp(58): warning C4305: '초기화 중' : 'double'에서 'float'(으)로 잘립니다.
1>d:\git\oroca_bldc_dev\psim_simulation\hallsensor\code\rms_dll.cpp(59): warning C4305: '초기화 중' : 'double'에서 'float'(으)로 잘립니다.
1>d:\git\oroca_bldc_dev\psim_simulation\hallsensor\code\rms_dll.cpp(134): warning C4244: '=' : 'double'에서 'float'(으)로 변환하면서 데이터가 손실될 수 있습니다.
1>d:\git\oroca_bldc_dev\psim_simulation\hallsensor\code\rms_dll.cpp(135): warning C4244: '=' : 'double'에서 'float'(으)로 변환하면서 데이터가 손실될 수 있습니다.
1>d:\git\oroca_bldc_dev\psim_simulation\hallsensor\code\rms_dll.cpp(172): warning C4305: '=' : 'double'에서 'float'(으)로 잘립니다.
ManifestResourceCompile:
모든 출력이 최신 상태입니다.
Link:
C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:".\Debug\rms_dll.dll" /INCREMENTAL /NOLOGO odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /DEF:".\rms_dll.def" /MANIFEST /ManifestFile:".\Debug\rms_dll.dll.intermediate.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /DEBUG /PDB:"D:\git\oroca_bldc_dev\PSIM_simulation\hallsensor\code\Debug\rms_dll.pdb" /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:".\Debug\rms_dll.lib" /MACHINE:X86 /DLL .\Debug\rms_dll.dll.embed.manifest.res
.\Debug\rms_dll.obj
Manifest:
C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\mt.exe /nologo /verbose /out:".\Debug\rms_dll.dll.embed.manifest" /manifest .\Debug\rms_dll.dll.intermediate.manifest
모든 출력이 최신 상태입니다.
LinkEmbedManifest:
모든 출력이 최신 상태입니다.
rms_dll.vcxproj -> D:\git\oroca_bldc_dev\PSIM_simulation\hallsensor\code\.\Debug\rms_dll.dll
FinalizeBuildStatus:
".\Debug\rms_dll.unsuccessfulbuild" 파일을 삭제하고 있습니다.
".\Debug\rms_dll.lastbuildstate"에 연결(touching)하고 있습니다.
1>"D:\git\oroca_bldc_dev\PSIM_simulation\hallsensor\code\rms_dll.vcxproj" 프로젝트를 빌드했습니다(build 대상).

빌드했습니다.

경과 시간: 00:00:01.56
Binary file added PSIM_simulation/hallsensor/code/Debug/rms_dll.obj
Binary file not shown.
Binary file added PSIM_simulation/hallsensor/code/Debug/rms_dll.pdb
Binary file not shown.
Binary file not shown.
Loading