Skip to content

Commit

Permalink
fixed glitches and implicit latches.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jalae
Jalae committed Jun 15, 2012
1 parent 48ac007 commit 0e7ad87
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 48 deletions.
85 changes: 39 additions & 46 deletions Lab3/Dispence.v
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ input enable,
input [3:0] key_code, input [3:0] key_code,
input key_rdy, input key_rdy,
input [5:0] coinVal, input [5:0] coinVal,
input kill,
output reg[3:0] itemCode, output reg[3:0] itemCode,
output reg done, output reg done,
output reg failed, output reg failed,
Expand Down Expand Up @@ -46,30 +47,51 @@ begin
begin begin
secondtimer = 0; secondtimer = 0;
state = s_idle; state = s_idle;
itemCode = 0;
end end
else if(!enable) else if(!enable)
begin begin
secondtimer = 0; secondtimer = 0;
state = s_idle; state = s_idle;
itemCode = (kill?0:itemCode);
end end
else else
case(state) case(state)
s_idle: s_idle:
begin begin

secondtimer = 0; secondtimer = 0;
//costCounter = 0; //costCounter = 0;
if(enable) if(enable)
begin
case(key_code)
4'h1:itemCode = 1;
4'h2:itemCode = 1;
4'h3:itemCode = 2;
4'h4:itemCode = 2;
4'h5:itemCode = 3;
4'h6:itemCode = 3;
4'h7:itemCode = 4;
4'h8:itemCode = 4;
default: itemCode = 0;
endcase
state = s_decode; state = s_decode;
end
else else
begin
state = state; state = state;
itemCode = itemCode;
end
end end
s_decode: s_decode:
begin begin
secondtimer = 0; secondtimer = 0;
state = s_charge; state = s_charge;
itemCode = itemCode;
end end
s_charge: s_charge:
begin begin
itemCode = itemCode;
secondtimer = 0; secondtimer = 0;
if(costCounter > 0) if(costCounter > 0)
begin begin
Expand All @@ -80,6 +102,7 @@ begin
end end
s_wait1sec: s_wait1sec:
begin begin
itemCode = itemCode;
if(secondtimer < secondcount) if(secondtimer < secondcount)
begin begin
state = state; state = state;
Expand All @@ -93,11 +116,13 @@ begin
end end
s_done: s_done:
begin begin
itemCode = itemCode;
state = state; state = state;
secondtimer = 0; secondtimer = 0;
end end
default: default:
begin begin
itemCode = 0;
secondtimer = 0; secondtimer = 0;
state = s_idle; state = s_idle;
end end
Expand All @@ -109,7 +134,6 @@ begin
case(state) case(state)
s_idle: s_idle:
begin begin
itemCode = itemCode;
done = 0; done = 0;
failed = 0; failed = 0;
dispencing = 0; dispencing = 0;
Expand All @@ -121,47 +145,19 @@ case(state)
dispencing = 0; dispencing = 0;
{down_5, down_10, down_25} = 0; {down_5, down_10, down_25} = 0;
case(key_code) case(key_code)
4'h1:begin 4'h1: failed = coinVal < 6'd15;
itemCode = 1; 4'h2: failed = coinVal < 6'd15;
failed = coinVal < 6'd15; 4'h3: failed = coinVal < 6'd13;
end 4'h4: failed = coinVal < 6'd13;
4'h2:begin 4'h5: failed = coinVal < 6'd17;
itemCode = 1; 4'h6: failed = coinVal < 6'd17;
failed = coinVal < 6'd15; 4'h7: failed = coinVal < 6'd10;
end 4'h8: failed = coinVal < 6'd10;
4'h3:begin default:failed = 1;
itemCode = 2;
failed = coinVal < 6'd13;
end
4'h4:begin
itemCode = 2;
failed = coinVal < 6'd13;
end
4'h5:begin
itemCode = 3;
failed = coinVal < 6'd17;
end
4'h6:begin
itemCode = 3;
failed = coinVal < 6'd17;
end
4'h7:begin
itemCode = 4;
failed = coinVal < 6'd10;
end
4'h8:begin
itemCode = 4;
failed = coinVal < 6'd10;
end
default:begin
itemCode = 0;
failed = 1;
end
endcase endcase
end end
s_charge: s_charge:
begin begin
itemCode = itemCode;
done = 0; done = 0;
failed = 0; failed = 0;
dispencing = 1; dispencing = 1;
Expand All @@ -172,27 +168,24 @@ case(state)
s_wait1sec: s_wait1sec:
begin begin
{down_5, down_10, down_25} = 0; {down_5, down_10, down_25} = 0;
itemCode = itemCode;
done = 0; done = 0;
failed = 0; failed = 0;
dispencing = 1; dispencing = 1;
end end
s_done: s_done:
begin begin
{down_5, down_10, down_25} = 0; {down_5, down_10, down_25} = 0;
itemCode = itemCode;
done = 1; done = 1;
failed = 0; failed = 0;
dispencing = 1; dispencing = 1;
end end
default: default:
begin begin
{down_5, down_10, down_25} = 0; {down_5, down_10, down_25} = 0;
itemCode = 0; done = 0;
done = 0; failed = 0;
failed = 0; dispencing = 0;
dispencing = 0; end
end
endcase endcase
end end


Expand Down
4 changes: 2 additions & 2 deletions Lab3/mainController.v
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ wire dis_down_5, dis_down_10, dis_down_25;






Dispence ud(clk, reset, dis_en, key, key_ready, coinCount, dis_itemKey, dis_done, dis_fail, dis_led, Dispence ud(clk, reset, dis_en, key, key_ready, coinCount, state == m_Idle, dis_itemKey, dis_done, dis_fail, dis_led,
dis_down_5, dis_down_10, dis_down_25); dis_down_5, dis_down_10, dis_down_25);


wire n_syn, wire n_syn,
Expand Down Expand Up @@ -109,7 +109,7 @@ begin
end end
m_Dispence: m_Dispence:
begin begin
leden = 1; leden = !dis_fail;
dis_en = 1; dis_en = 1;
ret_en = 0; ret_en = 0;
end end
Expand Down

0 comments on commit 0e7ad87

Please sign in to comment.