mirror
/
Wolf-LITE
kopia lustrzana https://github.com/UU5JPP/Wolf-LITE
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Encoder ON/OFF TX

master
Антон 2021-08-28 16:58:10 +03:00
rodzic 8e88217c92
commit be3e93dd04
5 zmienionych plików z 192 dodań i 20 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
STM32/Core/Src/front_unit.c
Wyświetl plik

@ -259,7 +259,7 @@ void FRONTPANEL_ENCODER2_checkRotate(void)
static void FRONTPANEL_ENCODER_Rotated(float32_t direction) // rotated encoder, handler here, direction -1 - left, 1 - right
{
if (TRX_on_TX())
if (TRX_on_TX() && TRX.Encoder_OFF == true)
return;
if (TRX.Locked)
return;

1
STM32/Core/Src/settings.c
Wyświetl plik

@ -217,6 +217,7 @@ void LoadSettings(bool clear)
TRX.MIC_EQ_HIG = 0; // Mic EQ (high)
TRX.Beeper = true; //Keyboard beeper
TRX.Encoder_Accelerate = true; //Accelerate Encoder on fast rate
TRX.Encoder_OFF = false; // Encoder ON/OFF TX
strcpy(TRX.CALLSIGN, "HamRad"); // Callsign
TRX.Transverter_Enabled = false; //Enable transverter mode
TRX.Transverter_Offset_Mhz = 120; //Offset from VFO

1
STM32/Core/Src/settings.h
Wyświetl plik

@ -132,6 +132,7 @@ extern struct TRX_SETTINGS
bool Locked;
bool CLAR;
bool Encoder_Accelerate;
bool Encoder_OFF;
char CALLSIGN[MAX_CALLSIGN_LENGTH];
bool Transverter_Enabled;
uint16_t Transverter_Offset_Mhz;

10
STM32/Core/Src/system_menu.c
Wyświetl plik

@ -24,6 +24,7 @@ static void SYSMENU_HANDL_TRX_FRQ_FAST_STEP(int8_t direction);
static void SYSMENU_HANDL_TRX_FRQ_ENC_STEP(int8_t direction);
static void SYSMENU_HANDL_TRX_FRQ_ENC_FAST_STEP(int8_t direction);
static void SYSMENU_HANDL_TRX_ENC_ACCELERATE(int8_t direction);
static void SYSMENU_HANDL_TXOFF_ENC(int8_t direction);
static void SYSMENU_HANDL_TRX_ATT_STEP(int8_t direction);
static void SYSMENU_HANDL_TRX_DEBUG_CONSOLE(int8_t direction);
static void SYSMENU_HANDL_TRX_SetCallsign(int8_t direction);
@ -165,6 +166,7 @@ static const struct sysmenu_item_handler sysmenu_trx_handlers[] =
{"Freq Step", SYSMENU_UINT16, (uint32_t *)&TRX.FRQ_STEP, SYSMENU_HANDL_TRX_FRQ_STEP},
{"Freq Step FAST", SYSMENU_UINT16, (uint32_t *)&TRX.FRQ_FAST_STEP, SYSMENU_HANDL_TRX_FRQ_FAST_STEP},
{"Encoder Accelerate", SYSMENU_BOOLEAN, (uint32_t *)&TRX.Encoder_Accelerate, SYSMENU_HANDL_TRX_ENC_ACCELERATE},
{"Encoder TX/OFF", SYSMENU_BOOLEAN, (uint32_t *)&TRX.Encoder_OFF, SYSMENU_HANDL_TXOFF_ENC},
{"Att step, dB", SYSMENU_UINT8, (uint32_t *)&TRX.ATT_STEP, SYSMENU_HANDL_TRX_ATT_STEP},
{"DEBUG Console", SYSMENU_BOOLEAN, (uint32_t *)&TRX.Debug_Console, SYSMENU_HANDL_TRX_DEBUG_CONSOLE},
{"MIC IN", SYSMENU_BOOLEAN, (uint32_t *)&TRX.InputType_MIC, SYSMENU_HANDL_TRX_MICIN},
@ -502,6 +504,14 @@ static void SYSMENU_HANDL_TRX_ENC_ACCELERATE(int8_t direction)
TRX.Encoder_Accelerate = false;
}
static void SYSMENU_HANDL_TXOFF_ENC(int8_t direction)
{
if (direction < 0)
TRX.Encoder_OFF = true;
if (direction > 0)
TRX.Encoder_OFF = false;
}
static void SYSMENU_HANDL_TRX_ATT_STEP(int8_t direction)
{
TRX.ATT_STEP += direction;

198
STM32/MDK-ARM/WOLF-Lite.uvoptx
Wyświetl plik

@ -152,6 +152,22 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
<LineNumber>506</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\system_menu.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
<LineNumber>810</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
@ -166,7 +182,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>1</Number>
<Number>2</Number>
<Type>0</Type>
<LineNumber>210</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -182,7 +198,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>2</Number>
<Number>3</Number>
<Type>0</Type>
<LineNumber>1925</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -198,7 +214,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>3</Number>
<Number>4</Number>
<Type>0</Type>
<LineNumber>1640</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -214,7 +230,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>4</Number>
<Number>5</Number>
<Type>0</Type>
<LineNumber>390</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -230,7 +246,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>5</Number>
<Number>6</Number>
<Type>0</Type>
<LineNumber>303</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -246,7 +262,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>6</Number>
<Number>7</Number>
<Type>0</Type>
<LineNumber>165</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -262,7 +278,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>7</Number>
<Number>8</Number>
<Type>0</Type>
<LineNumber>306</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -278,7 +294,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>8</Number>
<Number>9</Number>
<Type>0</Type>
<LineNumber>362</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -294,7 +310,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>9</Number>
<Number>10</Number>
<Type>0</Type>
<LineNumber>424</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -310,7 +326,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>10</Number>
<Number>11</Number>
<Type>0</Type>
<LineNumber>1660</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -326,7 +342,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>11</Number>
<Number>12</Number>
<Type>0</Type>
<LineNumber>1945</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -342,7 +358,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>12</Number>
<Number>13</Number>
<Type>0</Type>
<LineNumber>260</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -358,7 +374,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>13</Number>
<Number>14</Number>
<Type>0</Type>
<LineNumber>168</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -374,7 +390,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>14</Number>
<Number>15</Number>
<Type>0</Type>
<LineNumber>1643</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -390,7 +406,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>15</Number>
<Number>16</Number>
<Type>0</Type>
<LineNumber>1663</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -406,7 +422,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>16</Number>
<Number>17</Number>
<Type>0</Type>
<LineNumber>1928</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -422,7 +438,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>17</Number>
<Number>18</Number>
<Type>0</Type>
<LineNumber>1948</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -438,7 +454,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>18</Number>
<Number>19</Number>
<Type>0</Type>
<LineNumber>307</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -454,7 +470,7 @@
<Expression></Expression>
</Bp>
<Bp>
<Number>19</Number>
<Number>20</Number>
<Type>0</Type>
<LineNumber>811</LineNumber>
<EnabledFlag>1</EnabledFlag>
@ -469,6 +485,150 @@
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>21</Number>
<Type>0</Type>
<LineNumber>507</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\system_menu.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>22</Number>
<Type>0</Type>
<LineNumber>1650</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\system_menu.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>23</Number>
<Type>0</Type>
<LineNumber>1653</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\system_menu.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>24</Number>
<Type>0</Type>
<LineNumber>1670</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\system_menu.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>25</Number>
<Type>0</Type>
<LineNumber>1673</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\system_menu.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>26</Number>
<Type>0</Type>
<LineNumber>1935</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\system_menu.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>27</Number>
<Type>0</Type>
<LineNumber>1938</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\system_menu.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>28</Number>
<Type>0</Type>
<LineNumber>1955</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\system_menu.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>29</Number>
<Type>0</Type>
<LineNumber>1958</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\system_menu.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
</Breakpoint>
<Tracepoint>
<THDelay>0</THDelay>