From 8a95afdd417119da6089403f870959a726b0c548 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 28 Jan 2022 15:39:45 -0800 Subject: [PATCH] kalman, report, romconfig, sample, send_packet: Clean up -Wconversion warnings No bugs detected Signed-off-by: Keith Packard --- src/kernel/ao_kalman.c | 6 +++--- src/kernel/ao_report.c | 8 ++++---- src/kernel/ao_report_micro.c | 2 +- src/kernel/ao_romconfig.c | 2 +- src/kernel/ao_sample.c | 14 +++++++------- src/kernel/ao_send_packet.c | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/kernel/ao_kalman.c b/src/kernel/ao_kalman.c index cdf64bec..5f32eb72 100644 --- a/src/kernel/ao_kalman.c +++ b/src/kernel/ao_kalman.c @@ -314,9 +314,9 @@ ao_kalman(void) ao_kalman_correct_accel(); #endif #endif - ao_height = from_fix(ao_k_height); - ao_speed = from_fix(ao_k_speed); - ao_accel = from_fix(ao_k_accel); + ao_height = (ao_v_t) from_fix(ao_k_height); + ao_speed = (ao_v_t) from_fix(ao_k_speed); + ao_accel = (ao_v_t) from_fix(ao_k_accel); if (ao_height > ao_max_height) ao_max_height = ao_height; #if HAS_BARO diff --git a/src/kernel/ao_report.c b/src/kernel/ao_report.c index 831ba874..4624403a 100644 --- a/src/kernel/ao_report.c +++ b/src/kernel/ao_report.c @@ -149,7 +149,7 @@ ao_report_digit(uint8_t digit) } static void -ao_report_number(int16_t n) +ao_report_number(ao_v_t n) { uint8_t digits[10]; uint8_t ndigits, i; @@ -158,7 +158,7 @@ ao_report_number(int16_t n) n = 0; ndigits = 0; do { - digits[ndigits++] = n % 10; + digits[ndigits++] = (uint8_t) (n % 10); n /= 10; } while (n); @@ -200,8 +200,8 @@ ao_report_igniter_ready(enum ao_igniter igniter) uint8_t ao_report_igniter(void) { - return (ao_report_igniter_ready(ao_igniter_drogue) | - (ao_report_igniter_ready(ao_igniter_main) << 1)); + return (uint8_t) (ao_report_igniter_ready(ao_igniter_drogue) | + (ao_report_igniter_ready(ao_igniter_main) << 1)); } #endif diff --git a/src/kernel/ao_report_micro.c b/src/kernel/ao_report_micro.c index efada54b..7abd2311 100644 --- a/src/kernel/ao_report_micro.c +++ b/src/kernel/ao_report_micro.c @@ -48,7 +48,7 @@ ao_report_altitude(void) agl = 0; ndigits = 0; do { - digits[ndigits++] = agl % 10; + digits[ndigits++] = (uint8_t) agl % 10; agl /= 10; } while (agl); diff --git a/src/kernel/ao_romconfig.c b/src/kernel/ao_romconfig.c index b75142f5..fe2bc7f5 100644 --- a/src/kernel/ao_romconfig.c +++ b/src/kernel/ao_romconfig.c @@ -19,7 +19,7 @@ #include "ao.h" AO_ROMCONFIG_SYMBOL uint16_t ao_romconfig_version = AO_ROMCONFIG_VERSION; -AO_ROMCONFIG_SYMBOL uint16_t ao_romconfig_check = ~AO_ROMCONFIG_VERSION; +AO_ROMCONFIG_SYMBOL uint16_t ao_romconfig_check = (uint16_t) ~AO_ROMCONFIG_VERSION; AO_ROMCONFIG_SYMBOL uint16_t ao_serial_number = 0; #if HAS_RADIO AO_ROMCONFIG_SYMBOL uint32_t ao_radio_cal = AO_RADIO_CAL_DEFAULT; diff --git a/src/kernel/ao_sample.c b/src/kernel/ao_sample.c index e3b5e084..3f5fc7a9 100644 --- a/src/kernel/ao_sample.c +++ b/src/kernel/ao_sample.c @@ -161,7 +161,7 @@ static void ao_sample_set_one_orient(void) { ao_sample_orients[ao_sample_orient_pos] = ao_sample_orient; - ao_sample_orient_pos = (ao_sample_orient_pos + 1) % AO_NUM_ORIENT; + ao_sample_orient_pos = (uint8_t) ((ao_sample_orient_pos + 1) % AO_NUM_ORIENT); } static void @@ -190,7 +190,7 @@ ao_sample_compute_orient(void) float rotz; rotz = ao_rotation.z * ao_rotation.z - ao_rotation.y * ao_rotation.y - ao_rotation.x * ao_rotation.x + ao_rotation.r * ao_rotation.r; - ao_sample_orient = acosf(rotz) * (float) (180.0/M_PI); + ao_sample_orient = (angle_t) (acosf(rotz) * (float) (180.0/M_PI)); } #endif /* HAS_GYRO */ @@ -198,7 +198,7 @@ static void ao_sample_preflight_set(void) { #if HAS_ACCEL - ao_ground_accel = ao_sample_accel_sum >> 9; + ao_ground_accel = (accel_t) (ao_sample_accel_sum >> 9); ao_sample_accel_sum = 0; #endif #if HAS_BARO @@ -207,15 +207,15 @@ ao_sample_preflight_set(void) ao_sample_pres_sum = 0; #endif #if HAS_IMU - ao_ground_accel_along = ao_sample_accel_along_sum >> 9; - ao_ground_accel_across = ao_sample_accel_across_sum >> 9; - ao_ground_accel_through = ao_sample_accel_through_sum >> 9; + ao_ground_accel_along = (accel_t) (ao_sample_accel_along_sum >> 9); + ao_ground_accel_across = (accel_t) (ao_sample_accel_across_sum >> 9); + ao_ground_accel_through = (accel_t) (ao_sample_accel_through_sum >> 9); ao_sample_accel_along_sum = 0; ao_sample_accel_across_sum = 0; ao_sample_accel_through_sum = 0; #endif #if HAS_MOTOR_PRESSURE - ao_ground_motor_pressure = ao_sample_motor_pressure_sum >> 9; + ao_ground_motor_pressure = (motor_pressure_t) (ao_sample_motor_pressure_sum >> 9); ao_sample_motor_pressure_sum = 0; #endif #if HAS_GYRO diff --git a/src/kernel/ao_send_packet.c b/src/kernel/ao_send_packet.c index ee468599..ff3ab68d 100644 --- a/src/kernel/ao_send_packet.c +++ b/src/kernel/ao_send_packet.c @@ -26,7 +26,7 @@ static uint8_t ao_send[AO_MAX_SEND]; static void ao_send_packet(void) { - uint16_t count; + uint32_t count; uint8_t b; uint8_t i; @@ -44,7 +44,7 @@ ao_send_packet(void) return; ao_send[i] = b; } - ao_radio_send(ao_send, count); + ao_radio_send(ao_send, (uint8_t) count); } static const struct ao_cmds ao_send_packet_cmds[] = { -- 2.30.2