diff --git a/firmware/applications/default.c b/firmware/applications/default.c index fc6e145..022b896 100644 --- a/firmware/applications/default.c +++ b/firmware/applications/default.c @@ -95,7 +95,7 @@ int lcdInitConfig(){ void main_default(void) { - systickInit(10); + systickInit(SYSTICKSPEED); if(getInputRaw()==BTN_ENTER){ ISPandReset(); @@ -118,7 +118,7 @@ void tick_default(void) { static int ctr; ctr++; incTimer(); - if(ctr>100){ + if(ctr>1000/SYSTICKSPEED){ if(!adcMutex){ VoltageCheck(); LightCheck(); @@ -133,7 +133,7 @@ void tick_default(void) { else backlightSetBrightness(0); - if(ctr%5==0){ + if(ctr%(50/SYSTICKSPEED)==0){ if(GetVoltage()<3600 #ifdef SAFE @@ -142,7 +142,7 @@ void tick_default(void) { ){ IOCON_PIO1_11 = 0x0; gpioSetDir(RB_LED3, gpioDirection_Output); - if( (ctr/5)%10 == 1 ) + if( (ctr/(50/SYSTICKSPEED))%10 == 1 ) gpioSetValue (RB_LED3, 1); else gpioSetValue (RB_LED3, 0); @@ -151,3 +151,4 @@ void tick_default(void) { return; }; + diff --git a/firmware/basic/basic.h b/firmware/basic/basic.h index 94b9222..be165b4 100644 --- a/firmware/basic/basic.h +++ b/firmware/basic/basic.h @@ -182,5 +182,7 @@ void handleMenu(const struct MENU *the_menu); #include "basic/idle.h" +#define SYSTICKSPEED 10 + #endif diff --git a/firmware/basic/idle.c b/firmware/basic/idle.c index a2d4321..3d01408 100644 --- a/firmware/basic/idle.c +++ b/firmware/basic/idle.c @@ -22,7 +22,7 @@ void work_queue(void){ #ifdef __arm__ __asm volatile ("WFI"); #else - delayms(10); + delayms(SYSTICKSPEED); #endif return; }; @@ -36,13 +36,13 @@ void work_queue(void){ }; void delayms_queue(uint32_t ms){ - int end=_timectr+ms/10; + int end=_timectr+ms/SYSTICKSPEED; do { if (the_queue.qstart == the_queue.qend){ #ifdef __arm__ __asm volatile ("WFI"); #else - delayms(10); + delayms(SYSTICKSPEED); #endif }else{ work_queue(); @@ -51,12 +51,13 @@ void delayms_queue(uint32_t ms){ }; void delayms_power(uint32_t ms){ + ms/=SYSTICKSPEED; ms+=_timectr; do { #ifdef __arm__ __asm volatile ("WFI"); #else - delayms(10); + delayms(SYSTICKSPEED); #endif } while (ms >_timectr); };