Skip to content

Commit

Permalink
freertos_app: cleanup menus
Browse files Browse the repository at this point in the history
  • Loading branch information
@Spitzbube
Spitzbube committed Feb 13, 2021
1 parent d5e4963 commit cc0b41d
Show file tree
Hide file tree
Showing 26 changed files with 4,649 additions and 4,392 deletions.
413 changes: 413 additions & 0 deletions applications/freertos_app/DisplayMainScreen.c
View file

Large diffs are not rendered by default.

45 changes: 35 additions & 10 deletions applications/freertos_app/HandleDownKey.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ void HandleDownKey(void)

case MENU_CONTEXT_DEC_BKLASH_CORR: //1700:
//0x5b410: DEC Bklash Correction
bData_40003173 = 1;
bData_40003171 = 1;
bData_40003172 = 1;
bData_40003170 = 1;
g_bAlignmentFourLineMenuFocusItem = 1;
g_bAlignmentFourLineMenuTopItem = 1;
g_bAlignmentEightLineMenuFocusItem = 1;
g_bAlignmentEightLineMenuTopItem = 1;
Data_40002c64_MenuContextId = MENU_CONTEXT_ONE_STAR_ALIGN; //1100;
break;

Expand Down Expand Up @@ -235,22 +235,23 @@ void HandleDownKey(void)
case MENU_CONTEXT_TIME_DATE: //4100:
//0x5b718
HandleLongListScroll(1, 14);
Data_40002c64_MenuContextId = 4200;
Data_40002c64_MenuContextId = MENU_CONTEXT_DAYLIGHT_SAVING; //4200;
break;

case 4200:
case MENU_CONTEXT_DAYLIGHT_SAVING: //4200:
//0x5b738
HandleLongListScroll(1, 14);
Data_40002c64_MenuContextId = MENU_CONTEXT_SITE_SETTING; //4300;
break;

#if 0
case MENU_CONTEXT_SITE_SETTING: //4300:
//0x5b758
HandleLongListScroll(1, 14);
Data_40002c64_MenuContextId = 4400;
Data_40002c64_MenuContextId = MENU_CONTEXT_SKY_LAND; //4400;
break;

case 4400:
case MENU_CONTEXT_SKY_LAND: //4400:
//0x5b778
HandleLongListScroll(1, 14);
Data_40002c64_MenuContextId = MENU_CONTEXT_AZ_EQU; //4500;
Expand All @@ -261,6 +262,13 @@ void HandleDownKey(void)
HandleLongListScroll(1, 14);
Data_40002c64_MenuContextId = MENU_CONTEXT_TELESCOPE_MOUNT; //4600;
break;
#else
case MENU_CONTEXT_SITE_SETTING: //4300:
//0x5b758
HandleLongListScroll(1, 14);
Data_40002c64_MenuContextId = MENU_CONTEXT_TELESCOPE_MOUNT;
break;
#endif

case MENU_CONTEXT_TELESCOPE_MOUNT: //4600:
//0x5b7b8
Expand All @@ -284,8 +292,8 @@ void HandleDownKey(void)
//0x5b818
bData_4000317f = 1;
bData_4000317d = 1;
bData_4000317e = 1;
bData_4000317c = 1;
g_bSetupEightLineMenuFocusItem = 1;
g_bSetupEightLineMenuTopItem = 1;
Data_40002c64_MenuContextId = MENU_CONTEXT_TIME_DATE; //4100;
break;

Expand Down Expand Up @@ -544,8 +552,10 @@ void HandleDownKey(void)
}
else
{
#if 0
//0x5bd90
SlewAxis(4, 2, g_eSlewRateIndex);
#endif
}
}
}
Expand All @@ -559,8 +569,10 @@ void HandleDownKey(void)
}
else
{
#if 0
//0x5bdd0
SlewAxis(4, 2, g_eSlewRateIndex);
#endif
}
}
//->0x5ca8c
Expand All @@ -577,9 +589,11 @@ void HandleDownKey(void)
}
else
{
#if 0
//0x5be2c
SlewAxis(4, 2, SLEW_RATE_8X);
bData_40002edd = 1;
#endif
}
iBacklashCorrectionSlewing = 1;
bDecBacklashCorrectionDirection = 1;
Expand All @@ -597,8 +611,10 @@ void HandleDownKey(void)
}
else
{
#if 0
//0x5bea4
SlewAxis(4, 2, SLEW_RATE_8X);
#endif
}
}
//5beb4 -> 0x5ca8c
Expand All @@ -624,11 +640,19 @@ void HandleDownKey(void)
Data_40002c64_MenuContextId = MENU_CONTEXT_MOUNT_AZ; //46001;
break;

#if 0
case MENU_CONTEXT_ENGLISH: //49001:
//0x5bf08: Language -> English
Data_40002c64_MenuContextId = MENU_CONTEXT_GERMAN; //49002;
break;
#else
case MENU_CONTEXT_ENGLISH: //49001:
//0x5bf08: Language -> English
Data_40002c64_MenuContextId = MENU_CONTEXT_ENGLISH;
break;
#endif

#if 0
case MENU_CONTEXT_GERMAN: //49002:
//0x5bf1c
Data_40002c64_MenuContextId = MENU_CONTEXT_FRENCH; //49003;
Expand All @@ -648,6 +672,7 @@ void HandleDownKey(void)
//0x5bf58
Data_40002c64_MenuContextId = MENU_CONTEXT_ENGLISH; //49001;
break;
#endif

case 21001:
//0x5bf6c
Expand Down
24 changes: 13 additions & 11 deletions applications/freertos_app/HandleEnterKey.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,10 @@ void HandleEnterKey(void)

case MENU_CONTEXT_ALIGNMENT: //1000:
//0x53698
bData_40003173 = 1;
bData_40003171 = 1;
bData_40003172 = 1;
bData_40003170 = 1;
g_bAlignmentFourLineMenuFocusItem = 1;
g_bAlignmentFourLineMenuTopItem = 1;
g_bAlignmentEightLineMenuFocusItem = 1;
g_bAlignmentEightLineMenuTopItem = 1;
Data_40002c64_MenuContextId = MENU_CONTEXT_ONE_STAR_ALIGN; //1100;
break;

Expand All @@ -324,8 +324,8 @@ void HandleEnterKey(void)
//0x53740
bData_4000317f = 1;
bData_4000317d = 1;
bData_4000317e = 1;
bData_4000317c = 1;
g_bSetupEightLineMenuFocusItem = 1;
g_bSetupEightLineMenuTopItem = 1;
Data_40002c64_MenuContextId = MENU_CONTEXT_TIME_DATE; //4100;
break;

Expand Down Expand Up @@ -359,12 +359,12 @@ void HandleEnterKey(void)
bCharacterInputPosition = 5;
bData_400032a4_OTAZeroDataErrorCount = 0;

flash_get_ota_zero_data(&fData_4000329c, &fData_400032a0);
flash_get_ota_zero_data(&g_fOtaZeroAzimuth, &g_fOtaZeroAltitude);

sprintf(Data_400028d7, "Azi:%03d", (unsigned short)fData_4000329c);
sprintf(Data_400028e1, "Alt: %02d", (unsigned short)fData_400032a0);
sprintf(Data_40002789, "Azi:%03d", (unsigned short)fData_4000329c);
sprintf(Data_40002792, "Alt: %02d", (unsigned short)fData_400032a0);
sprintf(Data_400028d7, "Azi:%03d", (unsigned short)g_fOtaZeroAzimuth);
sprintf(Data_400028e1, "Alt: %02d", (unsigned short)g_fOtaZeroAltitude);
sprintf(Data_40002789, "Azi:%03d", (unsigned short)g_fOtaZeroAzimuth);
sprintf(Data_40002792, "Alt: %02d", (unsigned short)g_fOtaZeroAltitude);
break;

case MENU_CONTEXT_TRACKING_RATE: //4700:
Expand Down Expand Up @@ -1123,6 +1123,7 @@ void HandleEnterKey(void)
Data_40002c64_MenuContextId = MENU_CONTEXT_LANGUAGE; //4800;
break;

#if 0
case MENU_CONTEXT_GERMAN: //49002:
//0x55084
bData_40003196_CurrentLanguage = MENU_LANGUAGE_GERMAN; //2;
Expand Down Expand Up @@ -1158,6 +1159,7 @@ void HandleEnterKey(void)
flash_write(0xdcb, 0, 528, Data_400035bc);
Data_40002c64_MenuContextId = MENU_CONTEXT_LANGUAGE; //4800;
break;
#endif

case MENU_CONTEXT_TRACKING_RATE_STAR_SPEED: //4801:
//0x551e4: Tracking Rate -> "Star Speed"
Expand Down
8 changes: 8 additions & 0 deletions applications/freertos_app/HandleLeftKey.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -948,9 +948,11 @@ void HandleLeftKey(void)
}
else
{
#if 0
//0x599c8
SlewAxis(3, 3, g_eSlewRateIndex);
//->0x59a1c
#endif
}
}
}
Expand All @@ -964,8 +966,10 @@ void HandleLeftKey(void)
}
else
{
#if 0
//0x59a08
SlewAxis(3, 3, g_eSlewRateIndex);
#endif
}
}
//-> 0x59dc4
Expand Down Expand Up @@ -995,10 +999,12 @@ void HandleLeftKey(void)
}
else
{
#if 0
//0x59a94
SlewAxis(3, 3, SLEW_RATE_8X); //3);

bData_40002edd = 0;
#endif
}
//0x59ab0
iBacklashCorrectionSlewing = 1;
Expand All @@ -1018,8 +1024,10 @@ void HandleLeftKey(void)
}
else
{
#if 0
//0x59b14
SlewAxis(3, 3, g_eSlewRateIndex);
#endif
}
}
//0x59b28 -> 0x59dc4
Expand Down
36 changes: 18 additions & 18 deletions applications/freertos_app/HandleMinusKey.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,49 +203,49 @@ void HandleMinusKey(void)
Data_40002c64_MenuContextId = MENU_CONTEXT_NAVIGATION; //2000;
break;

case 3100:
case MENU_CONTEXT_CURRENT_OBJECTS: //3100:
//0x5fe14
Data_40002c64_MenuContextId = 3000;
Data_40002c64_MenuContextId = MENU_CONTEXT_UTILITIES;
break;

case MENU_CONTEXT_OBJECT_RISE_SET: //3200:
//0x5fe28
Data_40002c64_MenuContextId = 3000;
Data_40002c64_MenuContextId = MENU_CONTEXT_UTILITIES;
break;

case 3300:
case MENU_CONTEXT_LUNAR_PHASE: //3300:
//0x5fe3c
Data_40002c64_MenuContextId = 3000;
Data_40002c64_MenuContextId = MENU_CONTEXT_UTILITIES;
break;

case MENU_CONTEXT_TIMER: //3400:
//0x5fe50
Data_40002c64_MenuContextId = 3000;
Data_40002c64_MenuContextId = MENU_CONTEXT_UTILITIES;
break;

case 3500:
case MENU_CONTEXT_ALARM: //3500:
//0x5fe64
Data_40002c64_MenuContextId = 3000;
Data_40002c64_MenuContextId = MENU_CONTEXT_UTILITIES;
break;

case 3600:
case MENU_CONTEXT_EYEPIECE_FOV: //3600:
//0x5fe78
Data_40002c64_MenuContextId = 3000;
Data_40002c64_MenuContextId = MENU_CONTEXT_UTILITIES;
break;

case 3700:
case MENU_CONTEXT_EYEPIECE_MAGN: //3700:
//0x5fe8c
Data_40002c64_MenuContextId = 3000;
Data_40002c64_MenuContextId = MENU_CONTEXT_UTILITIES;
break;

case 3800:
case MENU_CONTEXT_DISPLAY_ILLUMINATION: //3800:
//0x5fea0
Data_40002c64_MenuContextId = 3000;
Data_40002c64_MenuContextId = MENU_CONTEXT_UTILITIES;
break;

case 3900:
case MENU_CONTEXT_PARK_POSITION: //3900:
//0x5feb4
Data_40002c64_MenuContextId = 3000;
Data_40002c64_MenuContextId = MENU_CONTEXT_UTILITIES;
break;

case 4100:
Expand Down Expand Up @@ -381,12 +381,12 @@ void HandleMinusKey(void)

case 3801:
//0x600c8
Data_40002c64_MenuContextId = 3800;
Data_40002c64_MenuContextId = MENU_CONTEXT_DISPLAY_ILLUMINATION; //3800;
break;

case 3802:
//0x600dc
Data_40002c64_MenuContextId = 3800;
Data_40002c64_MenuContextId = MENU_CONTEXT_DISPLAY_ILLUMINATION; //3800;
break;

case 4301:
Expand Down
Loading

0 comments on commit cc0b41d

Please sign in to comment.