BRNSystems/brnQuanFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Scanlist refactoring

Browse Source
This commit is contained in:
Armel FAUVEAU
2024-06-28 13:58:59 +02:00
parent 79ca1f7028
commit 0110f89cdb
4 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
bitmaps.c
View File

@@ -159,60 +159,72 @@ const uint8_t BITMAP_VFO_NotDefault[8] =
0b00001000 0b00001000
}; };
const uint8_t BITMAP_ScanList0[5] = const uint8_t BITMAP_ScanList0[7] =
{ // '0' symbol { // '0' symbol
0b01111111,
0b01111111, 0b01111111,
0b01000011, 0b01000011,
0b01011101, 0b01011101,
0b01100001, 0b01100001,
0b01111111, 0b01111111,
0b01111111
}; };
const uint8_t BITMAP_ScanList1[5] = const uint8_t BITMAP_ScanList1[7] =
{ // '1' symbol { // '1' symbol
0b01111111,
0b01111111, 0b01111111,
0b01111011, 0b01111011,
0b01000001, 0b01000001,
0b01111111, 0b01111111,
0b01111111, 0b01111111,
0b01111111
}; };
const uint8_t BITMAP_ScanList2[5] = const uint8_t BITMAP_ScanList2[7] =
{ // '2' symbol { // '2' symbol
0b01111111,
0b01111111, 0b01111111,
0b01001101, 0b01001101,
0b01010101, 0b01010101,
0b01011011, 0b01011011,
0b01111111, 0b01111111,
0b01111111
}; };
const uint8_t BITMAP_ScanList3[5] = const uint8_t BITMAP_ScanList3[7] =
{ // '3' symbol { // '3' symbol
0b01111111,
0b01111111, 0b01111111,
0b01011101, 0b01011101,
0b01010101, 0b01010101,
0b01101011, 0b01101011,
0b01111111, 0b01111111,
0b01111111
}; };
const uint8_t BITMAP_ScanListAll[15] = const uint8_t BITMAP_ScanListAll[19] =
{ {
// 'All' symbol // 'All' symbol
0b01111111, 0b01111111,
0b01111111,
0b01000011, 0b01000011,
0b01110101, 0b01110101,
0b01000011, 0b01000011,
0b01111111, 0b01111111,
0b01111111, 0b01111111,
0b01111111,
0b01000001, 0b01000001,
0b01011111, 0b01011111,
0b01011111, 0b01011111,
0b01111111, 0b01111111,
0b01111111, 0b01111111,
0b01111111,
0b01000001, 0b01000001,
0b01011111, 0b01011111,
0b01011111, 0b01011111,
0b01111111, 0b01111111,
0b01111111
}; };
const uint8_t BITMAP_compand[6] = const uint8_t BITMAP_compand[6] =

10
bitmaps.h
View File

@@ -30,11 +30,11 @@ extern const uint8_t BITMAP_Ready[7];
extern const uint8_t BITMAP_Antenna[5]; extern const uint8_t BITMAP_Antenna[5];
extern const uint8_t BITMAP_VFO_Default[8]; extern const uint8_t BITMAP_VFO_Default[8];
extern const uint8_t BITMAP_VFO_NotDefault[8]; extern const uint8_t BITMAP_VFO_NotDefault[8];
extern const uint8_t BITMAP_ScanList0[5]; extern const uint8_t BITMAP_ScanList0[7];
extern const uint8_t BITMAP_ScanList1[5]; extern const uint8_t BITMAP_ScanList1[7];
extern const uint8_t BITMAP_ScanList2[5]; extern const uint8_t BITMAP_ScanList2[7];
extern const uint8_t BITMAP_ScanList3[5]; extern const uint8_t BITMAP_ScanList3[7];
extern const uint8_t BITMAP_ScanListAll[15]; extern const uint8_t BITMAP_ScanListAll[19];
extern const uint8_t BITMAP_compand[6]; extern const uint8_t BITMAP_compand[6];
#ifndef ENABLE_CUSTOM_MENU_LAYOUT #ifndef ENABLE_CUSTOM_MENU_LAYOUT

8
ui/main.c
View File

@@ -909,22 +909,22 @@ void UI_DisplayMain(void)
if (att.scanlist1) if (att.scanlist1)
{ {
memcpy(p_line0 + 128 - (shiftList * 5), BITMAP_ScanList1, sizeof(BITMAP_ScanList1)); memcpy(p_line0 + 127 - (shiftList * 6), BITMAP_ScanList1, sizeof(BITMAP_ScanList1));
shiftList--; shiftList--;
} }
if (att.scanlist2) if (att.scanlist2)
{ {
memcpy(p_line0 + 128 - (shiftList * 5), BITMAP_ScanList2, sizeof(BITMAP_ScanList2)); memcpy(p_line0 + 127 - (shiftList * 6), BITMAP_ScanList2, sizeof(BITMAP_ScanList2));
shiftList--; shiftList--;
} }
if (att.scanlist3) if (att.scanlist3)
{ {
memcpy(p_line0 + 128 - (shiftList * 5), BITMAP_ScanList3, sizeof(BITMAP_ScanList3)); memcpy(p_line0 + 127 - (shiftList * 6), BITMAP_ScanList3, sizeof(BITMAP_ScanList3));
} }
if(countList == 0) if(countList == 0)
{ {
memcpy(p_line0 + 128 - (1 * 5), BITMAP_ScanList0, sizeof(BITMAP_ScanList0)); memcpy(p_line0 + 127 - (1 * 6), BITMAP_ScanList0, sizeof(BITMAP_ScanList0));
} }
/* /*

4
ui/status.c
View File

@@ -111,8 +111,8 @@ void UI_DisplayStatus()
break; break;
case 4: case 4:
memcpy(line + 0, BITMAP_ScanList1, sizeof(BITMAP_ScanList1)); memcpy(line + 0, BITMAP_ScanList1, sizeof(BITMAP_ScanList1));
memcpy(line + 5, BITMAP_ScanList2, sizeof(BITMAP_ScanList2)); memcpy(line + 6, BITMAP_ScanList2, sizeof(BITMAP_ScanList2));
memcpy(line + 10, BITMAP_ScanList3, sizeof(BITMAP_ScanList3)); memcpy(line + 12, BITMAP_ScanList3, sizeof(BITMAP_ScanList3));
break; break;
case 5: case 5:
memcpy(line + 0, BITMAP_ScanListAll, sizeof(BITMAP_ScanListAll)); memcpy(line + 0, BITMAP_ScanListAll, sizeof(BITMAP_ScanListAll));