Remove some stuff to make space
All checks were successful
Build Firmware / build (push) Successful in 32s
All checks were successful
Build Firmware / build (push) Successful in 32s
This commit is contained in:
4
Makefile
4
Makefile
@@ -4,7 +4,7 @@
|
||||
# 1 = enable
|
||||
|
||||
# ---- STOCK QUANSHENG FEATURES ----
|
||||
ENABLE_FMRADIO ?= 0
|
||||
ENABLE_FMRADIO ?= 1
|
||||
ENABLE_UART ?= 1
|
||||
ENABLE_AIRCOPY ?= 0
|
||||
ENABLE_NOAA ?= 0
|
||||
@@ -44,7 +44,7 @@ ENABLE_FEAT_F4HWN ?= 1
|
||||
ENABLE_FEAT_F4HWN_SCREENSHOT ?= 0
|
||||
ENABLE_FEAT_F4HWN_SPECTRUM ?= 1
|
||||
ENABLE_FEAT_F4HWN_RX_TX_TIMER ?= 0
|
||||
ENABLE_FEAT_F4HWN_CHARGING_C ?= 1
|
||||
ENABLE_FEAT_F4HWN_CHARGING_C ?= 0
|
||||
ENABLE_FEAT_F4HWN_SLEEP ?= 1
|
||||
ENABLE_FEAT_F4HWN_RESUME_STATE ?= 1
|
||||
ENABLE_FEAT_F4HWN_INV ?= 1
|
||||
|
23
bitmaps.c
23
bitmaps.c
@@ -44,19 +44,6 @@ const uint8_t gFontKeyLock[9] =
|
||||
0x7c, 0x46, 0x45, 0x45, 0x45, 0x45, 0x45, 0x46, 0x7c
|
||||
};
|
||||
|
||||
const uint8_t gFontLight[9] =
|
||||
{
|
||||
0b00001100,
|
||||
0b00010010,
|
||||
0b00100001,
|
||||
0b01101101,
|
||||
0b01111001,
|
||||
0b01101101,
|
||||
0b00100001,
|
||||
0b00010010,
|
||||
0b00001100,
|
||||
};
|
||||
|
||||
const uint8_t gFontMute[12] =
|
||||
{
|
||||
0b00011100,
|
||||
@@ -291,16 +278,6 @@ const uint8_t BITMAP_ScanListAll[19] =
|
||||
0b01111111
|
||||
};
|
||||
|
||||
const uint8_t BITMAP_compand[6] =
|
||||
{
|
||||
0b00000000,
|
||||
0b00111100,
|
||||
0b01000010,
|
||||
0b01000010,
|
||||
0b01000010,
|
||||
0b00100100
|
||||
};
|
||||
|
||||
/*
|
||||
const uint8_t BITMAP_Ready[7] =
|
||||
{
|
||||
|
@@ -11,7 +11,6 @@ extern const uint8_t gFontF[8];
|
||||
extern const uint8_t gFontS[6];
|
||||
|
||||
extern const uint8_t gFontKeyLock[9];
|
||||
extern const uint8_t gFontLight[9];
|
||||
extern const uint8_t gFontMute[12];
|
||||
|
||||
extern const uint8_t gFontXB[2][6];
|
||||
@@ -46,8 +45,6 @@ extern const uint8_t BITMAP_ScanList123[19];
|
||||
extern const uint8_t BITMAP_ScanListAll[19];
|
||||
extern const uint8_t BITMAP_ScanListE[7];
|
||||
extern const uint8_t BITMAP_PowerUser[3];
|
||||
extern const uint8_t BITMAP_compand[6];
|
||||
|
||||
extern const uint8_t BITMAP_NOAA[12];
|
||||
|
||||
#ifndef ENABLE_CUSTOM_MENU_LAYOUT
|
||||
|
12
ui/main.c
12
ui/main.c
@@ -775,9 +775,7 @@ void UI_DisplayMain(void) {
|
||||
|
||||
// compander symbol
|
||||
#ifndef ENABLE_BIG_FREQ
|
||||
const ChannelAttributes_t att = gMR_ChannelAttributes[gEeprom.ScreenChannel[vfo_num]];
|
||||
if (att.compander)
|
||||
memcpy(p_line0 + 120 + LCD_WIDTH, BITMAP_compand, sizeof(BITMAP_compand));
|
||||
//const ChannelAttributes_t att = gMR_ChannelAttributes[gEeprom.ScreenChannel[vfo_num]];
|
||||
#else
|
||||
// TODO: // find somewhere else to put the symbol
|
||||
#endif
|
||||
@@ -875,13 +873,7 @@ void UI_DisplayMain(void) {
|
||||
}
|
||||
|
||||
// show the channel symbols
|
||||
const ChannelAttributes_t att = gMR_ChannelAttributes[gEeprom.ScreenChannel[vfo_num]];
|
||||
if (att.compander)
|
||||
#ifdef ENABLE_BIG_FREQ
|
||||
memcpy(p_line0 + 120, BITMAP_compand, sizeof(BITMAP_compand));
|
||||
#else
|
||||
memcpy(p_line0 + 120 + LCD_WIDTH, BITMAP_compand, sizeof(BITMAP_compand));
|
||||
#endif
|
||||
//const ChannelAttributes_t att = gMR_ChannelAttributes[gEeprom.ScreenChannel[vfo_num]];
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -27,14 +27,13 @@ void UI_DisplayMessages(void) {
|
||||
char String[19];
|
||||
UI_DisplayClear();
|
||||
if (gEnteringSMS != SMS_NOT_ENTERING) {
|
||||
UI_PrintString("SMS write", 0, 0, 0 /*, 8 */);
|
||||
if (gEnteringSMS == SMS_ENTERING_DEST) {
|
||||
UI_PrintString("SMS dest", 0, 0, 2 /*, 8 */);
|
||||
UI_PrintString("SMS dest", 0, 0, 1 /*, 8 */);
|
||||
u32_to_str(dataPacket.dest, String);
|
||||
UI_PrintStringSmallNormal(String, 0, 0, 3);
|
||||
UI_PrintStringSmallNormal(String, 0, 0, 2);
|
||||
} else if (gEnteringSMS == SMS_ENTERING_MESSAGE) {
|
||||
UI_PrintString("SMS data", 0, 0, 2 /*, 8 */);
|
||||
UI_PrintStringSmallNormal((const char *) dataPacket.data, 1, 0, 3);
|
||||
UI_PrintString("SMS data", 0, 0, 1 /*, 8 */);
|
||||
UI_PrintStringSmallNormal((const char *) dataPacket.data, 1, 0, 2);
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -48,14 +47,11 @@ void UI_DisplayMessages(void) {
|
||||
String[6] = 'E';
|
||||
String[7] = 'S';
|
||||
|
||||
for (size_t i = 8; i < 12; i++) {
|
||||
for (size_t i = 8; i < 14; i++) {
|
||||
String[i] = ' ';
|
||||
}
|
||||
|
||||
uint8_t Data[8];
|
||||
EEPROM_ReadBuffer(SEQParameterEEPROM, Data, 8);
|
||||
|
||||
String[13] = Data[1] == gActiveMessage ? 'L' : ' ';
|
||||
String[14] = '0' + gActiveMessage;
|
||||
String[15] = '/';
|
||||
String[16] = '0' + MESSAGES_COUNT;
|
||||
@@ -90,13 +86,12 @@ void UI_DisplayMessages(void) {
|
||||
|
||||
String[0] = 'F';
|
||||
String[1] = 'l';
|
||||
String[2] = 'a';
|
||||
String[3] = 'g';
|
||||
String[4] = 's';
|
||||
String[5] = ':';
|
||||
String[6] = ' ';
|
||||
String[7] = 0;
|
||||
u8_to_str(loadedPacket.flags, &String[7]); // Write at offset 7
|
||||
String[2] = 'g';
|
||||
String[3] = 's';
|
||||
String[4] = ':';
|
||||
String[5] = ' ';
|
||||
String[6] = 0;
|
||||
u8_to_str(loadedPacket.flags, &String[6]); // Write at offset 7
|
||||
UI_PrintString(String, 2, 0, 3 /*, 8 */);
|
||||
|
||||
UI_PrintString("Data:", 0, 0, 4 /*, 8 */);
|
||||
|
@@ -227,10 +227,6 @@ void UI_DisplayStatus()
|
||||
size = sizeof(gFontMute);
|
||||
}
|
||||
#endif
|
||||
else if (gBackLight) {
|
||||
src = gFontLight;
|
||||
size = sizeof(gFontLight);
|
||||
}
|
||||
#ifdef ENABLE_FEAT_F4HWN_CHARGING_C
|
||||
else if (gChargingWithTypeC) {
|
||||
src = BITMAP_USB_C;
|
||||
@@ -239,9 +235,7 @@ void UI_DisplayStatus()
|
||||
#endif
|
||||
|
||||
// Perform the memcpy if a source was selected
|
||||
if (src) {
|
||||
memcpy(line + x + 1, src, size);
|
||||
}
|
||||
memcpy(line + x + 1, src, size);
|
||||
|
||||
// Battery
|
||||
unsigned int x2 = LCD_WIDTH - sizeof(BITMAP_BatteryLevel1) - 0;
|
||||
|
Reference in New Issue
Block a user