rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

LP-72 Various typo fixes - Set PPM input as default

Browse Source
This commit is contained in:
Laurent Lalanne 2016-05-25 11:35:47 +02:00
parent 0628949afd
commit 2138516dfe
8 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
flight/pios/common/pios_wavplay.c
View File

@ -77,12 +77,12 @@ typedef enum {
Unvalid_RIFF_ID,
Unvalid_WAVE_Format,
Unvalid_FormatChunk_ID,
Unsupporetd_FormatTag,
Unsupporetd_Number_Of_Channel,
Unsupporetd_Sample_Rate,
Unsupporetd_Bits_Per_Sample,
Unsupported_FormatTag,
Unsupported_Number_Of_Channel,
Unsupported_Sample_Rate,
Unsupported_Bits_Per_Sample,
Unvalid_DataChunk_ID,
Unsupporetd_ExtraFormatBytes,
Unsupported_ExtraFormatBytes,
Unvalid_FactChunk_ID
} ErrorCode;
@ -256,13 +256,13 @@ static ErrorCode WavePlayer_WaveParsing(uint8_t *DirName, uint8_t *FileName, uin
/* Read the audio format, must be 0x01 (PCM) -------------------------------*/
WAVE_Format.FormatTag = ReadUnit(buffer1, 20, 2, LittleEndian);
if (WAVE_Format.FormatTag != WAVE_FORMAT_PCM) {
return Unsupporetd_FormatTag;
return Unsupported_FormatTag;
}
/* Read the number of channels, must be 0x01 (Mono) ------------------------*/
WAVE_Format.NumChannels = ReadUnit(buffer1, 22, 2, LittleEndian);
if (WAVE_Format.NumChannels != CHANNEL_MONO) {
return Unsupporetd_Number_Of_Channel;
return Unsupported_Number_Of_Channel;
}
/* Read the Sample Rate ----------------------------------------------------*/
@ -282,7 +282,7 @@ static ErrorCode WavePlayer_WaveParsing(uint8_t *DirName, uint8_t *FileName, uin
TIM6ARRValue = (PIOS_PERIPHERAL_APB1_CLOCK) / 44100;
break; /* 44.1KHz = 24MHz / 544 */
default:
return Unsupporetd_Sample_Rate;
return Unsupported_Sample_Rate;
}
/* Read the Byte Rate ------------------------------------------------------*/
@ -294,7 +294,7 @@ static ErrorCode WavePlayer_WaveParsing(uint8_t *DirName, uint8_t *FileName, uin
/* Read the number of bits per sample --------------------------------------*/
WAVE_Format.BitsPerSample = ReadUnit(buffer1, 34, 2, LittleEndian);
if (WAVE_Format.BitsPerSample != BITS_PER_SAMPLE_8) {
return Unsupporetd_Bits_Per_Sample;
return Unsupported_Bits_Per_Sample;
}
SpeechDataOffset = 36;
/* If there is Extra format bytes, these bytes will be defined in "Fact Chunk" */
@ -302,7 +302,7 @@ static ErrorCode WavePlayer_WaveParsing(uint8_t *DirName, uint8_t *FileName, uin
/* Read th Extra format bytes, must be 0x00 ------------------------------*/
Temp = ReadUnit(buffer1, 36, 2, LittleEndian);
if (Temp != 0x00) {
return Unsupporetd_ExtraFormatBytes;
return Unsupported_ExtraFormatBytes;
}
/* Read the Fact chunk, must be 'fact' -----------------------------------*/
Temp = ReadUnit(buffer1, 38, 4, BigEndian);

2
flight/targets/boards/discoveryf4bare/firmware/pios_board.c
View File

@ -863,7 +863,7 @@ void PIOS_Board_Init(void)
OPLinkStatusSet(&oplinkStatus);
#endif /* PIOS_INCLUDE_RFM22B */
#if defined(PIOS_INCLUDE_PWM) || defined(PIOS_INCLUDE_PWM)
#if defined(PIOS_INCLUDE_PWM) || defined(PIOS_INCLUDE_PPM)
const struct pios_servo_cfg *pios_servo_cfg;
// default to servo outputs only

2
flight/targets/boards/revolution/firmware/pios_board.c
View File

@ -944,7 +944,7 @@ void PIOS_Board_Init(void)
OPLinkStatusSet(&oplinkStatus);
#endif /* PIOS_INCLUDE_RFM22B */
#if defined(PIOS_INCLUDE_PWM) || defined(PIOS_INCLUDE_PWM)
#if defined(PIOS_INCLUDE_PWM) || defined(PIOS_INCLUDE_PPM)
const struct pios_servo_cfg *pios_servo_cfg;
// default to servo outputs only
pios_servo_cfg = &pios_servo_cfg_out;

2
flight/targets/boards/revonano/firmware/pios_board.c
View File

@ -775,7 +775,7 @@ void PIOS_Board_Init(void)
} /* hwsettings_rm_flexiport */
#if defined(PIOS_INCLUDE_PWM) || defined(PIOS_INCLUDE_PWM)
#if defined(PIOS_INCLUDE_PWM) || defined(PIOS_INCLUDE_PPM)
const struct pios_servo_cfg *pios_servo_cfg;
// default to servo outputs only

2
flight/targets/boards/sparky2/firmware/inc/pios_config.h
View File

@ -103,7 +103,7 @@
/* #define PIOS_INCLUDE_HCSR04 */
/* PIOS receiver drivers */
#define PIOS_INCLUDE_PWM
/* #define PIOS_INCLUDE_PWM */
#define PIOS_INCLUDE_PPM
/* #define PIOS_INCLUDE_PPM_FLEXI */
#define PIOS_INCLUDE_DSM

8
flight/targets/boards/sparky2/firmware/pios_board.c
View File

@ -884,19 +884,19 @@ void PIOS_Board_Init(void)
#endif /* PIOS_INCLUDE_RFM22B */
#if 1
#if defined(PIOS_INCLUDE_PWM) || defined(PIOS_INCLUDE_PWM)
#if defined(PIOS_INCLUDE_PPM)
const struct pios_servo_cfg *pios_servo_cfg;
// default to servo outputs only
pios_servo_cfg = &pios_servo_cfg_out;
#endif
#endif
/* Configure the receiver port*/
// Configure the receiver port
// Sparky2 receiver input on PC7 TIM8 CH2
// that appears to include PPM, DSM, DSM-HSUM, SBUS
// include PPM,S.Bus,DSM,SRXL,EX.Bus,HoTT SUMD,HoTT SUMH
uint8_t hwsettings_rcvrport;
HwSettingsSPK2_RcvrPortGet(&hwsettings_rcvrport);
//
switch (hwsettings_rcvrport) {
case HWSETTINGS_SPK2_RCVRPORT_PPM:
#if defined(PIOS_INCLUDE_PPM)

2
ground/gcs/src/plugins/uploader/devicewidget.cpp
View File

@ -374,7 +374,7 @@ void DeviceWidget::uploadFirmware()
int firmwareBoard = ((quint16)(quint8)desc.at(12) << 8) + (quint16)(quint8)desc.at(13);
if ((board == 0x0401 && firmwareBoard == 0x0402) ||
(board == 0x0901 && firmwareBoard == 0x0902) || // L3GD20 revo supports Revolution firmware
(board == 0x0902 && firmwareBoard == 0x0903)) { // RevoMini1 supporetd by RevoMini2 firmware
(board == 0x0902 && firmwareBoard == 0x0903)) { // RevoMini1 supported by RevoMini2 firmware
// These firmwares are designed to be backwards compatible
} else if (firmwareBoard != board) {
char buf[100];

2
shared/uavobjectdefinition/hwsettings.xml
View File

@ -17,7 +17,7 @@
<field name="RM_MainPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,S.Bus,DSM,DebugConsole,ComBridge,OsdHk,MSP" defaultvalue="Disabled"/>
<field name="RM_FlexiPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,I2C,DSM,EX.Bus,HoTT SUMD,HoTT SUMH,SRXL,DebugConsole,ComBridge,OsdHk,MSP" defaultvalue="Disabled"/>
<field name="SPK2_RcvrPort" units="function" type="enum" elements="1" options="Disabled,PPM,S.Bus,DSM,SRXL,EX.Bus,HoTT SUMD,HoTT SUMH" defaultvalue="S.Bus"/>
<field name="SPK2_RcvrPort" units="function" type="enum" elements="1" options="Disabled,PPM,S.Bus,DSM,SRXL,EX.Bus,HoTT SUMD,HoTT SUMH" defaultvalue="PPM"/>
<field name="SPK2_MainPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,DSM,DebugConsole,ComBridge,OsdHk,MSP" defaultvalue="Disabled"/>
<field name="SPK2_FlexiPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,I2C,DSM,EX.Bus,HoTT SUMD,HoTT SUMH,SRXL,DebugConsole,ComBridge,OsdHk,MSP" defaultvalue="Disabled"/>
<field name="SPK2_I2CPort" units="function" type="enum" elements="1" options="Disabled,I2C" defaultvalue="Disabled"/>