HMBFDHV-388 Added core register to control ticks per period of heater PSU PWM, and defaulted to 10KHz. Incremented core version and sysid. Fixed non-standard Modelsim reference in makefile
This commit is contained in:
parent
e6b3ee5f53
commit
7c3fd7aa7d
9 changed files with 376 additions and 270 deletions
|
|
@ -19,9 +19,9 @@ script {
|
|||
env.QSYS_PKG_VER = "18.1"
|
||||
|
||||
// Tools (tag on master)
|
||||
env.FW_DEV_TOOL_BRANCH = "refs/tags/ELGIP_2020_02_12_A_SS"
|
||||
env.FW_DEV_TOOL_BRANCH = "refs/tags/ELGIP_2020_10_08_A_SS"
|
||||
// Generic IP
|
||||
env.GENERIC_IP_BRANCH = "refs/tags/ELGIP_2020_02_21_DS"
|
||||
env.GENERIC_IP_BRANCH = "refs/tags/ELGIP_2020_10_09_A_SS"
|
||||
// MinGW
|
||||
env.MINGW_REPO = "git@hydra:GIS_Embedded_Logic/mingw.git"
|
||||
env.MINGW_BRANCH = "origin/master"
|
||||
|
|
|
|||
|
|
@ -69,11 +69,13 @@ begin
|
|||
elsif clk'event and clk = '1' then
|
||||
|
||||
-- If the phase count reaches 1/256th of period, reset to 0 and increment the phase number
|
||||
if unsigned(phase_count) = (unsigned(period_div256) - 1) then
|
||||
phase_count <= (others => '0');
|
||||
phase <= std_logic_vector(unsigned(phase) + 1);
|
||||
else
|
||||
phase_count <= std_logic_vector(unsigned(phase_count) + 1);
|
||||
if unsigned(mod_val) /= 0 then
|
||||
if unsigned(phase_count) = (unsigned(period_div256) - 1) then
|
||||
phase_count <= (others => '0');
|
||||
phase <= std_logic_vector(unsigned(phase) + 1);
|
||||
else
|
||||
phase_count <= std_logic_vector(unsigned(phase_count) + 1);
|
||||
end if;
|
||||
end if;
|
||||
|
||||
-- If the phase number is less than the specified modulation value, set
|
||||
|
|
|
|||
|
|
@ -1352,7 +1352,7 @@
|
|||
kind="altera_avalon_sysid_qsys"
|
||||
version="18.1"
|
||||
enabled="1">
|
||||
<parameter name="id" value="67698689" />
|
||||
<parameter name="id" value="67698690" />
|
||||
</module>
|
||||
<connection
|
||||
kind="avalon"
|
||||
|
|
|
|||
|
|
@ -1352,7 +1352,7 @@
|
|||
kind="altera_avalon_sysid_qsys"
|
||||
version="18.1"
|
||||
enabled="1">
|
||||
<parameter name="id" value="67698689" />
|
||||
<parameter name="id" value="67698690" />
|
||||
</module>
|
||||
<connection
|
||||
kind="avalon"
|
||||
|
|
|
|||
|
|
@ -1352,7 +1352,7 @@
|
|||
kind="altera_avalon_sysid_qsys"
|
||||
version="18.1"
|
||||
enabled="1">
|
||||
<parameter name="id" value="67698689" />
|
||||
<parameter name="id" value="67698690" />
|
||||
</module>
|
||||
<connection
|
||||
kind="avalon"
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@
|
|||
"ip_number" : {
|
||||
"type" : "c",
|
||||
"bit_len" : "8",
|
||||
"reset" : "0x17",
|
||||
"reset" : "0x18",
|
||||
"description" : "IP identifier number: Project top level core registers for status and control, not assigned elsewhere"
|
||||
},
|
||||
"mfr_number" : {
|
||||
|
|
@ -185,12 +185,12 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"heater_psu_pwm" : {
|
||||
"heater_psu_pwm" : {
|
||||
"address" : "4",
|
||||
"width" : "8",
|
||||
"type" : "w",
|
||||
"reset" : "0",
|
||||
"description" : "Fan poser supply PWM setting."
|
||||
"description" : "Fan power supply PWM setting."
|
||||
},
|
||||
"fan_pwm" : {
|
||||
"address" : "5",
|
||||
|
|
@ -265,12 +265,19 @@
|
|||
"reset" : "0",
|
||||
"description" : "Enable fire request masking on shutdown"
|
||||
},
|
||||
"swim_port_onehot_enable" : {
|
||||
"swim_port_onehot_enable" : {
|
||||
"address" : "12",
|
||||
"width" : "5",
|
||||
"type" : "w",
|
||||
"reset" : "1",
|
||||
"description" : "Chooses which SWIM channel is being driven by the swim instance. (0) for SOM/HOST, (1:4) for head flexes 1 to 4. Only one-hot values are acceptable"
|
||||
},
|
||||
"heater_psu_pwm_tick" : {
|
||||
"address" : "13",
|
||||
"width" : "32",
|
||||
"type" : "w",
|
||||
"reset" : "10000",
|
||||
"description" : "The PWM setting for the PSU for the heater, in units of system clock per period. I.e. 100MHz clock and 10KHz is 10000"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -326,6 +326,7 @@ architecture rtl of core is
|
|||
|
||||
signal fan_pwm : std_logic_vector(7 downto 0);
|
||||
signal heater_psu_pwm : std_logic_vector(7 downto 0);
|
||||
signal heater_psu_pwm_tick: std_logic_vector(31 downto 0);
|
||||
signal head_pwm : head_pwm_data_t;
|
||||
signal pwm_psu_out_heater : std_logic;
|
||||
signal pwm_out_heat_int : std_logic_vector(3 downto 0);
|
||||
|
|
@ -479,6 +480,7 @@ begin
|
|||
rst_n => reset_n,
|
||||
test_freq_period => test_freq_period,
|
||||
heater_psu_pwm => heater_psu_pwm,
|
||||
heater_psu_pwm_tick => heater_psu_pwm_tick,
|
||||
heater_pwm_hd0 => head_pwm(0),
|
||||
heater_pwm_hd1 => head_pwm(1),
|
||||
heater_pwm_hd2 => head_pwm(2),
|
||||
|
|
@ -537,7 +539,7 @@ begin
|
|||
rst_n => reset_n,
|
||||
|
||||
mod_val => heater_psu_pwm,
|
||||
ticks_per_period => std_logic_vector(to_unsigned(TICKS_10US, 32)),
|
||||
ticks_per_period => heater_psu_pwm_tick,
|
||||
pwm_out => pwm_psu_out_heater
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ ifeq (${OSTYPE}, Linux)
|
|||
AUTOSCRIPT = autobuild.sh
|
||||
CMDSHELL = bash
|
||||
else
|
||||
MODELSIMDIR = e:\altera_18_1\ver\modelsim_ae
|
||||
MODELSIMDIR = c:\altera\ver\modelsim_ae
|
||||
MAKE_EXE = mingw32-make
|
||||
VSIMEXE = ${MODELSIMDIR}\\win32aloem\\vsim
|
||||
VSIMARGS =
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue