Skip to content

Commit 12e929e

Browse files
bbogushbbogush
committed
Added chip ID to DB
1 parent 0f236a9 commit 12e929e

File tree

3 files changed

+41
-14
lines changed

3 files changed

+41
-14
lines changed

‎qt/chip_db.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ enum
5353
CHIP_PARAM_ERASE2_CMD,
5454
CHIP_PARAM_STATUS_CMD,
5555
CHIP_PARAM_BB_MARK_OFF,
56+
CHIP_PARAM_ID1,
57+
CHIP_PARAM_ID2,
58+
CHIP_PARAM_ID3,
59+
CHIP_PARAM_ID4,
60+
CHIP_PARAM_ID5,
5661
CHIP_PARAM_NUM,
5762
};
5863

‎qt/chip_db_table_model.cpp

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@ QVariant ChipDbTableModel::data(const QModelIndex &index, int role) const
3737
case CHIP_PARAM_BLOCK_SIZE:
3838
case CHIP_PARAM_TOTAL_SIZE:
3939
case CHIP_PARAM_SPARE_SIZE:
40+
case CHIP_PARAM_READ1_CMD:
41+
case CHIP_PARAM_READ_ID_CMD:
42+
case CHIP_PARAM_RESET_CMD:
43+
case CHIP_PARAM_WRITE1_CMD:
44+
case CHIP_PARAM_ERASE1_CMD:
45+
case CHIP_PARAM_STATUS_CMD:
46+
case CHIP_PARAM_ID1:
47+
case CHIP_PARAM_ID2:
4048
chipDb->getHexStringFromParam(chipDb->getChipParam(index.row(), column),
4149
paramStr);
4250
return paramStr;
@@ -58,19 +66,13 @@ QVariant ChipDbTableModel::data(const QModelIndex &index, int role) const
5866
case CHIP_PARAM_COL_CYCLES:
5967
case CHIP_PARAM_BB_MARK_OFF:
6068
return chipDb->getChipParam(index.row(), column);
61-
case CHIP_PARAM_READ1_CMD:
62-
case CHIP_PARAM_READ_ID_CMD:
63-
case CHIP_PARAM_RESET_CMD:
64-
case CHIP_PARAM_WRITE1_CMD:
65-
case CHIP_PARAM_ERASE1_CMD:
66-
case CHIP_PARAM_STATUS_CMD:
67-
chipDb->getHexStringFromParam(chipDb->getChipParam(index.row(), column),
68-
paramStr);
69-
return paramStr;
7069
case CHIP_PARAM_READ2_CMD:
7170
case CHIP_PARAM_READ_SPARE_CMD:
7271
case CHIP_PARAM_WRITE2_CMD:
7372
case CHIP_PARAM_ERASE2_CMD:
73+
case CHIP_PARAM_ID3:
74+
case CHIP_PARAM_ID4:
75+
case CHIP_PARAM_ID5:
7476
chipDb->getHexStringFromOptParam(chipDb->getChipParam(index.row(),
7577
column), paramStr);
7678
return paramStr;
@@ -118,6 +120,11 @@ QVariant ChipDbTableModel::headerData(int section, Qt::Orientation orientation,
118120
case CHIP_PARAM_ERASE2_CMD: return tr("Erase 2 com.");
119121
case CHIP_PARAM_STATUS_CMD: return tr("Status com.");
120122
case CHIP_PARAM_BB_MARK_OFF: return tr("BB mark off.");
123+
case CHIP_PARAM_ID1: return tr("ID 1");
124+
case CHIP_PARAM_ID2: return tr("ID 2");
125+
case CHIP_PARAM_ID3: return tr("ID 3");
126+
case CHIP_PARAM_ID4: return tr("ID 4");
127+
case CHIP_PARAM_ID5: return tr("ID 5");
121128
}
122129
}
123130

@@ -191,6 +198,16 @@ QVariant ChipDbTableModel::headerData(int section, Qt::Orientation orientation,
191198
return tr("Status command");
192199
case CHIP_PARAM_BB_MARK_OFF:
193200
return tr("Bad block mark offset");
201+
case CHIP_PARAM_ID1:
202+
return tr("Chip ID 1st byte");
203+
case CHIP_PARAM_ID2:
204+
return tr("Chip ID 2nd byte");
205+
case CHIP_PARAM_ID3:
206+
return tr("Chip ID 3rd byte");
207+
case CHIP_PARAM_ID4:
208+
return tr("Chip ID 4th byte");
209+
case CHIP_PARAM_ID5:
210+
return tr("Chip ID 5th byte");
194211
}
195212
}
196213

@@ -259,6 +276,8 @@ bool ChipDbTableModel::setData(const QModelIndex &index, const QVariant &value,
259276
case CHIP_PARAM_WRITE1_CMD:
260277
case CHIP_PARAM_ERASE1_CMD:
261278
case CHIP_PARAM_STATUS_CMD:
279+
case CHIP_PARAM_ID1:
280+
case CHIP_PARAM_ID2:
262281
if (chipDb->getParamFromHexString(value.toString(), paramVal))
263282
return false;
264283
if (!chipDb->isParamValid(paramVal, 0x00, 0xFF))
@@ -269,6 +288,9 @@ bool ChipDbTableModel::setData(const QModelIndex &index, const QVariant &value,
269288
case CHIP_PARAM_READ_SPARE_CMD:
270289
case CHIP_PARAM_WRITE2_CMD:
271290
case CHIP_PARAM_ERASE2_CMD:
291+
case CHIP_PARAM_ID3:
292+
case CHIP_PARAM_ID4:
293+
case CHIP_PARAM_ID5:
272294
if (chipDb->getOptParamFromHexString(value.toString(), paramVal))
273295
return false;
274296
if (!chipDb->isOptParamValid(paramVal, 0x00, 0xFF))

‎qt/nando_chip_db.csv

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# name, page size, block size, total size, spare size, tCS, tCLS, tALS, tCLR, tAR, tWP, tRP, tDS, tCH, tCLH, tALH, tWC, tRC, tREA, row cycles, col. cycles, read 1 cycle com., read 2 cycle com., read spare com., read ID com., reset com., write 1 cycle com., write 2 cycle com., erase 1 cycle com., erase 2 cycle com., status com., bad block mark off.
2-
K9F2G08U0C, 2048, 131072, 268435456, 64, 20, 12, 12, 10, 10, 12, 12, 12, 5, 5, 5, 25, 25, 20, 3, 2, 0, 48, -, 144, 255, 128, 16, 96, 208, 112, 0
3-
K9F1G08U0E, 2048, 131072, 134217728, 64, 20, 12, 12, 10, 10, 12, 12, 12, 5, 5, 5, 25, 25, 20, 3, 2, 0, 48, -, 144, 255, 128, 16, 96, 208, 112, 0
4-
HY27US08561A, 512, 16384, 33554432, 16, 0, 0, 0, 10, 10, 25, 25, 20, 10, 10, 10, 50, 50, 30, 2, 1, 0, -, 80, 144, 255, 128, 16, 96, 208, 112, 5
5-
TC58NVG2S3E, 2048, 131072, 536870912, 64, 20, 12, 12, 10, 10, 12, 12, 12, 5, 5, 5, 25, 25, 20, 3, 2, 0, 48, -, 144, 255, 128, 16, 96, 208, 112, 0
1+
# name, page size, block size, total size, spare size, tCS, tCLS, tALS, tCLR, tAR, tWP, tRP, tDS, tCH, tCLH, tALH, tWC, tRC, tREA, row cycles, col. cycles, read 1 cycle com., read 2 cycle com., read spare com., read ID com., reset com., write 1 cycle com., write 2 cycle com., erase 1 cycle com., erase 2 cycle com., status com., bad block mark off., ID size, ID1, ID2, ID3, ID4, ID5
2+
K9F2G08U0C, 2048, 131072, 268435456, 64, 20, 12, 12, 10, 10, 12, 12, 12, 5, 5, 5, 25, 25, 20, 3, 2, 0, 48, -, 144, 255, 128, 16, 96, 208, 112, 0, 236, 218, 16, 21, 68
3+
K9F1G08U0E, 2048, 131072, 134217728, 64, 20, 12, 12, 10, 10, 12, 12, 12, 5, 5, 5, 25, 25, 20, 3, 2, 0, 48, -, 144, 255, 128, 16, 96, 208, 112, 0, 236, 241, 0, 149, 65
4+
HY27US08561A, 512, 16384, 33554432, 16, 0, 0, 0, 10, 10, 25, 25, 20, 10, 10, 10, 50, 50, 30, 2, 1, 0, -, 80, 144, 255, 128, 16, 96, 208, 112, 5, 173, 117, -, -, -
5+
TC58NVG2S3E, 2048, 131072, 536870912, 64, 20, 12, 12, 10, 10, 12, 12, 12, 5, 5, 5, 25, 25, 20, 3, 2, 0, 48, -, 144, 255, 128, 16, 96, 208, 112, 0, 152, 220, 144, 21, 118

0 commit comments

Comments
 (0)