odie/ubitxv6
1
0
Fork 0
mirror of https://codeberg.org/mclemens/ubitxv6.git synced 2025-02-21 06:57:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

A number of explicit casts, initializations, and type adjustments to avoid warnings

Browse Source
This commit is contained in:
Reed Nightingale 2020-01-26 10:40:59 -08:00
parent 6dd4b37d8a
commit c38460576b
1 changed files with 6 additions and 6 deletions

12
setup.cpp

@ -87,7 +87,7 @@ struct SettingScreen_t {
void runSetting(const SettingScreen_t* const p_screen) void runSetting(const SettingScreen_t* const p_screen)
{ {
SettingScreen_t screen = {0}; SettingScreen_t screen = {nullptr,nullptr,0,0,nullptr,nullptr,nullptr,nullptr};
memcpy_P(&screen,p_screen,sizeof(screen)); memcpy_P(&screen,p_screen,sizeof(screen));
displayDialog(screen.Title, displayDialog(screen.Title,
screen.AdditionalText); screen.AdditionalText);
@ -235,7 +235,7 @@ void ssCwSpeedValidate(const long int candidate_value_in, long int* validated_va
{ {
*validated_value_out = LIMIT(candidate_value_in,1,100); *validated_value_out = LIMIT(candidate_value_in,1,100);
} }
void ssCwSpeedChange(const long int new_value, char* buff_out, const size_t buff_out_size) void ssCwSpeedChange(const long int new_value, char* buff_out, const size_t /*buff_out_size*/)
{ {
ltoa(new_value, buff_out, 10); ltoa(new_value, buff_out, 10);
} }
@ -334,7 +334,7 @@ void ssKeyerInitialize(long int* start_value_out)
} }
void ssKeyerValidate(const long int candidate_value_in, long int* validated_value_out) void ssKeyerValidate(const long int candidate_value_in, long int* validated_value_out)
{ {
*validated_value_out = LIMIT(candidate_value_in,KeyerMode_e::KEYER_STRAIGHT,KeyerMode_e::KEYER_IAMBIC_B); *validated_value_out = LIMIT(candidate_value_in,(uint8_t)KeyerMode_e::KEYER_STRAIGHT,(uint8_t)KeyerMode_e::KEYER_IAMBIC_B);
} }
void ssKeyerChange(const long int new_value, char* buff_out, const size_t buff_out_size) void ssKeyerChange(const long int new_value, char* buff_out, const size_t buff_out_size)
{ {
@ -350,7 +350,7 @@ void ssKeyerChange(const long int new_value, char* buff_out, const size_t buff_o
} }
void ssKeyerFinalize(const long int final_value) void ssKeyerFinalize(const long int final_value)
{ {
globalSettings.keyerMode = final_value; globalSettings.keyerMode = (KeyerMode_e)final_value;
SaveSettingsToEeprom(); SaveSettingsToEeprom();
} }
const char SS_KEYER_T [] PROGMEM = "CW Keyer/Paddle Type"; const char SS_KEYER_T [] PROGMEM = "CW Keyer/Paddle Type";
@ -409,7 +409,7 @@ void runResetAllSetting(){runSetting(&ssResetAll);}
struct MenuItem_t { struct MenuItem_t {
const char* const ItemName; const char* const ItemName;
const void (*OnSelect)(); void (*OnSelect)();
}; };
void runMenu(const MenuItem_t* const menu_items, const uint16_t num_items); void runMenu(const MenuItem_t* const menu_items, const uint16_t num_items);
@ -480,7 +480,7 @@ void movePuck(unsigned int old_index, unsigned int new_index)
void runMenu(const MenuItem_t* const menu_items, const uint16_t num_items) void runMenu(const MenuItem_t* const menu_items, const uint16_t num_items)
{ {
static const unsigned int COUNTS_PER_ITEM = 10; static const unsigned int COUNTS_PER_ITEM = 10;
const unsigned int MAX_KNOB_VALUE = num_items*COUNTS_PER_ITEM - 1; const int MAX_KNOB_VALUE = num_items*COUNTS_PER_ITEM - 1;
int knob_sum = 0; int knob_sum = 0;
unsigned int old_index = 0; unsigned int old_index = 0;