Skip to content

Commit 63dfe9d

Browse files
committed
Implemented get chip size method
1 parent 6abbc19 commit 63dfe9d

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

qt/chip_db.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,13 @@ uint32_t ChipDb::pageSizeGetById(int id)
196196
return info ? info->params[CHIP_PARAM_PAGE_SIZE] : 0;
197197
}
198198

199+
uint32_t ChipDb::sizeGetById(int id)
200+
{
201+
ChipInfo *info = chipInfoGetById(id);
202+
203+
return info ? info->params[CHIP_PARAM_SIZE] : 0;
204+
}
205+
199206
void ChipDb::addChip(ChipInfo &chipInfo)
200207
{
201208
chipInfoVector.append(chipInfo);

qt/chip_db.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ class ChipDb : public QObject
6767
QStringList getNames();
6868
ChipInfo *chipInfoGetById(int id);
6969
uint32_t pageSizeGetById(int id);
70+
uint32_t sizeGetById(int id);
7071
void addChip(ChipInfo &chipInfo);
7172
void delChip(int index);
7273
int size();

qt/main_window.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,19 +257,18 @@ void MainWindow::slotProgEraseCompleted(int status)
257257
void MainWindow::slotProgErase()
258258
{
259259
int index = ui->chipSelectComboBox->currentIndex();
260-
ChipInfo *chipInfo = chipDb.chipInfoGetById(CHIP_INDEX2ID(index));
260+
uint32_t eraseSize = chipDb.sizeGetById(CHIP_INDEX2ID(index));
261261

262262
connect(prog, SIGNAL(eraseChipCompleted(int)), this,
263263
SLOT(slotProgEraseCompleted(int)));
264264

265-
prog->eraseChip(START_ADDRESS, chipInfo->params[CHIP_PARAM_BLOCK_SIZE]);
265+
prog->eraseChip(START_ADDRESS, eraseSize);
266266
}
267267

268268
void MainWindow::slotProgReadCompleted(int status)
269269
{
270270
int index = ui->chipSelectComboBox->currentIndex();
271-
ChipInfo *chipInfo = chipDb.chipInfoGetById(CHIP_INDEX2ID(index));
272-
uint32_t readSize = chipInfo->params[CHIP_PARAM_SIZE];
271+
uint32_t readSize = chipDb.sizeGetById(CHIP_INDEX2ID(index));
273272

274273
disconnect(prog, SIGNAL(readChipCompleted(int)), this,
275274
SLOT(slotProgReadCompleted(int)));
@@ -287,8 +286,7 @@ void MainWindow::slotProgReadCompleted(int status)
287286
void MainWindow::slotProgRead()
288287
{
289288
int index = ui->chipSelectComboBox->currentIndex();
290-
ChipInfo *chipInfo = chipDb.chipInfoGetById(CHIP_INDEX2ID(index));
291-
uint32_t readSize = chipInfo->params[CHIP_PARAM_SIZE];
289+
uint32_t readSize = chipDb.sizeGetById(CHIP_INDEX2ID(index));
292290

293291
if (!readSize)
294292
{

0 commit comments

Comments
 (0)