Merge pull request #4 from df8oe/master

corrected mistaken tx power table, removed unneccessary register reads of radio chip
pull/5/head^2
Qyon 2017-06-13 18:11:10 +02:00 zatwierdzone przez GitHub
commit 0f5eff7a6b
3 zmienionych plików z 20 dodań i 18 usunięć

Wyświetl plik

@ -5,7 +5,9 @@ SET(CMAKE_SYSTEM_VERSION 1)
if(UNIX)
set(TOOLCHAIN_DIR "/opt/gcc-arm-none-eabi-5_4-2016q3/bin/")
set(TOOLCHAIN_DIR "/opt/gcc-arm-none-eabi-5_4-2016q3/bin/")
# set(CMAKE_C_COMPILER "/opt/gcc-arm-none-eabi-5_4-2016q3/bin/arm-none-eabi-gcc")
# set(CMAKE_CXX_COMPILER "/opt/gcc-arm-none-eabi-5_4-2016q3/bin/arm-none-eabi-g++")
CMAKE_FORCE_C_COMPILER(${TOOLCHAIN_DIR}/arm-none-eabi-gcc GNU)
CMAKE_FORCE_CXX_COMPILER(${TOOLCHAIN_DIR}/arm-none-eabi-g++ GNU)
else()
@ -14,7 +16,7 @@ else()
CMAKE_FORCE_CXX_COMPILER(${TOOLCHAIN_DIR}/arm-none-eabi-g++.exe GNU)
endif()
project(STM32_RTTY C ASM CXX)
project(STM32_RTTY C CXX)
add_definitions(-DSTM32F100C8)
add_definitions(-DSTM32F10X_MD_VL)

Wyświetl plik

@ -45,14 +45,14 @@
#define RTTY_USE_2_STOP_BITS 0
//********* power definition**************************
#define TX_POWER 0 // PWR 0...7 0- MIN ... 7 - MAX
// 0 --> -8dBm
// 1 --> -5dBm
// 2 --> -2dBm
// 3 --> 1dBm
// 4 --> 4dBm
// 5 --> 7dBm
// 6 --> 10dBm
// 7 --> 13dBm
// 0 --> -1dBm
// 1 --> 2dBm
// 2 --> 5dBm
// 3 --> 8dBm
// 4 --> 11dBm
// 5 --> 14dBm
// 6 --> 17dBm
// 7 --> 20dBm
//****************************************************
// WARNING: do not use this in flying tracker!
#define ALLOW_DISABLE_BY_BUTTON 1

16
main.c
Wyświetl plik

@ -142,10 +142,10 @@ int main(void) {
GPIO_SetBits(GPIOB, RED);
USART_SendData(USART3, 0xc);
radio_rw_register(0x02, 0xff, 0);
radio_rw_register(0x03, 0xff, 0);
radio_rw_register(0x04, 0xff, 0);
// radio_rw_register(0x02, 0xff, 0);
// radio_rw_register(0x03, 0xff, 0);
// radio_rw_register(0x04, 0xff, 0);
radio_soft_reset();
// setting TX frequency
radio_set_tx_frequency(RTTY_FREQUENCY);
@ -154,11 +154,11 @@ int main(void) {
radio_rw_register(0x6D, 00 | (TX_POWER & 0x0007), 1);
radio_rw_register(0x71, 0x00, 1);
radio_rw_register(0x87, 0x08, 0);
radio_rw_register(0x02, 0xff, 0);
radio_rw_register(0x75, 0xff, 0);
radio_rw_register(0x76, 0xff, 0);
radio_rw_register(0x77, 0xff, 0);
// radio_rw_register(0x87, 0x08, 0);
// radio_rw_register(0x02, 0xff, 0);
// radio_rw_register(0x75, 0xff, 0);
// radio_rw_register(0x76, 0xff, 0);
// radio_rw_register(0x77, 0xff, 0);
radio_rw_register(0x12, 0x20, 1);
radio_rw_register(0x13, 0x00, 1);
radio_rw_register(0x12, 0x00, 1);