piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Pulses cosmetics

Browse Source
This commit is contained in:
Bertrand Songis
2019-04-23 16:13:25 +02:00
parent ce83924cd8
commit 3da7b22b07
7 changed files with 11 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/pulses/pulses.cpp
+3 -3
View File
@@ -204,7 +204,7 @@ void enablePulses(uint8_t module, uint8_t protocol)
case PROTOCOL_CHANNELS_DSM2_LP45:
case PROTOCOL_CHANNELS_DSM2_DSM2:
case PROTOCOL_CHANNELS_DSM2_DSMX:
init_serial(module, DSM2_BAUDRATE, DSM2_PERIOD * 2000, false);
extmoduleSerialStart(DSM2_BAUDRATE, DSM2_PERIOD * 2000, false);
break;
#endif
@@ -222,12 +222,12 @@ void enablePulses(uint8_t module, uint8_t protocol)
#if defined(MULTIMODULE)
case PROTOCOL_CHANNELS_MULTIMODULE:
init_serial(module, MULTIMODULE_BAUDRATE, MULTIMODULE_PERIOD * 2000, true);
extmoduleSerialStart(MULTIMODULE_BAUDRATE, MULTIMODULE_PERIOD * 2000, true);
break;
#endif
case PROTOCOL_CHANNELS_SBUS:
init_serial(module, SBUS_BAUDRATE, SBUS_PERIOD_HALF_US, false);
extmoduleSerialStart(SBUS_BAUDRATE, SBUS_PERIOD_HALF_US, false);
break;
case PROTOCOL_CHANNELS_PPM:
radio/src/targets/horus/board.h
-1
View File
@@ -225,7 +225,6 @@ void init_pxx1_pulses(uint8_t module);
void disable_pxx1_pulses(uint8_t module);
void init_pxx2(uint8_t module);
void disable_pxx2(uint8_t module);
void init_serial(uint8_t module, uint32_t baudrate, uint32_t period_half_us, bool inverted);
void intmoduleSerialStart(uint32_t baudrate, uint8_t rxEnable);
void disable_serial(uint8_t module);
void intmoduleStop();
radio/src/targets/horus/pulses_driver.cpp
-7
View File
@@ -78,13 +78,6 @@ void disable_pxx1_pulses(uint8_t module)
}
#if defined(DSM2)
void init_serial(uint8_t module, uint32_t baudrate, uint32_t period_half_us, bool inverted)
{
if (module == EXTERNAL_MODULE) {
extmoduleSerialStart(baudrate, period_half_us, inverted);
}
}
void disable_serial(uint8_t module)
{
if (module == EXTERNAL_MODULE) {
radio/src/targets/sky9x/board.h
-1
View File
@@ -259,7 +259,6 @@ void init_ppm(uint32_t port);
void disable_ppm(uint32_t port);
void init_pxx1_pulses(uint32_t port);
void disable_pxx1_pulses(uint32_t port);
void init_serial(uint32_t port, uint32_t baudrate, uint32_t period_half_us, bool inverted);
void disable_serial(uint32_t port);
void init_module_timer( uint32_t module_index, uint32_t period, uint8_t state);
void disable_module_timer( uint32_t module_index);
radio/src/targets/sky9x/pulses_driver.cpp
+8 -13
View File
@@ -236,21 +236,16 @@ void disable_pxx1_pulses(uint32_t port)
}
}
void init_serial(uint32_t port, uint32_t baudrate, uint32_t period_half_us, bool inverted)
void extmoduleSerialStart(uint32_t baudrate, uint32_t period_half_us, bool inverted)
{
if (port == EXTERNAL_MODULE) {
if (baudrate == 125000) {
// TODO init_main_ppm could take the period as parameter?
init_main_ppm(2500 * 2, 0);
init_ssc(125);
}
else {
init_main_ppm(3500 * 2, 0);
init_ssc(100);
}
}
if (baudrate == 125000) {
// TODO init_main_ppm could take the period as parameter?
init_main_ppm(2500 * 2, 0);
init_ssc(125);
}
else {
// TODO
init_main_ppm(3500 * 2, 0);
init_ssc(100);
}
}
radio/src/targets/taranis/board.h
-1
View File
@@ -189,7 +189,6 @@ void init_pxx1_pulses(uint8_t module);
void init_pxx1_serial(uint8_t module);
void disable_pxx1_pulses(uint8_t module);
void disable_pxx1_serial(uint8_t module);
void init_serial(uint8_t module, uint32_t baudrate, uint32_t period, bool inverted);
void disable_serial(uint8_t module);
void intmoduleStop();
void intmodulePxxStart();
radio/src/targets/taranis/pulses_driver.cpp
-7
View File
@@ -73,13 +73,6 @@ void disable_pxx2(uint8_t module)
}
#if defined(DSM2)
void init_serial(uint8_t module, uint32_t baudrate, uint32_t period_half_us, bool inverted)
{
if (module == EXTERNAL_MODULE) {
extmoduleSerialStart(baudrate, period_half_us, inverted);
}
}
void disable_serial(uint8_t module)
{
if (module == EXTERNAL_MODULE) {