yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-03 17:59:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #843 from No-Signal/feature/sd_error_improvement

Browse source 
Add warning event if SD card fails to initialize
This commit is contained in:
Daniel Öster 2025-02-02 13:55:41 +03:00 • committed by GitHub
commit d81dabeccc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Software/src/devboard/sdcard/sdcard.cpp
View file

@ -191,12 +191,14 @@ void init_sdcard() {
SD_MMC.setPins(SD_SCLK_PIN, SD_MOSI_PIN, SD_MISO_PIN); SD_MMC.setPins(SD_SCLK_PIN, SD_MOSI_PIN, SD_MISO_PIN);
if (!SD_MMC.begin("/root", true, true, SDMMC_FREQ_HIGHSPEED)) { if (!SD_MMC.begin("/root", true, true, SDMMC_FREQ_HIGHSPEED)) {
set_event_latched(EVENT_SD_INIT_FAILED, 0);
#ifdef DEBUG_LOG #ifdef DEBUG_LOG
logging.println("SD Card initialization failed!"); logging.println("SD Card initialization failed!");
#endif // DEBUG_LOG #endif // DEBUG_LOG
return; return;
} }
clear_event(EVENT_SD_INIT_FAILED);
#ifdef DEBUG_LOG #ifdef DEBUG_LOG
logging.println("SD Card initialization successful."); logging.println("SD Card initialization successful.");
#endif // DEBUG_LOG #endif // DEBUG_LOG

1
Software/src/devboard/sdcard/sdcard.h
View file

@ -4,6 +4,7 @@
#include <SD_MMC.h> #include <SD_MMC.h>
#include "../../communication/can/comm_can.h" #include "../../communication/can/comm_can.h"
#include "../hal/hal.h" #include "../hal/hal.h"
#include "../utils/events.h"
#if defined(SD_CS_PIN) && defined(SD_SCLK_PIN) && defined(SD_MOSI_PIN) && \ #if defined(SD_CS_PIN) && defined(SD_SCLK_PIN) && defined(SD_MOSI_PIN) && \
defined(SD_MISO_PIN) // ensure code is only compiled if all SD card pins are defined defined(SD_MISO_PIN) // ensure code is only compiled if all SD card pins are defined

3
Software/src/devboard/utils/events.cpp
View file

@ -217,6 +217,7 @@ void init_events(void) {
events.entries[EVENT_MQTT_CONNECT].level = EVENT_LEVEL_INFO; events.entries[EVENT_MQTT_CONNECT].level = EVENT_LEVEL_INFO;
events.entries[EVENT_MQTT_DISCONNECT].level = EVENT_LEVEL_INFO; events.entries[EVENT_MQTT_DISCONNECT].level = EVENT_LEVEL_INFO;
events.entries[EVENT_EQUIPMENT_STOP].level = EVENT_LEVEL_ERROR; events.entries[EVENT_EQUIPMENT_STOP].level = EVENT_LEVEL_ERROR;
events.entries[EVENT_SD_INIT_FAILED].level = EVENT_LEVEL_WARNING;
events.entries[EVENT_EEPROM_WRITE].log = false; // Don't log the logger... events.entries[EVENT_EEPROM_WRITE].log = false; // Don't log the logger...
@ -443,6 +444,8 @@ const char* get_event_message_string(EVENTS_ENUM_TYPE event) {
return "MQTT disconnected."; return "MQTT disconnected.";
case EVENT_EQUIPMENT_STOP: case EVENT_EQUIPMENT_STOP:
return "EQUIPMENT STOP ACTIVATED!!!"; return "EQUIPMENT STOP ACTIVATED!!!";
case EVENT_SD_INIT_FAILED:
return "SD card initialization failed, check hardware. Power must be removed to reset the SD card.";
default: default:
return ""; return "";
} }

3
Software/src/devboard/utils/events.h
View file

@ -6,7 +6,7 @@
// #define INCLUDE_EVENTS_TEST // Enable to run an event test loop, see events_test_on_target.cpp // #define INCLUDE_EVENTS_TEST // Enable to run an event test loop, see events_test_on_target.cpp
#define EE_MAGIC_HEADER_VALUE 0x0022 // 0x0000 to 0xFFFF #define EE_MAGIC_HEADER_VALUE 0x0023 // 0x0000 to 0xFFFF
#define GENERATE_ENUM(ENUM) ENUM, #define GENERATE_ENUM(ENUM) ENUM,
#define GENERATE_STRING(STRING) #STRING, #define GENERATE_STRING(STRING) #STRING,
@ -115,6 +115,7 @@
XX(EVENT_MQTT_DISCONNECT) \ XX(EVENT_MQTT_DISCONNECT) \
XX(EVENT_EQUIPMENT_STOP) \ XX(EVENT_EQUIPMENT_STOP) \
XX(EVENT_AUTOMATIC_PRECHARGE_FAILURE) \ XX(EVENT_AUTOMATIC_PRECHARGE_FAILURE) \
XX(EVENT_SD_INIT_FAILED) \
XX(EVENT_NOF_EVENTS) XX(EVENT_NOF_EVENTS)
typedef enum { EVENTS_ENUM_TYPE(GENERATE_ENUM) } EVENTS_ENUM_TYPE; typedef enum { EVENTS_ENUM_TYPE(GENERATE_ENUM) } EVENTS_ENUM_TYPE;