Update confgenerator

This commit is contained in:
Mitch Lustig 2021-08-19 13:39:54 -07:00
parent f91872bf40
commit 80de95c372
2 changed files with 13 additions and 13 deletions

View File

@ -287,15 +287,15 @@ int32_t confgenerator_serialize_appconf(uint8_t *buffer, const app_configuration
buffer_append_uint16(buffer, conf->app_balance_conf.fault_delay_switch_half, &ind); buffer_append_uint16(buffer, conf->app_balance_conf.fault_delay_switch_half, &ind);
buffer_append_uint16(buffer, conf->app_balance_conf.fault_delay_switch_full, &ind); buffer_append_uint16(buffer, conf->app_balance_conf.fault_delay_switch_full, &ind);
buffer_append_uint16(buffer, conf->app_balance_conf.fault_adc_half_erpm, &ind); buffer_append_uint16(buffer, conf->app_balance_conf.fault_adc_half_erpm, &ind);
buffer_append_float16(buffer, conf->app_balance_conf.tiltback_angle, 100, &ind); buffer_append_float16(buffer, conf->app_balance_conf.tiltback_duty_angle, 100, &ind);
buffer_append_float16(buffer, conf->app_balance_conf.tiltback_speed, 100, &ind); buffer_append_float16(buffer, conf->app_balance_conf.tiltback_duty_speed, 100, &ind);
buffer_append_float16(buffer, conf->app_balance_conf.tiltback_duty, 1000, &ind); buffer_append_float16(buffer, conf->app_balance_conf.tiltback_duty, 1000, &ind);
buffer_append_float16(buffer, conf->app_balance_conf.tiltback_hv_angle, 100, &ind); buffer_append_float16(buffer, conf->app_balance_conf.tiltback_hv_angle, 100, &ind);
buffer_append_float16(buffer, conf->app_balance_conf.tiltback_hv_speed, 100, &ind); buffer_append_float16(buffer, conf->app_balance_conf.tiltback_hv_speed, 100, &ind);
buffer_append_float32_auto(buffer, conf->app_balance_conf.tiltback_high_voltage, &ind); buffer_append_float32_auto(buffer, conf->app_balance_conf.tiltback_hv, &ind);
buffer_append_float16(buffer, conf->app_balance_conf.tiltback_lv_angle, 100, &ind); buffer_append_float16(buffer, conf->app_balance_conf.tiltback_lv_angle, 100, &ind);
buffer_append_float16(buffer, conf->app_balance_conf.tiltback_lv_speed, 100, &ind); buffer_append_float16(buffer, conf->app_balance_conf.tiltback_lv_speed, 100, &ind);
buffer_append_float32_auto(buffer, conf->app_balance_conf.tiltback_low_voltage, &ind); buffer_append_float32_auto(buffer, conf->app_balance_conf.tiltback_lv, &ind);
buffer_append_float16(buffer, conf->app_balance_conf.tiltback_return_speed, 100, &ind); buffer_append_float16(buffer, conf->app_balance_conf.tiltback_return_speed, 100, &ind);
buffer_append_float32_auto(buffer, conf->app_balance_conf.tiltback_constant, &ind); buffer_append_float32_auto(buffer, conf->app_balance_conf.tiltback_constant, &ind);
buffer_append_uint16(buffer, conf->app_balance_conf.tiltback_constant_erpm, &ind); buffer_append_uint16(buffer, conf->app_balance_conf.tiltback_constant_erpm, &ind);
@ -659,15 +659,15 @@ bool confgenerator_deserialize_appconf(const uint8_t *buffer, app_configuration
conf->app_balance_conf.fault_delay_switch_half = buffer_get_uint16(buffer, &ind); conf->app_balance_conf.fault_delay_switch_half = buffer_get_uint16(buffer, &ind);
conf->app_balance_conf.fault_delay_switch_full = buffer_get_uint16(buffer, &ind); conf->app_balance_conf.fault_delay_switch_full = buffer_get_uint16(buffer, &ind);
conf->app_balance_conf.fault_adc_half_erpm = buffer_get_uint16(buffer, &ind); conf->app_balance_conf.fault_adc_half_erpm = buffer_get_uint16(buffer, &ind);
conf->app_balance_conf.tiltback_angle = buffer_get_float16(buffer, 100, &ind); conf->app_balance_conf.tiltback_duty_angle = buffer_get_float16(buffer, 100, &ind);
conf->app_balance_conf.tiltback_speed = buffer_get_float16(buffer, 100, &ind); conf->app_balance_conf.tiltback_duty_speed = buffer_get_float16(buffer, 100, &ind);
conf->app_balance_conf.tiltback_duty = buffer_get_float16(buffer, 1000, &ind); conf->app_balance_conf.tiltback_duty = buffer_get_float16(buffer, 1000, &ind);
conf->app_balance_conf.tiltback_hv_angle = buffer_get_float16(buffer, 100, &ind); conf->app_balance_conf.tiltback_hv_angle = buffer_get_float16(buffer, 100, &ind);
conf->app_balance_conf.tiltback_hv_speed = buffer_get_float16(buffer, 100, &ind); conf->app_balance_conf.tiltback_hv_speed = buffer_get_float16(buffer, 100, &ind);
conf->app_balance_conf.tiltback_high_voltage = buffer_get_float32_auto(buffer, &ind); conf->app_balance_conf.tiltback_hv = buffer_get_float32_auto(buffer, &ind);
conf->app_balance_conf.tiltback_lv_angle = buffer_get_float16(buffer, 100, &ind); conf->app_balance_conf.tiltback_lv_angle = buffer_get_float16(buffer, 100, &ind);
conf->app_balance_conf.tiltback_lv_speed = buffer_get_float16(buffer, 100, &ind); conf->app_balance_conf.tiltback_lv_speed = buffer_get_float16(buffer, 100, &ind);
conf->app_balance_conf.tiltback_low_voltage = buffer_get_float32_auto(buffer, &ind); conf->app_balance_conf.tiltback_lv = buffer_get_float32_auto(buffer, &ind);
conf->app_balance_conf.tiltback_return_speed = buffer_get_float16(buffer, 100, &ind); conf->app_balance_conf.tiltback_return_speed = buffer_get_float16(buffer, 100, &ind);
conf->app_balance_conf.tiltback_constant = buffer_get_float32_auto(buffer, &ind); conf->app_balance_conf.tiltback_constant = buffer_get_float32_auto(buffer, &ind);
conf->app_balance_conf.tiltback_constant_erpm = buffer_get_uint16(buffer, &ind); conf->app_balance_conf.tiltback_constant_erpm = buffer_get_uint16(buffer, &ind);
@ -1015,15 +1015,15 @@ void confgenerator_set_defaults_appconf(app_configuration *conf) {
conf->app_balance_conf.fault_delay_switch_half = APPCONF_BALANCE_FAULT_DELAY_SWITCH_HALF; conf->app_balance_conf.fault_delay_switch_half = APPCONF_BALANCE_FAULT_DELAY_SWITCH_HALF;
conf->app_balance_conf.fault_delay_switch_full = APPCONF_BALANCE_FAULT_DELAY_SWITCH_FULL; conf->app_balance_conf.fault_delay_switch_full = APPCONF_BALANCE_FAULT_DELAY_SWITCH_FULL;
conf->app_balance_conf.fault_adc_half_erpm = APPCONF_BALANCE_FAULT_ADC_HALF_ERPM; conf->app_balance_conf.fault_adc_half_erpm = APPCONF_BALANCE_FAULT_ADC_HALF_ERPM;
conf->app_balance_conf.tiltback_angle = APPCONF_BALANCE_TILTBACK_ANGLE; conf->app_balance_conf.tiltback_duty_angle = APPCONF_BALANCE_TILTBACK_DUTY_ANGLE;
conf->app_balance_conf.tiltback_speed = APPCONF_BALANCE_TILTBACK_SPEED; conf->app_balance_conf.tiltback_duty_speed = APPCONF_BALANCE_TILTBACK_DUTY_SPEED;
conf->app_balance_conf.tiltback_duty = APPCONF_BALANCE_TILTBACK_DUTY; conf->app_balance_conf.tiltback_duty = APPCONF_BALANCE_TILTBACK_DUTY;
conf->app_balance_conf.tiltback_hv_angle = APPCONF_BALANCE_TILTBACK_HV_ANGLE; conf->app_balance_conf.tiltback_hv_angle = APPCONF_BALANCE_TILTBACK_HV_ANGLE;
conf->app_balance_conf.tiltback_hv_speed = APPCONF_BALANCE_TILTBACK_HV_SPEED; conf->app_balance_conf.tiltback_hv_speed = APPCONF_BALANCE_TILTBACK_HV_SPEED;
conf->app_balance_conf.tiltback_high_voltage = APPCONF_BALANCE_TILTBACK_HIGH_V; conf->app_balance_conf.tiltback_hv = APPCONF_BALANCE_TILTBACK_HV;
conf->app_balance_conf.tiltback_lv_angle = APPCONF_BALANCE_TILTBACK_LV_ANGLE; conf->app_balance_conf.tiltback_lv_angle = APPCONF_BALANCE_TILTBACK_LV_ANGLE;
conf->app_balance_conf.tiltback_lv_speed = APPCONF_BALANCE_TILTBACK_LV_SPEED; conf->app_balance_conf.tiltback_lv_speed = APPCONF_BALANCE_TILTBACK_LV_SPEED;
conf->app_balance_conf.tiltback_low_voltage = APPCONF_BALANCE_TILTBACK_LOW_V; conf->app_balance_conf.tiltback_lv = APPCONF_BALANCE_TILTBACK_LV;
conf->app_balance_conf.tiltback_return_speed = APPCONF_BALANCE_TILTBACK_RETURN_SPEED; conf->app_balance_conf.tiltback_return_speed = APPCONF_BALANCE_TILTBACK_RETURN_SPEED;
conf->app_balance_conf.tiltback_constant = APPCONF_BALANCE_TILTBACK_CONSTANT; conf->app_balance_conf.tiltback_constant = APPCONF_BALANCE_TILTBACK_CONSTANT;
conf->app_balance_conf.tiltback_constant_erpm = APPCONF_BALANCE_TILTBACK_CONSTANT_ERPM; conf->app_balance_conf.tiltback_constant_erpm = APPCONF_BALANCE_TILTBACK_CONSTANT_ERPM;

View File

@ -9,7 +9,7 @@
// Constants // Constants
#define MCCONF_SIGNATURE 3706516163 #define MCCONF_SIGNATURE 3706516163
#define APPCONF_SIGNATURE 568603952 #define APPCONF_SIGNATURE 3944621243
// Functions // Functions
int32_t confgenerator_serialize_mcconf(uint8_t *buffer, const mc_configuration *conf); int32_t confgenerator_serialize_mcconf(uint8_t *buffer, const mc_configuration *conf);