mirror
/
pecanpico10
kopia lustrzana https://github.com/DL7AD/pecanpico10
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Change systick to 5KHz. BPF to 55, enable mag filter and set to 15

pull/1/head
CInsights 2018-02-08 12:46:23 +11:00
rodzic e7c3dfc807
commit c1e5a69fd1
10 zmienionych plików z 619 dodań i 613 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
tracker/software/.cproject
Wyświetl plik

@ -48,9 +48,15 @@
<storageModule moduleId="cdtBuildSystem" version="4.0.0"> <storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="pecan10master.null.218906227" name="pecan10master"/> <project id="pecan10master.null.218906227" name="pecan10master"/>
</storageModule> </storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/> <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="refreshScope"/> <storageModule moduleId="refreshScope"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1712694318;cdt.managedbuild.toolchain.gnu.cross.base.1712694318.64830061;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1026108526;cdt.managedbuild.tool.gnu.cpp.compiler.input.85562960">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1712694318;cdt.managedbuild.toolchain.gnu.cross.base.1712694318.64830061;cdt.managedbuild.tool.gnu.cross.c.compiler.779862354;cdt.managedbuild.tool.gnu.c.compiler.input.1257116579">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
</storageModule>
</cproject> </cproject>

1
tracker/software/.gitignore vendored 100644
Wyświetl plik

@ -0,0 +1 @@
/debug/

2
tracker/software/.settings/language.settings.xml
Wyświetl plik

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/> <provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="138446027592133826" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="461136237790816521" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

1190
tracker/software/chconf.h
Wyświetl plik

Plik diff jest za duży Load Diff

4
tracker/software/config.c
Wyświetl plik

@ -7,7 +7,7 @@ conf_t config = {
// Primary position transmission thread // Primary position transmission thread
.pos_pri = { .pos_pri = {
.thread_conf = { .thread_conf = {
.active = true, .active = false,
.cycle = TIME_S2I(120) .cycle = TIME_S2I(120)
}, },
.radio_conf = { .radio_conf = {
@ -106,7 +106,7 @@ conf_t config = {
}, },
.rx = { .rx = {
.thread_conf = { .thread_conf = {
.active = false .active = true
}, },
.radio_conf = { .radio_conf = {
.pwr = 0x7F, .pwr = 0x7F,

6
tracker/software/io/channels/rxafsk.h
Wyświetl plik

@ -68,15 +68,15 @@
#define MAG_FILTER_GEN_COEFF TRUE #define MAG_FILTER_GEN_COEFF TRUE
#define MAG_FILTER_HIGH 1400 #define MAG_FILTER_HIGH 1400
#define PRE_FILTER_NUM_TAPS 311U #define PRE_FILTER_NUM_TAPS 55U //311U
#define PRE_FILTER_BLOCK_SIZE 1U #define PRE_FILTER_BLOCK_SIZE 1U
#if PRE_FILTER_BLOCK_SIZE != 1 #if PRE_FILTER_BLOCK_SIZE != 1
#error "Filter block size must be 1" #error "Filter block size must be 1"
#endif #endif
#define USE_QCORR_MAG_LPF FALSE #define USE_QCORR_MAG_LPF TRUE
#define MAG_FILTER_NUM_TAPS 29U #define MAG_FILTER_NUM_TAPS 15U
#define MAG_FILTER_BLOCK_SIZE 1U #define MAG_FILTER_BLOCK_SIZE 1U
#if MAG_FILTER_BLOCK_SIZE != 1 #if MAG_FILTER_BLOCK_SIZE != 1
#error "Filter block size must be 1" #error "Filter block size must be 1"

3
tracker/software/io/channels/rxpwm.h
Wyświetl plik

@ -32,8 +32,7 @@
* TODO: This should be calculated using SYSTEM CLOCK. * TODO: This should be calculated using SYSTEM CLOCK.
* ICU has to run at an integer divide from SYSTEM CLOCK. * ICU has to run at an integer divide from SYSTEM CLOCK.
*/ */
#define ICU_COUNT_FREQUENCY 2880000U #define ICU_COUNT_FREQUENCY 4000000U
//#define ICU_COUNT_FREQUENCY 2000000U
/* Limit of ICU and PWM count for packed format. */ /* Limit of ICU and PWM count for packed format. */
#define ICU_MAX_COUNT 0xFFFFFF #define ICU_MAX_COUNT 0xFFFFFF

8
tracker/software/mcuconf.h
Wyświetl plik

@ -39,14 +39,14 @@
* HAL driver system settings. * HAL driver system settings.
*/ */
#define STM32_NO_INIT FALSE #define STM32_NO_INIT FALSE
#define STM32_HSI_ENABLED TRUE #define STM32_HSI_ENABLED FALSE
#define STM32_LSI_ENABLED TRUE #define STM32_LSI_ENABLED TRUE
#define STM32_HSE_ENABLED FALSE #define STM32_HSE_ENABLED TRUE
#define STM32_LSE_ENABLED FALSE #define STM32_LSE_ENABLED FALSE
#define STM32_CLOCK48_REQUIRED TRUE #define STM32_CLOCK48_REQUIRED TRUE
#define STM32_SW STM32_SW_PLL #define STM32_SW STM32_SW_PLL
#define STM32_PLLSRC STM32_PLLSRC_HSI #define STM32_PLLSRC STM32_PLLSRC_HSE
#define STM32_PLLM_VALUE 16 #define STM32_PLLM_VALUE 26
#define STM32_PLLN_VALUE 384 #define STM32_PLLN_VALUE 384
#define STM32_PLLP_VALUE 8 #define STM32_PLLP_VALUE 8
#define STM32_PLLQ_VALUE 8 #define STM32_PLLQ_VALUE 8

4
tracker/software/portab.h
Wyświetl plik

@ -28,8 +28,8 @@
#define PWM_ICU ICUD4 #define PWM_ICU ICUD4
/* Definitions for ICU FIFO implemented using chfactory. */ /* Definitions for ICU FIFO implemented using chfactory. */
#define NUMBER_PWM_FIFOS 4 #define NUMBER_PWM_FIFOS 4
#define PWM_BUFFER_SLOTS 6000 #define PWM_BUFFER_SLOTS 6000
/* Number of AX25 output buffers. */ /* Number of AX25 output buffers. */
#define NUMBER_PKT_FIFOS 2U #define NUMBER_PKT_FIFOS 2U

2
tracker/software/types.h
Wyświetl plik

@ -4,7 +4,7 @@
#include "ch.h" #include "ch.h"
#include "ax25_pad.h" #include "ax25_pad.h"
#define FREQ_APRS_DYNAMIC 0 #define FREQ_APRS_DYNAMIC 145175000
#define CYCLE_CONTINUOUSLY 0 #define CYCLE_CONTINUOUSLY 0
typedef struct { typedef struct {