Skip to content

Commit

Permalink
dlog mio
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvladic
mvladic committed Dec 17, 2020
1 parent 2bb6ec7 commit 62e3e11
Show file tree
Hide file tree
Showing 15 changed files with 24,201 additions and 24,080 deletions.
1 change: 1 addition & 0 deletions src/eez/dlog_file.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ struct Writer {
void writeBit(int bit);
void flushBits();

uint8_t *getBuffer() { return m_buffer; }
uint32_t getBufferIndex() { return m_bufferIndex; }
uint32_t getDataOffset() { return m_dataOffset; }
uint32_t getFileLength() { return m_fileLength; }
Expand Down
8,178 changes: 4,089 additions & 4,089 deletions src/eez/gui/document_simulator.cpp
View file

Large diffs are not rendered by default.

65 changes: 33 additions & 32 deletions src/eez/gui/document_simulator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1931,39 +1931,39 @@ enum StylesEnum {
STYLE_ID_INLINE292 = 292,
STYLE_ID_INLINE293 = 293,
STYLE_ID_INLINE294 = 294,
STYLE_ID_MON_VALUE_48_RIGHT = 295,
STYLE_ID_INLINE296 = 296,
STYLE_ID_MON_VALUE_20_LEFT = 297,
STYLE_ID_BAR_GRAPH_U_DEFAULT = 298,
STYLE_ID_BAR_GRAPH_TEXT = 299,
STYLE_ID_BAR_GRAPH_SET_LINE = 300,
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 301,
STYLE_ID_BAR_GRAPH_I_DEFAULT = 302,
STYLE_ID_LABELS_AND_COLORS_CHANNEL = 303,
STYLE_ID_INLINE304 = 304,
STYLE_ID_INLINE295 = 295,
STYLE_ID_MON_VALUE_48_RIGHT = 296,
STYLE_ID_INLINE297 = 297,
STYLE_ID_MON_VALUE_20_LEFT = 298,
STYLE_ID_BAR_GRAPH_U_DEFAULT = 299,
STYLE_ID_BAR_GRAPH_TEXT = 300,
STYLE_ID_BAR_GRAPH_SET_LINE = 301,
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 302,
STYLE_ID_BAR_GRAPH_I_DEFAULT = 303,
STYLE_ID_LABELS_AND_COLORS_CHANNEL = 304,
STYLE_ID_INLINE305 = 305,
STYLE_ID_TRIGGER_BUTTON_24 = 306,
STYLE_ID_INLINE307 = 307,
STYLE_ID_INLINE306 = 306,
STYLE_ID_TRIGGER_BUTTON_24 = 307,
STYLE_ID_INLINE308 = 308,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 309,
STYLE_ID_TRIGGER_BUTTON_14 = 310,
STYLE_ID_INLINE311 = 311,
STYLE_ID_INST_SELECTED = 312,
STYLE_ID_MON_VALUE_38_RIGHT = 313,
STYLE_ID_INLINE314 = 314,
STYLE_ID_CH_PROT_OFF = 315,
STYLE_ID_CH_PROT_ON = 316,
STYLE_ID_CH_PROT_TRIPPED = 317,
STYLE_ID_INLINE318 = 318,
STYLE_ID_MON_VALUE_20_RIGHT = 319,
STYLE_ID_MON_VALUE_14_LEFT = 320,
STYLE_ID_MON_VALUE_14_CENTER = 321,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 322,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 323,
STYLE_ID_MON_VALUE_14_RIGHT = 324,
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 325,
STYLE_ID_MON_VALUE_24_RIGHT = 326,
STYLE_ID_INLINE327 = 327,
STYLE_ID_INLINE309 = 309,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 310,
STYLE_ID_TRIGGER_BUTTON_14 = 311,
STYLE_ID_INLINE312 = 312,
STYLE_ID_INST_SELECTED = 313,
STYLE_ID_MON_VALUE_38_RIGHT = 314,
STYLE_ID_INLINE315 = 315,
STYLE_ID_CH_PROT_OFF = 316,
STYLE_ID_CH_PROT_ON = 317,
STYLE_ID_CH_PROT_TRIPPED = 318,
STYLE_ID_INLINE319 = 319,
STYLE_ID_MON_VALUE_20_RIGHT = 320,
STYLE_ID_MON_VALUE_14_LEFT = 321,
STYLE_ID_MON_VALUE_14_CENTER = 322,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 323,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 324,
STYLE_ID_MON_VALUE_14_RIGHT = 325,
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 326,
STYLE_ID_MON_VALUE_24_RIGHT = 327,
STYLE_ID_INLINE328 = 328,
STYLE_ID_INLINE329 = 329,
STYLE_ID_INLINE330 = 330,
Expand All @@ -1975,7 +1975,8 @@ enum StylesEnum {
STYLE_ID_INLINE336 = 336,
STYLE_ID_INLINE337 = 337,
STYLE_ID_INLINE338 = 338,
STYLE_ID_INLINE339 = 339
STYLE_ID_INLINE339 = 339,
STYLE_ID_INLINE340 = 340
};

enum ThemesEnum {
Expand Down
39,614 changes: 19,807 additions & 19,807 deletions src/eez/gui/document_stm32.cpp
View file

Large diffs are not rendered by default.

65 changes: 33 additions & 32 deletions src/eez/gui/document_stm32.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1893,39 +1893,40 @@ enum StylesEnum {
STYLE_ID_INLINE285 = 285,
STYLE_ID_INLINE286 = 286,
STYLE_ID_INLINE287 = 287,
STYLE_ID_MON_VALUE_48_RIGHT = 288,
STYLE_ID_INLINE289 = 289,
STYLE_ID_MON_VALUE_20_LEFT = 290,
STYLE_ID_BAR_GRAPH_U_DEFAULT = 291,
STYLE_ID_BAR_GRAPH_TEXT = 292,
STYLE_ID_BAR_GRAPH_SET_LINE = 293,
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 294,
STYLE_ID_BAR_GRAPH_I_DEFAULT = 295,
STYLE_ID_LABELS_AND_COLORS_CHANNEL = 296,
STYLE_ID_INLINE297 = 297,
STYLE_ID_INLINE288 = 288,
STYLE_ID_MON_VALUE_48_RIGHT = 289,
STYLE_ID_INLINE290 = 290,
STYLE_ID_MON_VALUE_20_LEFT = 291,
STYLE_ID_BAR_GRAPH_U_DEFAULT = 292,
STYLE_ID_BAR_GRAPH_TEXT = 293,
STYLE_ID_BAR_GRAPH_SET_LINE = 294,
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 295,
STYLE_ID_BAR_GRAPH_I_DEFAULT = 296,
STYLE_ID_LABELS_AND_COLORS_CHANNEL = 297,
STYLE_ID_INLINE298 = 298,
STYLE_ID_TRIGGER_BUTTON_24 = 299,
STYLE_ID_INLINE300 = 300,
STYLE_ID_INLINE299 = 299,
STYLE_ID_TRIGGER_BUTTON_24 = 300,
STYLE_ID_INLINE301 = 301,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 302,
STYLE_ID_TRIGGER_BUTTON_14 = 303,
STYLE_ID_INLINE304 = 304,
STYLE_ID_INST_SELECTED = 305,
STYLE_ID_MON_VALUE_38_RIGHT = 306,
STYLE_ID_INLINE307 = 307,
STYLE_ID_CH_PROT_OFF = 308,
STYLE_ID_CH_PROT_ON = 309,
STYLE_ID_CH_PROT_TRIPPED = 310,
STYLE_ID_INLINE311 = 311,
STYLE_ID_MON_VALUE_20_RIGHT = 312,
STYLE_ID_MON_VALUE_14_LEFT = 313,
STYLE_ID_MON_VALUE_14_CENTER = 314,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 315,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 316,
STYLE_ID_MON_VALUE_14_RIGHT = 317,
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 318,
STYLE_ID_MON_VALUE_24_RIGHT = 319,
STYLE_ID_INLINE320 = 320
STYLE_ID_INLINE302 = 302,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 303,
STYLE_ID_TRIGGER_BUTTON_14 = 304,
STYLE_ID_INLINE305 = 305,
STYLE_ID_INST_SELECTED = 306,
STYLE_ID_MON_VALUE_38_RIGHT = 307,
STYLE_ID_INLINE308 = 308,
STYLE_ID_CH_PROT_OFF = 309,
STYLE_ID_CH_PROT_ON = 310,
STYLE_ID_CH_PROT_TRIPPED = 311,
STYLE_ID_INLINE312 = 312,
STYLE_ID_MON_VALUE_20_RIGHT = 313,
STYLE_ID_MON_VALUE_14_LEFT = 314,
STYLE_ID_MON_VALUE_14_CENTER = 315,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 316,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 317,
STYLE_ID_MON_VALUE_14_RIGHT = 318,
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 319,
STYLE_ID_MON_VALUE_24_RIGHT = 320,
STYLE_ID_INLINE321 = 321
};

enum ThemesEnum {
Expand Down Expand Up @@ -2300,4 +2301,4 @@ enum PagesEnum {
PAGE_ID_DIB_DCM224_LABELS_AND_COLORS_CH = 255
};

extern const uint8_t assets[333469];
extern const uint8_t assets[333466];
4 changes: 2 additions & 2 deletions src/eez/index.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -717,10 +717,10 @@ float Module::getDlogResourceMinPeriod(int subchannelIndex, int resourceIndex) {
return NAN;
}

void Module::startDlog(int subchannelIndex, int resourceIndex) {
void Module::onStartDlog() {
}

void Module::stopDlog(int subchannelIndex, int resourceIndex) {
void Module::onStopDlog() {
}

#ifdef EEZ_PLATFORM_STM32
Expand Down
4 changes: 2 additions & 2 deletions src/eez/index.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,8 +389,8 @@ struct Module {
virtual DlogResourceType getDlogResourceType(int subchannelIndex, int resourceIndex);
virtual const char *getDlogResourceLabel(int subchannelIndex, int resourceIndex);
virtual float getDlogResourceMinPeriod(int subchannelIndex, int resourceIndex);
virtual void startDlog(int subchannelIndex, int resourceIndex);
virtual void stopDlog(int subchannelIndex, int resourceIndex);
virtual void onStartDlog();
virtual void onStopDlog();

#if defined(EEZ_PLATFORM_STM32)
virtual void executeDiskDriveOperation(ExecuteDiskDriveOperationParams *params);
Expand Down
29 changes: 17 additions & 12 deletions src/eez/modules/bp3c/flash_slave.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,11 @@ void leaveBootloaderMode() {
psu::io_pins::refresh();
#endif

if (g_slots[g_slotIndex]->moduleType != MODULE_TYPE_NONE) {
psu::gui::showPage(g_slots[g_slotIndex]->getSlotSettingsPageId());
}
#if OPTION_DISPLAY
if (psu::gui::isPageOnStack(g_slots[g_slotIndex]->getSlotSettingsPageId())) {
psu::gui::showPage(g_slots[g_slotIndex]->getSlotSettingsPageId());
}
#endif
}

struct HexRecord {
Expand Down Expand Up @@ -494,11 +496,9 @@ void uploadHexFile() {
psu::gui::hideAsyncOperationInProgress();
psu::gui::showProgressPageWithoutAbort("Downloading firmware...");
psu::gui::updateProgressPage(0, 0);
#endif

#if OPTION_DISPLAY
totalSize = file.size();
#endif
#endif

while (!eofReached && readHexRecord(bufferedFile, hexRecord)) {
size_t currentPosition = file.tell();
Expand All @@ -523,29 +523,34 @@ void uploadHexFile() {
file.close();

Exit:
#if OPTION_DISPLAY
#if OPTION_DISPLAY
osDelay(100);
if (dowloadStarted) {
psu::gui::hideProgressPage();
} else {
psu::gui::hideAsyncOperationInProgress();
}
#endif
osDelay(100);
#endif

if (eofReached) {
uint16_t value = 0xA5A5;
bp3c::eeprom::write(g_slotIndex, (const uint8_t *)&value, 2, 4);
g_slots[g_slotIndex]->firmwareInstalled = true;
} else {
#if OPTION_DISPLAY
psu::gui::errorMessage("Downloading failed!");
#endif
}
} else {
#if OPTION_DISPLAY
psu::gui::hideAsyncOperationInProgress();
#endif

DebugTrace("Failed to sync with slave\n");

#if OPTION_DISPLAY
osDelay(100);
psu::gui::hideAsyncOperationInProgress();
osDelay(100);
psu::gui::errorMessage("Failed to start update!");
#endif
}

sendMessageToPsu(PSU_MESSAGE_FLASH_SLAVE_LEAVE_BOOTLOADER_MODE);
Expand Down
Loading

0 comments on commit 62e3e11

Please sign in to comment.