diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-09-16 09:01:54 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-09-16 09:01:54 +0300 |
| commit | 8d1ada2f7652423c8894cb65ec347f5a04f61682 (patch) | |
| tree | 47c845299345a6302c47632d9977e3ba5ab6c486 /Software/Embedded_SW/Embedded/Modules/General | |
| parent | 97ce3a3c2fb5e4d913a5f3424dabacc7dab1e819 (diff) | |
| parent | 4e8140f7712961e35b45a47269461f53ae6031ec (diff) | |
| download | Tango-8d1ada2f7652423c8894cb65ec347f5a04f61682.tar.gz Tango-8d1ada2f7652423c8894cb65ec347f5a04f61682.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/General')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/General/buttons.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/General/buttons.c b/Software/Embedded_SW/Embedded/Modules/General/buttons.c index 328ff3203..c03f7d913 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/buttons.c +++ b/Software/Embedded_SW/Embedded/Modules/General/buttons.c @@ -402,7 +402,10 @@ uint32_t ButtonLoadCBFunction(uint32_t IfIndex, uint32_t ReadValue) case LONGPB: ReportWithPackageFilter(GeneralFilter,"------------ thread loading LONGPB -----------------", __FILE__,__LINE__,0, RpMessage, 0, 0); if (ThreadLoadingActive() == false) - ThreadLoadButton(0); //INIT + { + ReportWithPackageFilter(GeneralFilter,"------------ NOT starting loading from button -----------------", __FILE__,__LINE__,0, RpMessage, 0, 0); + //ThreadLoadButton(0); //INIT CHANGE HERE FOR 1.4.6.44 + } else Thread_Load_End(); //END break; |