Skip to content

Commit 19a459f

Browse files
RichardB01RichardB01
committed
implemented enable/disable transmissions
1 parent b444a17 commit 19a459f

File tree

5 files changed

+143
-68
lines changed

5 files changed

+143
-68
lines changed

‎FOSSAGSCP/include/Interpreter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class Interpreter : public QObject
9595
IGroundStationSerialMessage* Create_CMD_Deploy();
9696
IGroundStationSerialMessage* Create_CMD_Restart();
9797
IGroundStationSerialMessage *Create_CMD_Wipe_EEPROM(char flags);
98-
IGroundStationSerialMessage* Create_CMD_Set_Transmit_Enable();
98+
IGroundStationSerialMessage* Create_CMD_Set_Transmit_Enable(char transmitEnabled, char autoStatsEnabled, char fskMandatedEnabled);
9999
IGroundStationSerialMessage* Create_CMD_Set_Callsign();
100100
IGroundStationSerialMessage* Create_CMD_Set_SF_Mode();
101101
IGroundStationSerialMessage* Create_CMD_Set_MPPT_Mode();

‎FOSSAGSCP/mainwindow.cpp

+14-1
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,8 @@ void MainWindow::on_SatelliteConfig_ADCs_Controller_Set_Button_clicked()
427427

428428

429429

430+
431+
430432
static std::vector<ephemerides_t> g_ephemeridesControllerStack;
431433

432434
void MainWindow::on_Satelliteconfig_ADCs_Ephemerides_DataStack_Push_Button_clicked()
@@ -489,6 +491,18 @@ void MainWindow::on_EEPROM_Control_Wipe_Button_clicked()
489491
this->SendSerialData(msg);
490492
}
491493

494+
void MainWindow::on_SatelliteConfig_Transmission_Send_Button_clicked()
495+
{
496+
// fossasat-2.
497+
char transmitEnabled = ui->SatelliteConfig_Transmission_Enabled_RadioButton->isChecked();
498+
char automatedStatsTransmissionEnabled = ui->SatelliteConfig_Transmission_AutoStatsEnabled_RadioButton->isChecked();
499+
char FSKMandatedForLargePacketsEnabled = ui->SatelliteConfig_Transmission_FSKMandated_Enabled_RadioButton->isChecked();
500+
501+
IGroundStationSerialMessage* msg = m_interpreter->Create_CMD_Set_Transmit_Enable(transmitEnabled, automatedStatsTransmissionEnabled, FSKMandatedForLargePacketsEnabled);
502+
this->SendSerialData(msg);
503+
}
504+
505+
492506
#define SatelliteControlsTab_End }
493507

494508

@@ -1029,4 +1043,3 @@ void MainWindow::on_actionView_Serial_Ports_triggered()
10291043
msgBox.exec();
10301044
}
10311045

1032-

‎FOSSAGSCP/mainwindow.h

+2
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ private slots:
9898

9999
void on_EEPROM_Control_Wipe_Button_clicked();
100100

101+
void on_SatelliteConfig_Transmission_Send_Button_clicked();
102+
101103
private:
102104

103105
Ui::MainWindow *ui; // this pointer is private and only available in mainwindow.h

‎FOSSAGSCP/mainwindow.ui

+102-66
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<enum>QTabWidget::Triangular</enum>
3434
</property>
3535
<property name="currentIndex">
36-
<number>0</number>
36+
<number>1</number>
3737
</property>
3838
<property name="elideMode">
3939
<enum>Qt::ElideRight</enum>
@@ -1749,9 +1749,9 @@ tolerance check:</string>
17491749
<property name="geometry">
17501750
<rect>
17511751
<x>223</x>
1752-
<y>0</y>
1752+
<y>-596</y>
17531753
<width>465</width>
1754-
<height>3460</height>
1754+
<height>3499</height>
17551755
</rect>
17561756
</property>
17571757
<property name="sizePolicy">
@@ -2026,69 +2026,6 @@ tolerance check:</string>
20262026
</property>
20272027
</spacer>
20282028
</item>
2029-
<item row="10" column="0" colspan="3">
2030-
<widget class="QGroupBox" name="transmittingGroupBox">
2031-
<property name="title">
2032-
<string>Transmission Enable/Disable</string>
2033-
</property>
2034-
<layout class="QGridLayout" name="gridLayout_17">
2035-
<item row="0" column="1">
2036-
<widget class="QRadioButton" name="SatelliteConfig_Transmission_Disabled_RadioButton">
2037-
<property name="text">
2038-
<string>Transmissions Disabled</string>
2039-
</property>
2040-
<attribute name="buttonGroup">
2041-
<string notr="true">transmissionsEnabledDisabledButtonGroup</string>
2042-
</attribute>
2043-
</widget>
2044-
</item>
2045-
<item row="1" column="0">
2046-
<widget class="QRadioButton" name="SatelliteConfig_Transmission_AutoStatsEnabled_RadioButton">
2047-
<property name="text">
2048-
<string>Automated Statistics Enabled</string>
2049-
</property>
2050-
<attribute name="buttonGroup">
2051-
<string notr="true">automatedStatisticsEnabledDisabledButtonGroup</string>
2052-
</attribute>
2053-
</widget>
2054-
</item>
2055-
<item row="1" column="1">
2056-
<widget class="QRadioButton" name="SatelliteConfig_Transmission_AutoStatsDisabled_RadioButton">
2057-
<property name="text">
2058-
<string>Automated Statistics Disabled</string>
2059-
</property>
2060-
<attribute name="buttonGroup">
2061-
<string notr="true">automatedStatisticsEnabledDisabledButtonGroup</string>
2062-
</attribute>
2063-
</widget>
2064-
</item>
2065-
<item row="0" column="0">
2066-
<widget class="QRadioButton" name="SatelliteConfig_Transmission_Enabled_RadioButton">
2067-
<property name="text">
2068-
<string>Transmissions Enabled</string>
2069-
</property>
2070-
<attribute name="buttonGroup">
2071-
<string notr="true">transmissionsEnabledDisabledButtonGroup</string>
2072-
</attribute>
2073-
</widget>
2074-
</item>
2075-
<item row="2" column="0">
2076-
<widget class="QPushButton" name="SatelliteConfig_Transmission_Send_Button">
2077-
<property name="text">
2078-
<string>Set</string>
2079-
</property>
2080-
</widget>
2081-
</item>
2082-
<item row="2" column="1">
2083-
<widget class="QPushButton" name="SatelliteConfig_Transmission_Refresh_Button">
2084-
<property name="text">
2085-
<string>Refresh</string>
2086-
</property>
2087-
</widget>
2088-
</item>
2089-
</layout>
2090-
</widget>
2091-
</item>
20922029
<item row="14" column="0" colspan="3">
20932030
<widget class="QGroupBox" name="MPPTGroupBox">
20942031
<property name="title">
@@ -2929,6 +2866,105 @@ Data stack</string>
29292866
</layout>
29302867
</widget>
29312868
</item>
2869+
<item row="10" column="0">
2870+
<widget class="QGroupBox" name="transmittingGroupBox">
2871+
<property name="title">
2872+
<string>Transmission Enable/Disable</string>
2873+
</property>
2874+
<layout class="QGridLayout" name="gridLayout_17">
2875+
<item row="2" column="1">
2876+
<widget class="QRadioButton" name="SatelliteConfig_Transmission_FSKMandated_Enabled_RadioButton">
2877+
<property name="text">
2878+
<string>Enabled</string>
2879+
</property>
2880+
</widget>
2881+
</item>
2882+
<item row="2" column="2">
2883+
<widget class="QRadioButton" name="SatelliteConfig_Transmission_FSKMandated_Disabled_RadioButton">
2884+
<property name="text">
2885+
<string>Disabled</string>
2886+
</property>
2887+
</widget>
2888+
</item>
2889+
<item row="1" column="2">
2890+
<widget class="QRadioButton" name="SatelliteConfig_Transmission_AutoStatsDisabled_RadioButton">
2891+
<property name="text">
2892+
<string>Disabled</string>
2893+
</property>
2894+
<attribute name="buttonGroup">
2895+
<string notr="true">automatedStatisticsEnabledDisabledButtonGroup</string>
2896+
</attribute>
2897+
</widget>
2898+
</item>
2899+
<item row="0" column="1">
2900+
<widget class="QRadioButton" name="SatelliteConfig_Transmission_Enabled_RadioButton">
2901+
<property name="text">
2902+
<string>Enabled</string>
2903+
</property>
2904+
<attribute name="buttonGroup">
2905+
<string notr="true">transmissionsEnabledDisabledButtonGroup</string>
2906+
</attribute>
2907+
</widget>
2908+
</item>
2909+
<item row="3" column="1">
2910+
<widget class="QPushButton" name="SatelliteConfig_Transmission_Send_Button">
2911+
<property name="text">
2912+
<string>Set</string>
2913+
</property>
2914+
</widget>
2915+
</item>
2916+
<item row="0" column="2">
2917+
<widget class="QRadioButton" name="SatelliteConfig_Transmission_Disabled_RadioButton">
2918+
<property name="text">
2919+
<string>Disabled</string>
2920+
</property>
2921+
<attribute name="buttonGroup">
2922+
<string notr="true">transmissionsEnabledDisabledButtonGroup</string>
2923+
</attribute>
2924+
</widget>
2925+
</item>
2926+
<item row="1" column="1">
2927+
<widget class="QRadioButton" name="SatelliteConfig_Transmission_AutoStatsEnabled_RadioButton">
2928+
<property name="text">
2929+
<string>Enabled</string>
2930+
</property>
2931+
<attribute name="buttonGroup">
2932+
<string notr="true">automatedStatisticsEnabledDisabledButtonGroup</string>
2933+
</attribute>
2934+
</widget>
2935+
</item>
2936+
<item row="3" column="2">
2937+
<widget class="QPushButton" name="SatelliteConfig_Transmission_Refresh_Button">
2938+
<property name="text">
2939+
<string>Refresh</string>
2940+
</property>
2941+
</widget>
2942+
</item>
2943+
<item row="0" column="0">
2944+
<widget class="QLabel" name="label_141">
2945+
<property name="text">
2946+
<string>Transmissions:</string>
2947+
</property>
2948+
</widget>
2949+
</item>
2950+
<item row="1" column="0">
2951+
<widget class="QLabel" name="label_142">
2952+
<property name="text">
2953+
<string>Auto. Stats. Transmission:</string>
2954+
</property>
2955+
</widget>
2956+
</item>
2957+
<item row="2" column="0">
2958+
<widget class="QLabel" name="label_143">
2959+
<property name="text">
2960+
<string>FSK Mandated for
2961+
large packets:</string>
2962+
</property>
2963+
</widget>
2964+
</item>
2965+
</layout>
2966+
</widget>
2967+
</item>
29322968
</layout>
29332969
</widget>
29342970
</widget>

‎FOSSAGSCP/src/Interpreter.cpp

+24
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,30 @@ IGroundStationSerialMessage *Interpreter::Create_CMD_Wipe_EEPROM(char flags)
372372
return msg;
373373
}
374374

375+
IGroundStationSerialMessage *Interpreter::Create_CMD_Set_Transmit_Enable(char transmitEnabled, char autoStatsEnabled, char fskMandatedEnabled)
376+
{
377+
IGroundStationSerialMessage* msg;
378+
379+
if (m_satVersion == VERSION_1B)
380+
{
381+
char optData[1];
382+
optData[0] = transmitEnabled;
383+
384+
this->Create_GroundStationSerialMessage(FCPI_FRAME_OP, CMD_SET_TRANSMIT_ENABLE, 1, optData);
385+
}
386+
else if (m_satVersion == VERSION_2)
387+
{
388+
char optData[3];
389+
optData[0] = transmitEnabled;
390+
optData[1] = autoStatsEnabled;
391+
optData[2] = fskMandatedEnabled;
392+
393+
this->Create_GroundStationSerialMessage(FCPI_FRAME_OP, CMD_WIPE_EEPROM, 3, optData);
394+
}
395+
396+
return msg;
397+
}
398+
375399
IGroundStationSerialMessage *Interpreter::Create_CMD_Camera_Capture(char pictureSlot, char lightMode, char pictureSize, char brightness, char saturation, char specialFilter, char contrast)
376400
{
377401
char optData[4];

0 commit comments

Comments
 (0)