fixed cwtx issue

bug_fixes_integration_tx
David Michaeli 2023-06-13 05:42:28 -04:00
rodzic d8d8531137
commit aac8889ddf
5 zmienionych plików z 33136 dodań i 1424 usunięć

Wyświetl plik

@ -28,6 +28,20 @@ printf "\n[ 2 ] ${GREEN}Updating system and installing dependencies...${NC}\n"
sudo apt-get update sudo apt-get update
sudo apt-get -y install raspberrypi-kernel-headers module-assistant pkg-config libncurses5-dev cmake git libzmq3-dev sudo apt-get -y install raspberrypi-kernel-headers module-assistant pkg-config libncurses5-dev cmake git libzmq3-dev
sudo apt-get -y install swig avahi-daemon libavahi-client-dev python3-distutils libpython3-dev sudo apt-get -y install swig avahi-daemon libavahi-client-dev python3-distutils libpython3-dev
# In ubuntu we need to grant access to gpiomem
if grep -iq "NAME=\"Ubuntu\"" /etc/os-release; then
sudo apt-get install rpi.gpio-common
echo "Adding user `whoami` to dialout, root groups"
if [[ "`groups ``whoami`" == *`whoami`* ]]; then
echo "` User already in the group`"
else
sudo usermod -aG dialout, root "${USER}"
fi
fi
sudo depmod -a sudo depmod -a
## -------------------------------------------------------------------- ## --------------------------------------------------------------------
@ -111,9 +125,12 @@ printf "${CYAN}3. SMI kernel module & udev...${NC}\n"
cd $ROOT_DIR/driver cd $ROOT_DIR/driver
kernel_memory=$(grep "MemAvailable:" /proc/meminfo | awk '{print $2}') kernel_memory=$(grep "MemAvailable:" /proc/meminfo | awk '{print $2}')
kernel_memory_mb=$((kernel_memory / 1024)) kernel_memory_mb=$((kernel_memory / 1024))
printf "${CYAN} Detected memory ${kernel_memory_mb} MB...${NC}\n"
if (( kernel_memory_mb > 512 )); then if (( kernel_memory_mb > 512 )); then
printf "${CYAN} Installing with Fifo size multiplier of 6xMTU...${NC}\n"
./install.sh install 6 2 3 ./install.sh install 6 2 3
else else
printf "${CYAN} Installing with Fifo size multiplier of 2xMTU...${NC}\n"
./install.sh install 2 2 3 ./install.sh install 2 2 3
fi fi
cd .. cd ..

Wyświetl plik

@ -311,7 +311,9 @@ static void modem_tx_cw(sys_st *sys)
case 5: case 5:
{ {
state_lo = !state_lo; state_lo = !state_lo;
cariboulite_radio_set_cw_outputs(radio_low, false, state_lo);
cariboulite_radio_activate_channel(radio_low, cariboulite_channel_dir_tx, state_lo); cariboulite_radio_activate_channel(radio_low, cariboulite_channel_dir_tx, state_lo);
//printf(" Power output was %s\n\n", state_lo?"ENABLED":"DISABLED"); //printf(" Power output was %s\n\n", state_lo?"ENABLED":"DISABLED");
if (state_lo == 1) cariboulite_radio_set_tx_power(radio_low, current_power_lo); if (state_lo == 1) cariboulite_radio_set_tx_power(radio_low, current_power_lo);
} }
@ -321,6 +323,7 @@ static void modem_tx_cw(sys_st *sys)
case 6: case 6:
{ {
state_hi = !state_hi; state_hi = !state_hi;
cariboulite_radio_set_cw_outputs(radio_hi, false, state_hi);
cariboulite_radio_activate_channel(radio_hi, cariboulite_channel_dir_tx, state_hi); cariboulite_radio_activate_channel(radio_hi, cariboulite_channel_dir_tx, state_hi);
//printf(" Power output was %s\n\n", state_hi?"ENABLED":"DISABLED"); //printf(" Power output was %s\n\n", state_hi?"ENABLED":"DISABLED");
if (state_hi == 1) cariboulite_radio_set_tx_power(radio_hi, current_power_hi); if (state_hi == 1) cariboulite_radio_set_tx_power(radio_hi, current_power_hi);

Wyświetl plik

@ -908,7 +908,7 @@ int cariboulite_radio_activate_channel(cariboulite_radio_state_st* radio,
.loopback_enable = 0, .loopback_enable = 0,
.drv_strength = at86rf215_iq_drive_current_4ma, .drv_strength = at86rf215_iq_drive_current_4ma,
.common_mode_voltage = at86rf215_iq_common_mode_v_ieee1596_1v2, .common_mode_voltage = at86rf215_iq_common_mode_v_ieee1596_1v2,
.tx_control_with_iq_if = true, .tx_control_with_iq_if = !radio->cw_output,
.radio09_mode = at86rf215_iq_if_mode, .radio09_mode = at86rf215_iq_if_mode,
.radio24_mode = at86rf215_iq_if_mode, .radio24_mode = at86rf215_iq_if_mode,
.clock_skew = at86rf215_iq_clock_data_skew_4_906ns, .clock_skew = at86rf215_iq_clock_data_skew_4_906ns,
@ -965,15 +965,6 @@ int cariboulite_radio_set_cw_outputs(cariboulite_radio_state_st* radio, bool lo_
} }
radio->cw_output = cw_out; radio->cw_output = cw_out;
if (cw_out)
{
radio->channel_direction = cariboulite_channel_dir_tx;
}
else
{
radio->channel_direction = cariboulite_channel_dir_rx;
}
return 0; return 0;
} }

Plik binarny nie jest wyświetlany.