Skip to content

Commit 623864a

Browse files
committed
AP_HAL_ChibiOS:update README.md, defaults.parm, images.
1 parent 4e43b31 commit 623864a

File tree

4 files changed

+31
-34
lines changed

4 files changed

+31
-34
lines changed

Diff for: libraries/AP_HAL_ChibiOS/hwdef/NarinFC-H7/README.md

+31-28
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Compared with previous autopilots, it has better performance and higher reliabil
6363
- SERIAL3 = GPS1 = USART1
6464
- SERIAL4 = GPS2 = UART4
6565
- SERIAL5 = USER = UART8 (not available except on custom carrier boards) DMA-enabled
66-
- SERIAL6 = USER = UART7
66+
- SERIAL6 = USER = UART7 DMA-enabled
6767
- SERIAL7 = USB2 (Default protocol is MAVLink2)
6868

6969
Serial protocols can be adjusted to personal preferences.
@@ -98,7 +98,14 @@ Compared with previous autopilots, it has better performance and higher reliabil
9898

9999
- JST GH 6P connector
100100

101-
#### 5. GPS & Safety Port
101+
102+
#### 5. RSSI Port
103+
- RSSI input
104+
105+
![SPI Port](./images/13.RSSI.png "RSSI input")
106+
107+
108+
#### 6. GPS & Safety Port
102109

103110
![GPS & Safety Port](./images/4.5.GPS_Safety_Port_JST_GH_10P_Connector.png "GPS & Safety Port")
104111

@@ -107,7 +114,7 @@ Compared with previous autopilots, it has better performance and higher reliabil
107114

108115
![Port Diagram & Pin outs](./images/4.Port_Diagram_Pin_outs_Diagram-B.png "Port Diagram-B")
109116

110-
#### 6. PWM & RC_IN
117+
#### 7. PWM & RC_IN
111118

112119
The NarinFC-H7 supports up to 14 PWM outputs. Outputs are grouped and all outputs within their group must be the same protocol.
113120

@@ -116,42 +123,38 @@ The NarinFC-H7 supports up to 14 PWM outputs. Outputs are grouped and all output
116123
- 2.54mm pitch Dupont connector
117124
- RC_IN : Remote control receiver
118125

119-
#### 7. Power Input
126+
#### 8. Power Input
120127

121128
![Power Input](./images/4.7.Power_Input.png "Power Input")
122129

123130
- 2mm pitch Dupont connector
124131

125-
#### 8. DEBUG & UART7 Port
132+
133+
#### 9. ADC Port
134+
- ADC input
135+
136+
![SPI Port](./images/12.ADC.png "ADC input")
137+
138+
#### 10. DEBUG & UART7 Port
126139

127140
![DEBUG Port](./images/4.8.DEBUG_Port_JST_HG_6P_Connector.png "DEBUG Port")
128141

129142
- JST GH 6P connector
130143
- DEBUG NODMA
131144

132-
#### 9. USB Port
145+
#### 11. USB Port
133146
- USB C Type
134147

135-
#### 10. SPI Port
148+
#### 12. SPI Port
136149

137150
![SPI Port](./images/4.10.SPI_Port_JST_GH_7P_Connector.png "SPI Port")
138151

139152
- JST GH 7P connector
140153
- SPI Port
141154

142-
#### 11. SD CARD
155+
#### 13. SD CARD
143156
- SD CARD
144157

145-
#### 12. ADC Port
146-
- ADC input
147-
148-
![SPI Port](./images/12.ADC.png "ADC input")
149-
150-
#### 13. RSSI Port
151-
- RSSI input
152-
153-
![SPI Port](./images/13.RSSI.png "RSSI input")
154-
155158
## PWM Output
156159

157160
The NarinFC-H7 supports up to 14 PWM outputs.
@@ -191,18 +194,18 @@ pins:
191194

192195
The NarinFC-H7 has 2 analog inputs, one 6V tolerant and one 3.3V tolerant
193196

194-
- ADC Pin4 -> ADC 6.6V Sense
195-
- ADC Pin18 -> ADC 3.3V Sense
196-
- Analog 3.3V RSSI input pin = 6
197+
- ADC Pin16 -> BATT_VOLTAGE_SENS
198+
- ADC Pin17 -> BATT_CURRENT_SENS
199+
- ADC Pin14 -> BATT2_VOLTAGE_SENS
200+
- ADC Pin2 -> BATT2_VOLTAGE_SENS
201+
- ADC Pin4 -> SPARE1_ADC1(6.6V)
202+
- ADC Pin18 -> SPARE2_ADC1(3.3V)
203+
- ADC Pin6 -> RSSI_IN_ADC1(3.3V)
204+
- ADC Pin8 -> VDD_5V_SENS
205+
- ADC Pin11 -> SCALED_V3V3
197206

198207
## Battery Monitor
199-
200-
If you are using an analog battery monitor instead, connect to the Power A connector and set the following parameters (if used as second monitor use the BATT2 parameters instead):
201-
202-
- :ref:`BATT_MONITOR<BATT_MONITOR>` = 4
203-
- :ref:`BATT_CURR_PIN<BATT_CURR_PIN__AP_BattMonitor_Analog>` = 17
204-
- :ref:`BATT_VOLT_PIN<BATT_VOLT_PIN__AP_BattMonitor_Analog>` = 16
205-
- Set the :ref:`BATT_AMP_PERVLT<BATT_AMP_PERVLT__AP_BattMonitor_Analog>` and :ref:`BATT_VOLT_MULT<BATT_VOLT_MULT__AP_BattMonitor_Analog>` as required for the analog PMU used.
208+
The board has two dedicated power monitor ports on 6 pin connectors. The correct battery setting parameters are dependent on the type of power brick which is connected.
206209

207210
## RC Input
208211

Diff for: libraries/AP_HAL_ChibiOS/hwdef/NarinFC-H7/defaults.parm

-6
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,3 @@ BRD_HEAT_I 0.07
1010
# turn on the CAN power monitoring(default)
1111
CAN_P1_DRIVER 1
1212
BATT_MONITOR 8
13-
14-
# setup the parameter for the ADC power module
15-
BATT_VOLT_PIN 16
16-
BATT_CURR_PIN 17
17-
BATT_VOLT_MULT 18.000
18-
BATT_AMP_PERVLT 24.000
Loading
Loading

0 commit comments

Comments
 (0)