diff --git a/flight/OpenPilot/Makefile.win32 b/flight/OpenPilot/Makefile.win32 index 130455dde..575e12e09 100644 --- a/flight/OpenPilot/Makefile.win32 +++ b/flight/OpenPilot/Makefile.win32 @@ -163,6 +163,7 @@ SRC += $(OPUAVOBJ)/firmwareiapobj.c SRC += $(OPUAVOBJ)/ratedesired.c SRC += $(OPUAVOBJ)/pipxtrememodemsettings.c SRC += $(OPUAVOBJ)/pipxtrememodemstatus.c +SRC += $(OPUAVOBJ)/batterysettings.c endif ## PIOS Hardware (win32) diff --git a/flight/PiOS.win32/inc/FreeRTOSConfig.h b/flight/PiOS.win32/inc/FreeRTOSConfig.h index e1f55991f..21fbc6b35 100644 --- a/flight/PiOS.win32/inc/FreeRTOSConfig.h +++ b/flight/PiOS.win32/inc/FreeRTOSConfig.h @@ -24,7 +24,7 @@ #define configUSE_IDLE_HOOK 1 #define configUSE_TICK_HOOK 0 #define configCPU_CLOCK_HZ ( ( unsigned long ) 72000000 ) -#define configTICK_RATE_HZ ( ( portTickType ) 200 ) +#define configTICK_RATE_HZ ( ( portTickType ) 100 ) #define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 5 ) #define configMINIMAL_STACK_SIZE ( ( unsigned short ) 256 ) #define configTOTAL_HEAP_SIZE ( ( size_t ) ( 45 * 1024 ) ) diff --git a/flight/PiOS.win32/win32/Libraries/FreeRTOS/Source/portable/GCC/Win32/port.c b/flight/PiOS.win32/win32/Libraries/FreeRTOS/Source/portable/GCC/Win32/port.c index 9122cc598..88170822a 100644 --- a/flight/PiOS.win32/win32/Libraries/FreeRTOS/Source/portable/GCC/Win32/port.c +++ b/flight/PiOS.win32/win32/Libraries/FreeRTOS/Source/portable/GCC/Win32/port.c @@ -259,9 +259,7 @@ static DWORD WINAPI tick_generator(LPVOID lpParameter) } hTimer = CreateWaitableTimer(NULL, TRUE, NULL); - liDueTime.QuadPart = -(50000 - 10000*(int)msPerTick); // 5ms - - //there is always another tick during WaitForMultipleObjects() while waiting - //for the mutex, so reduce the wait time by 1 tick + liDueTime.QuadPart = -100000; hObjList[0] = hIsrMutex; hObjList[1] = hTimer;