Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 11:29:58 +03:00
Code Issues Wiki Activity

Merge branch 'master' into RP2350

Browse source
This commit is contained in:
blckmn 2025-05-16 06:12:49 +10:00
commit b180cfc437
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -305,6 +305,7 @@ EXTRA_WARNING_FLAGS := -Wold-style-definition
CFLAGS += $(ARCH_FLAGS) \ CFLAGS += $(ARCH_FLAGS) \
$(addprefix -D,$(OPTIONS)) \ $(addprefix -D,$(OPTIONS)) \
$(addprefix -I,$(INCLUDE_DIRS)) \ $(addprefix -I,$(INCLUDE_DIRS)) \
$(addprefix -isystem,$(SYS_INCLUDE_DIRS)) \
$(DEBUG_FLAGS) \ $(DEBUG_FLAGS) \
-std=gnu17 \ -std=gnu17 \
-Wall -Wextra -Werror -Wunsafe-loop-optimizations -Wdouble-promotion \ -Wall -Wextra -Werror -Wunsafe-loop-optimizations -Wdouble-promotion \
@ -331,6 +332,7 @@ ASFLAGS = $(ARCH_FLAGS) \
$(DEBUG_FLAGS) \ $(DEBUG_FLAGS) \
-x assembler-with-cpp \ -x assembler-with-cpp \
$(addprefix -I,$(INCLUDE_DIRS)) \ $(addprefix -I,$(INCLUDE_DIRS)) \
$(addprefix -isystem,$(SYS_INCLUDE_DIRS)) \
-MMD -MP -MMD -MP
ifeq ($(LD_FLAGS),) ifeq ($(LD_FLAGS),)
@ -359,6 +361,7 @@ endif
CPPCHECK = cppcheck $(CSOURCES) --enable=all --platform=unix64 \ CPPCHECK = cppcheck $(CSOURCES) --enable=all --platform=unix64 \
--std=c99 --inline-suppr --quiet --force \ --std=c99 --inline-suppr --quiet --force \
$(addprefix -I,$(INCLUDE_DIRS)) \ $(addprefix -I,$(INCLUDE_DIRS)) \
$(addprefix -isystem,$(SYS_INCLUDE_DIRS)) \
-I/usr/include -I/usr/include/linux -I/usr/include -I/usr/include/linux
TARGET_NAME := $(TARGET) TARGET_NAME := $(TARGET)

2
src/config

@ -1 +1 @@
Subproject commit 53e2e0aa717c138ae46a20a373f32da1e871ee2a Subproject commit 3377c6c462425267f009f4609e75fbe005655e12

2
src/main/pg/motor.c
View file

@ -75,7 +75,6 @@ void pgResetFn_motorConfig(motorConfig_t *motorConfig)
motorConfig->mincommand = 1000; motorConfig->mincommand = 1000;
motorConfig->kv = 1960; motorConfig->kv = 1960;
#ifdef USE_TIMER
#ifdef MOTOR1_PIN #ifdef MOTOR1_PIN
motorConfig->dev.ioTags[0] = IO_TAG(MOTOR1_PIN); motorConfig->dev.ioTags[0] = IO_TAG(MOTOR1_PIN);
#endif #endif
@ -99,7 +98,6 @@ void pgResetFn_motorConfig(motorConfig_t *motorConfig)
#endif #endif
#ifdef MOTOR8_PIN #ifdef MOTOR8_PIN
motorConfig->dev.ioTags[7] = IO_TAG(MOTOR8_PIN); motorConfig->dev.ioTags[7] = IO_TAG(MOTOR8_PIN);
#endif
#endif #endif
motorConfig->motorPoleCount = 14; // Most brushless motors that we use are 14 poles motorConfig->motorPoleCount = 14; // Most brushless motors that we use are 14 poles