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

New feature update

Browse Source
This commit is contained in:
Andis Zīle
2024-04-13 12:29:03 +03:00
parent c3bc42fa18
commit e4bd6d2e04
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/src/hw/devices.cpp
View File

@@ -58,6 +58,8 @@ void devices_update_inputs(void)
sup_fuse.update(); sup_fuse.update();
out_fuse.update(); out_fuse.update();
display.process_timer();
} }
/**** Private function definitions ****/ /**** Private function definitions ****/

19
firmware/src/main.cpp
View File

@@ -1,6 +1,5 @@
/**** Includes ****/ /**** Includes ****/
#include "utils/utils.h" #include "utils/utils.h"
#include "utils/interpolate.h"
#include "hw/devices.h" #include "hw/devices.h"
@@ -14,9 +13,6 @@
static const uint16_t dsp_lock_bmode = 1000; static const uint16_t dsp_lock_bmode = 1000;
static const uint16_t dsp_lock_force = 50; static const uint16_t dsp_lock_force = 50;
static const uint16_t cfg_max_hbrake_time = 1000;
static const uint8_t cfg_brake_force = 100;
/**** Private variables ****/ /**** Private variables ****/
static logic::CfgMemory cfg_mem = logic::CfgMemory(); static logic::CfgMemory cfg_mem = logic::CfgMemory();
@@ -34,12 +30,11 @@ int main(void)
cfg_mem.init(); cfg_mem.init();
uint8_t user_force = 0; uint8_t user_force = 0;
uint16_t dsp_lock = 0;
button_force.force = cfg_mem.btn_force; button_force.force = cfg_mem.btn_force;
dccd_force.brake_mode = cfg_mem.bmode; dccd_force.brake_mode = cfg_mem.bmode;
dccd_force.max_hbrake_time = cfg_max_hbrake_time; dccd_force.max_hbrake_time = cfg_mem.max_hbrake_time;
dccd_force.brake_force = cfg_brake_force; dccd_force.brake_force = cfg_mem.brake_force;
// Super loop // Super loop
while(1) while(1)
@@ -85,20 +80,16 @@ int main(void)
break; break;
} }
display.write(bmode_img); display.write(bmode_img);
dsp_lock = dsp_lock_bmode; display.set_lock(dsp_lock_bmode);
dccd_force.is_new_bmode = 0; dccd_force.is_new_bmode = 0;
} }
else if((button_force.is_new)&&(cfg_mem.pot_mode==0)) else if((button_force.is_new)&&(cfg_mem.pot_mode==0))
{ {
display.show_percent(dccd_force.force, hw::DisplayLed::LED_DSP_DOT10); display.show_percent(dccd_force.force, hw::DisplayLed::LED_DSP_DOT10);
dsp_lock = dsp_lock_force; display.set_lock(dsp_lock_force);
button_force.is_new = 0; button_force.is_new = 0;
} }
else else if(display.locked==0) display.show_percent(dccd_force.force, hw::DisplayLed::LED_DSP_DOT10);
{
if(dsp_lock) dsp_lock--;
else display.show_percent(dccd_force.force, hw::DisplayLed::LED_DSP_DOT10);
}
// Process dimm // Process dimm
if(sw_dimm.state == hw::BUTTON_ON) display.set_brigthness(cfg_mem.dsp_dimm); if(sw_dimm.state == hw::BUTTON_ON) display.set_brigthness(cfg_mem.dsp_dimm);