MicroRally/uDCCD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 8 Wiki Activity

Saved work

Browse Source
This commit is contained in:
Andis Zīle
2024-12-03 09:17:59 +02:00
parent 25e6f593d3
commit f8c09f1a49
4 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/src/dccd/dccd.cpp
View File

@@ -124,11 +124,16 @@ void dccd::DccdApp::process(void)
this->brakes.cycle_mode(); this->brakes.cycle_mode();
this->nvmem.dynamic_cfg.brakes_mode = this->brakes.get_mode_int(); this->nvmem.dynamic_cfg.brakes_mode = this->brakes.get_mode_int();
} }
else else if(this->user_force.pot_mode==0)
{ {
this->tps.cycle_mode(); this->tps.cycle_mode();
this->nvmem.dynamic_cfg.tps_mode = this->tps.get_mode_int(); this->nvmem.dynamic_cfg.tps_mode = this->tps.get_mode_int();
} }
else
{
this->brakes.cycle_mode();
this->nvmem.dynamic_cfg.brakes_mode = this->brakes.get_mode_int();
}
}; };
// Process user force // Process user force

6
firmware/src/dccd/handbrake.cpp
View File

@@ -23,9 +23,9 @@ void dccd::Handbrake::init(dccd::DccdHw* dccd_hw)
{ {
this->hardware = dccd_hw; this->hardware = dccd_hw;
this->latch_time_1 = 500; this->latch_time_1 = 750;
this->latch_time_2 = 1000; this->latch_time_2 = 1500;
this->latch_time_3 = 2000; this->latch_time_3 = 3000;
this->mode = LATCH0; this->mode = LATCH0;
this->is_new_mode = 0; this->is_new_mode = 0;

12
firmware/src/main.cpp
View File

@@ -26,29 +26,29 @@ int main(void)
// App default config // App default config
def_cfg.user_btn_dbnc = 10; def_cfg.user_btn_dbnc = 10;
def_cfg.user_btn_repeat_time = 500; def_cfg.user_btn_repeat_time = 500;
def_cfg.pot_mode = 0; def_cfg.pot_mode = 1;
def_cfg.btn_step = 10; def_cfg.btn_step = 10;
def_cfg.mode_btn_repeat_time = 700; def_cfg.mode_btn_repeat_time = 700;
def_cfg.tps_treshold_on = 65; def_cfg.tps_treshold_on = 65;
def_cfg.tps_treshold_off = 55; def_cfg.tps_treshold_off = 55;
def_cfg.tps_timeout = 0; def_cfg.tps_timeout = 0;
def_cfg.hbrake_latch_time_1 = 500; def_cfg.hbrake_latch_time_1 = 750;
def_cfg.hbrake_latch_time_2 = 1000; def_cfg.hbrake_latch_time_2 = 1500;
def_cfg.hbrake_latch_time_3 = 2000; def_cfg.hbrake_latch_time_3 = 3000;
def_cfg.hbrake_dbnc = 100; def_cfg.hbrake_dbnc = 100;
def_cfg.brakes_dbnc = 100; def_cfg.brakes_dbnc = 100;
def_cfg.coil_lock_current = 4500; def_cfg.coil_lock_current = 4500;
def_cfg.coil_ref_resistance = 1500; def_cfg.coil_ref_resistance = 1500;
def_cfg.coil_out_max_resistance = 2000; def_cfg.coil_out_max_resistance = 2000;
def_cfg.coil_out_min_resistance = 1000; def_cfg.coil_out_min_resistance = 1000;
def_cfg.coil_disable_protection = 0; def_cfg.coil_disable_protection = 1;
def_cfg.coil_cc_mode = 1; def_cfg.coil_cc_mode = 1;
def_cfg.dsp_brigth_pwm = 40; def_cfg.dsp_brigth_pwm = 40;
def_cfg.dsp_dimm_pwm = 25; def_cfg.dsp_dimm_pwm = 25;
def_cfg.hbrake_force = -1; def_cfg.hbrake_force = -1;
def_cfg.brakes_open_force = -1; def_cfg.brakes_open_force = -1;
def_cfg.brakes_lock_force = 100; def_cfg.brakes_lock_force = 100;
def_cfg.tps_enabled = 1; def_cfg.tps_enabled = 0;
def_cfg.tps_force_1 = 60; def_cfg.tps_force_1 = 60;
def_cfg.tps_force_2 = 80; def_cfg.tps_force_2 = 80;
def_cfg.tps_force_3 = 100; def_cfg.tps_force_3 = 100;

10
firmware/src/uDCCD.cppproj
View File

@@ -26,7 +26,7 @@
<OverrideVtorValue>exception_table</OverrideVtorValue> <OverrideVtorValue>exception_table</OverrideVtorValue>
<BootSegment>2</BootSegment> <BootSegment>2</BootSegment>
<ResetRule>0</ResetRule> <ResetRule>0</ResetRule>
<eraseonlaunchrule>1</eraseonlaunchrule> <eraseonlaunchrule>0</eraseonlaunchrule>
<EraseKey /> <EraseKey />
<AsfFrameworkConfig> <AsfFrameworkConfig>
<framework-data xmlns=""> <framework-data xmlns="">
@@ -46,16 +46,16 @@
<com_atmel_avrdbg_tool_atmelice> <com_atmel_avrdbg_tool_atmelice>
<ToolOptions> <ToolOptions>
<InterfaceProperties> <InterfaceProperties>
<IspClock>249992</IspClock> <IspClock>125000</IspClock>
</InterfaceProperties> </InterfaceProperties>
<InterfaceName>debugWIRE</InterfaceName> <InterfaceName>ISP</InterfaceName>
</ToolOptions> </ToolOptions>
<ToolType>com.atmel.avrdbg.tool.atmelice</ToolType> <ToolType>com.atmel.avrdbg.tool.atmelice</ToolType>
<ToolNumber>J42700001490</ToolNumber> <ToolNumber>J42700001490</ToolNumber>
<ToolName>Atmel-ICE</ToolName> <ToolName>Atmel-ICE</ToolName>
</com_atmel_avrdbg_tool_atmelice> </com_atmel_avrdbg_tool_atmelice>
<avrtoolinterface>debugWIRE</avrtoolinterface> <avrtoolinterface>ISP</avrtoolinterface>
<avrtoolinterfaceclock>249992</avrtoolinterfaceclock> <avrtoolinterfaceclock>125000</avrtoolinterfaceclock>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' "> <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<ToolchainSettings> <ToolchainSettings>