Skip to content

Commit 978761a

Browse files
committed
DExx..xxCramps: Route input pins to Hostmot core and update id
Signed-off-by: Michael Brown <producer@holotronic.dk>
1 parent bd11c5a commit 978761a

File tree

2 files changed

+23
-21
lines changed

2 files changed

+23
-21
lines changed

HW/QuartusProjects/Common/gpio_adr_decoder_reg.sv

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -154,17 +154,17 @@ parameter TotalNumregs = Mux_regPrIOReg * NumIOAddrReg * NumPinsPrIOAddr;
154154
wire charge;
155155
reg [BusWidth-1:0] hysteresis_reg;
156156
wire [3:0] hysteresis[NumSense-1:0];
157-
157+
158158
wire sense_reset = ~reset_reg_N | ~buttons[1];
159159
// wire sense_reset = ~reset_reg_N;
160-
160+
161161
genvar sh;
162-
generate
162+
generate
163163
for(sh=0;sh<NumSense;sh=sh+1) begin : sense_hystloop
164164
assign hysteresis[sh] = hysteresis_reg[(4*sh)+:4];
165165
end
166166
endgenerate
167-
167+
168168

169169
adc_ltc2308_fifo adc_ltc2308_fifo_inst
170170
(
@@ -244,13 +244,14 @@ adc_ltc2308_fifo adc_ltc2308_fifo_inst
244244
end
245245
endgenerate
246246

247-
/*
248-
genvar po;
249-
generate for(po=0;po<NumGPIO;po=po+1) begin : pnloop
250-
assign portnumsel[po][MuxGPIOIOWidth-1:0] = portselnum[(po*MuxGPIOIOWidth)+:MuxGPIOIOWidth];
247+
// Send input I/O data to Hm3 core
248+
integer po;
249+
always @ (posedge reg_clk) begin
250+
for(po=0;po<NumGPIO;po=po+1) begin : pnloop
251+
iodatatohm3[po] <= gpio_input_data[po];
252+
end
251253
end
252-
endgenerate
253-
*/
254+
254255
assign portnumsel[(MuxGPIOIOWidth *NumGPIO)-1:0] = portselnum[(MuxGPIOIOWidth *NumGPIO)-1:0];
255256

256257
assign mux_reg_index = busaddress_r - 16'h1120;
@@ -263,10 +264,10 @@ generate if (Capsense >= 1) begin
263264
hysteresis_reg <= 32'h11111111;
264265
end
265266
else if ( write_address ) begin
266-
if (busaddress_r == 10'h0304) begin hysteresis_reg <= busdata_in_r; end
267-
end
267+
if (busaddress_r == 10'h0304) begin hysteresis_reg <= busdata_in_r; end
268+
end
268269
end
269-
end
270+
end
270271
endgenerate
271272

272273
genvar il;
@@ -303,7 +304,7 @@ endgenerate
303304
end
304305
end
305306
endgenerate
306-
/*
307+
/*
307308
genvar bloop;
308309
generate
309310
for(bloop=0;bloop<NumGPIO;bloop=bloop+1) begin : gpiooutloop
@@ -322,6 +323,7 @@ endgenerate
322323
end
323324
endgenerate
324325
*/
326+
325327
// wire [GPIOWidth-1:0] gpio1_data_fromhm3 = iodatafromhm3[1];
326328
// wire [GPIOWidth-1:0] gpio1_out_data = {gpio1_data_fromhm3[GPIOWidth-1:5],4'bz,charge};
327329
// wire [GPIOWidth-1:0] gpio1_input_data;
@@ -355,7 +357,7 @@ endgenerate
355357

356358
integer oo,om,oi;
357359
generate
358-
360+
359361
always @(posedge reset_in or posedge read_address)begin
360362
if (reset_in)begin
361363
busdata_to_cpu <= 32'b0;
@@ -415,7 +417,7 @@ endgenerate
415417
end
416418
end
417419
endgenerate
418-
420+
419421
generate if (Capsense >=1) begin
420422
assign sense = gpio_input_data[1][5:1];
421423

HW/QuartusProjects/DE10_Nano_FB_Cramps/firmware_id.mif

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ config argument: DE10_Nano_FB_Cramps
44
size of encoded message: 118 0x76
55
text format representation:
66
---
7-
build_sha: "cb0f517"
7+
build_sha: "fddb384"
88
fpga_part_number: "altera socfpga"
99
connector {
1010
name: "GPIO0.P0"
@@ -23,7 +23,7 @@ board_name: "Terasic DE10-Nano"
2323
comment: "$BUILD_URL unset"
2424
---
2525

26-
wire format length=118 0a0763623066353137120e616c7465726120736f63667067611a0f0a084750494f302e503015180000001a0f0a084750494f302e503115180000001a0f0a084750494f302e5032151800000025000000002a115465726173696320444531302d4e616e6f3210244255494c445f55524c20756e736574
26+
wire format length=118 0a0766646462333834120e616c7465726120736f63667067611a0f0a084750494f302e503015180000001a0f0a084750494f302e503115180000001a0f0a084750494f302e5032151800000025000000002a115465726173696320444531302d4e616e6f3210244255494c445f55524c20756e736574
2727

2828
size of MIF struct including cookie and length field: 126
2929
%
@@ -38,9 +38,9 @@ DATA_RADIX=HEX;
3838
CONTENT BEGIN
3939
0000 : feedbabe;
4040
0001 : 00000076;
41-
0002 : 6263070a;
42-
0003 : 31356630;
43-
0004 : 610e1237;
41+
0002 : 6466070a;
42+
0003 : 38336264;
43+
0004 : 610e1234;
4444
0005 : 7265746c;
4545
0006 : 6f732061;
4646
0007 : 67706663;

0 commit comments

Comments
 (0)