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

Dev 정리 #2

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 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
4d3ba0f
Delete Untitled Project.IAB
idonno2k Nov 15, 2017
ff19e5a
Delete Untitled Project.IAD
idonno2k Nov 15, 2017
931cc51
Delete Untitled Project.IMB
idonno2k Nov 15, 2017
d4952b8
Delete Untitled Project.IMD
idonno2k Nov 15, 2017
7515f85
Delete Untitled Project.PFI
idonno2k Nov 15, 2017
8421d4c
Delete Untitled Project.PO
idonno2k Nov 15, 2017
6ea2d75
Delete Untitled Project.WK3
idonno2k Nov 15, 2017
c44b7ac
Delete Untitled Project.PRI
idonno2k Nov 15, 2017
3d3a5b7
Delete Untitled Project.PR
idonno2k Nov 15, 2017
a6b5925
Delete Untitled Project.PS
idonno2k Nov 15, 2017
8b74f94
Delete Untitled Project.SearchResults
idonno2k Nov 15, 2017
a050731
Delete oroca_bldc.bin
idonno2k Nov 15, 2017
e9ace64
Delete oroca_bldc.dmp
idonno2k Nov 15, 2017
c987288
Delete oroca_bldc.elf
idonno2k Nov 15, 2017
7f00d7b
Delete oroca_bldc.hex
idonno2k Nov 15, 2017
eb87b3f
Delete oroca_bldc.list
idonno2k Nov 16, 2017
85e051d
Delete oroca_bldc.map
idonno2k Nov 16, 2017
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

This file was deleted.

176 changes: 176 additions & 0 deletions MAVLINK_msg/ASLUAV.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
<?xml version='1.0'?>
<!-- ASLUAV Mavlink Message Definition File -->
<!-- Used for the ASLUAV fixed-wing autopilot (www.asl.ethz.ch), which implements extensions to the Pixhawk (www.pixhawk.org) autopilot -->
<mavlink>
<include>common.xml</include>
<enums>
<enum name="MAV_CMD">
<!-- ASLUAV specific MAV_CMD_* commands -->
<entry name="MAV_CMD_RESET_MPPT" value="40001">
<description>Mission command to reset Maximum Power Point Tracker (MPPT)</description>
<param index="1">MPPT number</param>
<param index="2">Empty</param>
<param index="3">Empty</param>
<param index="4">Empty</param>
<param index="5">Empty</param>
<param index="6">Empty</param>
<param index="7">Empty</param>
</entry>
<entry name="MAV_CMD_PAYLOAD_CONTROL" value="40002">
<description>Mission command to perform a power cycle on payload</description>
<param index="1">Complete power cycle</param>
<param index="2">VISensor power cycle</param>
<param index="3">Empty</param>
<param index="4">Empty</param>
<param index="5">Empty</param>
<param index="6">Empty</param>
<param index="7">Empty</param>
</entry>
</enum>
</enums>
<messages>
<message id="201" name="SENS_POWER">
<description>Voltage and current sensor data</description>
<field type="float" name="adc121_vspb_volt"> Power board voltage sensor reading in volts</field>
<field type="float" name="adc121_cspb_amp"> Power board current sensor reading in amps</field>
<field type="float" name="adc121_cs1_amp"> Board current sensor 1 reading in amps</field>
<field type="float" name="adc121_cs2_amp"> Board current sensor 2 reading in amps</field>
</message>
<message id="202" name="SENS_MPPT">
<description>Maximum Power Point Tracker (MPPT) sensor data for solar module power performance tracking</description>
<field type="uint64_t" name="mppt_timestamp"> MPPT last timestamp </field>
<field type="float" name="mppt1_volt"> MPPT1 voltage </field>
<field type="float" name="mppt1_amp"> MPPT1 current </field>
<field type="uint16_t" name="mppt1_pwm"> MPPT1 pwm </field>
<field type="uint8_t" name="mppt1_status"> MPPT1 status </field>
<field type="float" name="mppt2_volt"> MPPT2 voltage </field>
<field type="float" name="mppt2_amp"> MPPT2 current </field>
<field type="uint16_t" name="mppt2_pwm"> MPPT2 pwm </field>
<field type="uint8_t" name="mppt2_status"> MPPT2 status </field>
<field type="float" name="mppt3_volt"> MPPT3 voltage </field>
<field type="float" name="mppt3_amp"> MPPT3 current </field>
<field type="uint16_t" name="mppt3_pwm"> MPPT3 pwm </field>
<field type="uint8_t" name="mppt3_status"> MPPT3 status </field>
</message>
<message id="203" name="ASLCTRL_DATA">
<description>ASL-fixed-wing controller data</description>
<field type="uint64_t" name="timestamp"> Timestamp</field>
<field type="uint8_t" name="aslctrl_mode"> ASLCTRL control-mode (manual, stabilized, auto, etc...)</field>
<field type="float" name="h"> See sourcecode for a description of these values... </field>
<field type="float" name="hRef"> </field>
<field type="float" name="hRef_t"> </field>
<field type="float" name="PitchAngle">Pitch angle [deg]</field>
<field type="float" name="PitchAngleRef">Pitch angle reference[deg] </field>
<field type="float" name="q"> </field>
<field type="float" name="qRef"> </field>
<field type="float" name="uElev"> </field>
<field type="float" name="uThrot"> </field>
<field type="float" name="uThrot2"> </field>
<field type="float" name="aZ"> </field>
<field type="float" name="AirspeedRef">Airspeed reference [m/s]</field>
<field type="uint8_t" name="SpoilersEngaged"> </field>
<field type="float" name="YawAngle">Yaw angle [deg]</field>
<field type="float" name="YawAngleRef">Yaw angle reference[deg]</field>
<field type="float" name="RollAngle">Roll angle [deg]</field>
<field type="float" name="RollAngleRef">Roll angle reference[deg]</field>
<field type="float" name="p"> </field>
<field type="float" name="pRef"> </field>
<field type="float" name="r"> </field>
<field type="float" name="rRef"> </field>
<field type="float" name="uAil"> </field>
<field type="float" name="uRud"> </field>
</message>
<message id="204" name="ASLCTRL_DEBUG">
<description>ASL-fixed-wing controller debug data</description>
<field type="uint32_t" name="i32_1"> Debug data</field>
<field type="uint8_t" name="i8_1"> Debug data</field>
<field type="uint8_t" name="i8_2"> Debug data</field>
<field type="float" name="f_1"> Debug data </field>
<field type="float" name="f_2"> Debug data</field>
<field type="float" name="f_3"> Debug data</field>
<field type="float" name="f_4"> Debug data</field>
<field type="float" name="f_5"> Debug data</field>
<field type="float" name="f_6"> Debug data</field>
<field type="float" name="f_7"> Debug data</field>
<field type="float" name="f_8"> Debug data</field>
</message>
<message id="205" name="ASLUAV_STATUS">
<description>Extended state information for ASLUAVs</description>
<field type="uint8_t" name="LED_status"> Status of the position-indicator LEDs</field>
<field type="uint8_t" name="SATCOM_status"> Status of the IRIDIUM satellite communication system</field>
<field type="uint8_t[8]" name="Servo_status"> Status vector for up to 8 servos</field>
<field type="float" name="Motor_rpm"> Motor RPM </field>
<!-- to be extended-->
</message>
<message id="206" name="EKF_EXT">
<description>Extended EKF state estimates for ASLUAVs</description>
<field type="uint64_t" name="timestamp"> Time since system start [us]</field>
<field type="float" name="Windspeed"> Magnitude of wind velocity (in lateral inertial plane) [m/s]</field>
<field type="float" name="WindDir"> Wind heading angle from North [rad]</field>
<field type="float" name="WindZ"> Z (Down) component of inertial wind velocity [m/s]</field>
<field type="float" name="Airspeed"> Magnitude of air velocity [m/s]</field>
<field type="float" name="beta"> Sideslip angle [rad]</field>
<field type="float" name="alpha"> Angle of attack [rad]</field>
</message>
<message id="207" name="ASL_OBCTRL">
<description>Off-board controls/commands for ASLUAVs</description>
<field type="uint64_t" name="timestamp"> Time since system start [us]</field>
<field type="float" name="uElev"> Elevator command [~]</field>
<field type="float" name="uThrot"> Throttle command [~]</field>
<field type="float" name="uThrot2"> Throttle 2 command [~]</field>
<field type="float" name="uAilL"> Left aileron command [~]</field>
<field type="float" name="uAilR"> Right aileron command [~]</field>
<field type="float" name="uRud"> Rudder command [~]</field>
<field type="uint8_t" name="obctrl_status"> Off-board computer status</field>
</message>
<message id="208" name="SENS_ATMOS">
<description>Atmospheric sensors (temperature, humidity, ...) </description>
<field type="float" name="TempAmbient"> Ambient temperature [degrees Celsius]</field>
<field type="float" name="Humidity"> Relative humidity [%]</field>
</message>
<message id="209" name="SENS_BATMON">
<description>Battery pack monitoring data for Li-Ion batteries</description>
<field type="float" name="temperature">Battery pack temperature in [deg C]</field>
<field type="uint16_t" name="voltage">Battery pack voltage in [mV]</field>
<field type="int16_t" name="current">Battery pack current in [mA]</field>
<field type="uint8_t" name="SoC">Battery pack state-of-charge</field>
<field type="uint16_t" name="batterystatus">Battery monitor status report bits in Hex</field>
<field type="uint16_t" name="serialnumber">Battery monitor serial number in Hex</field>
<field type="uint16_t" name="hostfetcontrol">Battery monitor sensor host FET control in Hex</field>
<field type="uint16_t" name="cellvoltage1">Battery pack cell 1 voltage in [mV]</field>
<field type="uint16_t" name="cellvoltage2">Battery pack cell 2 voltage in [mV]</field>
<field type="uint16_t" name="cellvoltage3">Battery pack cell 3 voltage in [mV]</field>
<field type="uint16_t" name="cellvoltage4">Battery pack cell 4 voltage in [mV]</field>
<field type="uint16_t" name="cellvoltage5">Battery pack cell 5 voltage in [mV]</field>
<field type="uint16_t" name="cellvoltage6">Battery pack cell 6 voltage in [mV]</field>
</message>
<message id="210" name="FW_SOARING_DATA">
<description>Fixed-wing soaring (i.e. thermal seeking) data</description>
<field type="uint64_t" name="timestamp">Timestamp [ms]</field>
<field type="uint64_t" name="timestampModeChanged">Timestamp since last mode change[ms]</field>
<field type="float" name="CurrentUpdraftSpeed">Updraft speed at current/local airplane position [m/s]</field>
<field type="float" name="xW">Thermal core updraft strength [m/s]</field>
<field type="float" name="xR">Thermal radius [m]</field>
<field type="float" name="xLat">Thermal center latitude [deg]</field>
<field type="float" name="xLon">Thermal center longitude [deg]</field>
<field type="float" name="VarW">Variance W</field>
<field type="float" name="VarR">Variance R</field>
<field type="float" name="VarLat">Variance Lat</field>
<field type="float" name="VarLon">Variance Lon </field>
<field type="float" name="LoiterRadius">Suggested loiter radius [m]</field>
<field type="uint8_t" name="ControlMode">Control Mode [-]</field>
<field type="uint8_t" name="valid">Data valid [-]</field>
</message>
<message id="211" name="SENSORPOD_STATUS">
<description>Monitoring of sensorpod status</description>
<field type="uint64_t" name="timestamp">Timestamp in linuxtime [ms] (since 1.1.1970)</field>
<field type="uint8_t" name="visensor_rate_1">Rate of ROS topic 1</field>
<field type="uint8_t" name="visensor_rate_2">Rate of ROS topic 2</field>
<field type="uint8_t" name="visensor_rate_3">Rate of ROS topic 3</field>
<field type="uint8_t" name="visensor_rate_4">Rate of ROS topic 4</field>
<field type="uint8_t" name="recording_nodes_count">Number of recording nodes</field>
<field type="uint8_t" name="cpu_temp">Temperature of sensorpod CPU in [deg C]</field>
<field type="uint16_t" name="free_space">Free space available in recordings directory in [Gb] * 1e2</field>
</message>
</messages>
</mavlink>
Loading