diff --git a/ACAsetPoint.c b/ACAsetPoint.c index 048b16db..6c1c96c4 100644 --- a/ACAsetPoint.c +++ b/ACAsetPoint.c @@ -93,6 +93,10 @@ BitStatus checkOverVoltageOverride(){ return 0; } +void aca_setpoint_init(void) { + ui32_time_ticks_between_pas_interrupt_accumulated = ((uint32_t)ui16_s_ramp_start)<<3; +} + uint16_t aca_setpoint(uint16_t ui16_time_ticks_between_pas_interrupt, uint16_t setpoint_old) { // select virtual erps speed based on speedsensor type if (((ui16_aca_flags & EXTERNAL_SPEED_SENSOR) == EXTERNAL_SPEED_SENSOR)) { @@ -143,11 +147,6 @@ uint16_t aca_setpoint(uint16_t ui16_time_ticks_between_pas_interrupt, uint16_t s ui32_erps_accumulated -= ui32_erps_accumulated >> 3; ui32_erps_accumulated += ui16_motor_speed_erps; ui32_erps_filtered = ui32_erps_accumulated >> 3; - - if (ui32_time_ticks_between_pas_interrupt_accumulated == 0){ - // init first time here - ui32_time_ticks_between_pas_interrupt_accumulated = ((uint32_t)ui16_s_ramp_start)<<3; - } ui32_time_ticks_between_pas_interrupt_accumulated -= ui32_time_ticks_between_pas_interrupt_accumulated >> 3; // do not allow values > ramp_start into smoothing cause it makes startup sluggish diff --git a/ACAsetPoint.h b/ACAsetPoint.h index 6258bca9..8c710d4e 100644 --- a/ACAsetPoint.h +++ b/ACAsetPoint.h @@ -22,6 +22,7 @@ #include "config.h" uint16_t aca_setpoint (uint16_t ui16_time_ticks_between_pas_interrupt, uint16_t setpoint_old ); +void aca_setpoint_init(void); #endif /* ACASETPOINT_H */ diff --git a/Result.log b/Result.log index 7fc4dee0..05c85405 100644 --- a/Result.log +++ b/Result.log @@ -936,3 +936,32 @@ BoardName=ST-LINK ST-LINK_ID=0 Device=STM8S105x6 Port=USB ProgMode=SWIM >>> Loading file main.hex in PROGRAM MEMORY image in computer No such file or directory +---------------------------------------------------------- +new log session +date: 05/10/19 +time: 18:21:15 +---------------------------------------------------------- +STVP_CmdLine version 1.6 + +Verbose ON +Log activity ON +Display Progress OFF +Message box warning if protect option byte ON +Loop mode OFF +Erase device OFF +Blank check device OFF +Verify device ON + +Configuration: +BoardName=ST-LINK ST-LINK_ID=0 Device=STM8S105x6 Port=USB ProgMode=SWIM + +>>> Filling PROGRAM MEMORY image in computer with Blank Value +<<< Filling PROGRAM MEMORY image in computer succeeds + +>>> Loading file main.hex in PROGRAM MEMORY image in computer +<<< Loading file succeeds + +>>> Programming PROGRAM MEMORY +Cannot communicate with the tool. +Wrong tool selection or check tool power supply or check that a previous session is closed. +<<< Programming PROGRAM MEMORY fails diff --git a/main.c b/main.c index 1d54cdc3..253b7817 100644 --- a/main.c +++ b/main.c @@ -109,6 +109,7 @@ int main(void) { adc_init(); PAS_init(); SPEED_init(); + aca_setpoint_init(); #if (defined (DISPLAY_TYPE) && defined (DISPLAY_TYPE_KINGMETER)) || defined DISPLAY_TYPE_KT_LCD3 || defined BLUOSEC display_init(); #endif diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 6555ea69..4a155881 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -38,6 +38,7 @@ file:/G:/osebikefw/SPEED.c file:/G:/osebikefw/motor.c file:/G:/osebikefw/test/wavetables/nip_tuck_255_gen.c + file:/G:/osebikefw/ACAsetPoint.h file:/G:/osebikefw/ACAeeprom.h file:/G:/osebikefw/test/wavetables/nip_tuck_192_gen.c file:/G:/osebikefw/wavetables/nip_tuck_255_gen.c