Mercurial > public > ostc4

comparison BootLoader/Src/base_bootlader.c @ 971:d29e752660c5 Evo_2_23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bootloader BT module factory reset: The new BT module may now be reinitialized (factory reset) using the "Enter" bottom (invisible option). If a serial number is available then it will be used as BT name instead of the default name.
author Ideenmodellierer
date Sun, 19 Jan 2025 20:58:03 +0100
parents 58cc980ee848
children 5e7ad81e9ac2
comparison
equal deleted inserted replaced
970:3123aa8723fd 971:d29e752660c5
714 tInfo_write(""); 714 tInfo_write("");
715 tInfo_write(textVersion); 715 tInfo_write(textVersion);
716 if(tComm_Set_Bluetooth_Name(0) == 0xFF) 716 if(tComm_Set_Bluetooth_Name(0) == 0xFF)
717 { 717 {
718 tInfo_write("init bluetooth"); 718 tInfo_write("init bluetooth");
719 tComm_StartBlueModBaseInit(); 719 if(isNewDisplay())
720 {
721 tComm_StartBlueModBaseInit();
722 }
723 else
724 {
725 tComm_StartBlueModConfig();
726 }
720 } 727 }
721 else 728 else
722 { 729 {
723 tInfo_write("bluetooth set"); 730 tInfo_write("bluetooth set");
724 tComm_StartBlueModConfig(); 731 tComm_StartBlueModConfig();
835 #endif 842 #endif
836 else 843 else
837 action = 0; 844 action = 0;
838 get_globalStateList(&status); 845 get_globalStateList(&status);
839 846
840 switch(status.base) 847 if(status.base == BaseComm)
841 { 848 {
842 case BaseComm:
843 if(action == ACTION_BUTTON_BACK) 849 if(action == ACTION_BUTTON_BACK)
844 { 850 {
845 reset_to_firmware_using_Watchdog(); 851 reset_to_firmware_using_Watchdog();
846 } 852 }
847 break; 853 }
848 854 else
849 default: 855 {
850 if((action == ACTION_BUTTON_NEXT) && (counterToPreventSleep == 255) && (get_globalState() == StS)) 856 switch (action)
851 { 857 {
852 while(1) 858 case ACTION_BUTTON_NEXT: if((counterToPreventSleep == 255) && (get_globalState() == StS))
853 { 859 {
854 MX_tell_reset_logik_alles_ok(); 860 while(1)
855 DataEX_call(); 861 {
856 HAL_Delay(100); 862 MX_tell_reset_logik_alles_ok();
857 } 863 DataEX_call();
858 } 864 HAL_Delay(100);
859 else 865 }
860 if(action == ACTION_BUTTON_BACK) 866 }
861 { 867 break;
862 reset_to_firmware_using_Watchdog(); 868 case ACTION_BUTTON_BACK: reset_to_firmware_using_Watchdog();
863 } 869 break;
864 else 870 case ACTION_BUTTON_CUSTOM: if(get_globalState() == StS)
865 if(action == ACTION_BUTTON_CUSTOM) 871 {
866 { 872 gotoSleep();
867 if(get_globalState() == StS) 873 }
868 gotoSleep(); 874 break;
869 } 875 case ACTION_BUTTON_ENTER: /* reset_to_update_using_system_reset(); old function */
870 else 876 tComm_StartBlueModBaseInit(); /* new: factory reset bluetooth */
871 if(action == ACTION_BUTTON_ENTER) 877 break;
872 { 878 default:
873 reset_to_update_using_system_reset(); 879 break;
874 } 880 }
875 break;
876 } 881 }
877 } 882 }
878 883
879 884
880 void gotoSleep(void) 885 void gotoSleep(void)