diff --git a/Makefile b/Makefile index 3a546a5a14f5e51887b6daa6a8bb228f8f23cd47..c31048f2ab1f85686d2f3b5e12a5990b0b5a87cc 100755 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ # setup # modified by zerom for WinARM 8/2010 -STM32_HAL_PATH=~/humanoids/stm32_hal -STM32_LIBRARIES_PATH=~/humanoids/stm32_libraries +STM32_HAL_PATH=$(HOME)/humanoids/stm32_hal +STM32_LIBRARIES_PATH=$(HOME)/humanoids/stm32_libraries PROJECT_NAME=darwin_firmware #TARGET_FILES=$(wildcard src/*.c) diff --git a/include/darwin_registers.h b/include/darwin_registers.h index 929e720b32f970f457791ce25bd62a8d50e297cb..cd1398bf72371f84708598d951dc02552e2580af 100644 --- a/include/darwin_registers.h +++ b/include/darwin_registers.h @@ -83,8 +83,7 @@ extern "C" { #define GRIPPER_RIGHT_MAX_ANGLE ((unsigned short int)0x005C) #define GRIPPER_RIGHT_MIN_ANGLE ((unsigned short int)0x005E) #define GRIPPER_RIGHT_MAX_FORCE ((unsigned short int)0x0060) -#define GRIPPER_RIGHT_MAX_FORCE ((unsigned short int)0x0062) -#define SMART_CHARGER_PERIOD ((unsigned short int)0x0064) +#define SMART_CHARGER_PERIOD ((unsigned short int)0x0062) #define LAST_EEPROM_OFFSET ((unsigned short int)0x00FF) diff --git a/src/system_stm32f1xx.c b/src/system_stm32f1xx.c index 6014fa957ffbd54063b032a05006869fe577c5e6..3d64390f08b68f127b7b28fc9cd06d2a09b70f18 100644 --- a/src/system_stm32f1xx.c +++ b/src/system_stm32f1xx.c @@ -139,7 +139,9 @@ uint32_t SystemCoreClock = 72000000; /*!< System Clock Frequency (Core Clock) */ #endif -__IO const uint8_t AHBPrescTable[16] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 6, 7, 8, 9}; +const uint8_t AHBPrescTable[16] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 6, 7, 8, 9}; +const uint8_t APBPrescTable[8] = {0, 0, 0, 0, 1, 2, 3, 4}; + /** * @} */