ElixirForge/firmware
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/firmware.git synced 2026-10-21 10:42:35 +10:00
Code Releases Activity

Merge branch 'master' into lora-type

Browse Source
This commit is contained in:
Thomas Göttgens
2024-12-29 22:31:10 +01:00
committed by GitHub
parent 2dafe07a74 3c7053c66a
commit 35ab9fab98
383 changed files with 20823 additions and 3251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platform/esp32/architecture.h
+2 -2
View File
@@ -172,12 +172,12 @@
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_VISION_MASTER_E213
#elif defined(HELTEC_VISION_MASTER_E290)
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_VISION_MASTER_E290
#elif defined(HELTEC_MESH_NODE_T114)
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_NODE_T114
#elif defined(SENSECAP_INDICATOR)
#define HW_VENDOR meshtastic_HardwareModel_SENSECAP_INDICATOR
#elif defined(SEEED_XIAO_S3)
#define HW_VENDOR meshtastic_HardwareModel_SEEED_XIAO_S3
#elif defined(MESH_TAB)
#define HW_VENDOR meshtastic_HardwareModel_MESH_TAB
#endif
// -----------------------------------------------------------------------------
src/platform/esp32/main-esp32.cpp
+7 -23
View File
@@ -51,7 +51,11 @@ void updateBatteryLevel(uint8_t level) {}
void getMacAddr(uint8_t *dmac)
{
#if defined(CONFIG_IDF_TARGET_ESP32C6) && defined(CONFIG_SOC_IEEE802154_SUPPORTED)
assert(esp_base_mac_addr_get(dmac) == ESP_OK);
#else
assert(esp_efuse_mac_get_default(dmac) == ESP_OK);
#endif
}
#ifdef HAS_32768HZ
@@ -79,7 +83,7 @@ void enableSlowCLK()
LOG_DEBUG("32K XTAL OSC has not started up");
} else {
rtc_clk_slow_freq_set(RTC_SLOW_FREQ_32K_XTAL);
LOG_DEBUG("Switching RTC Source to 32.768Khz succeeded, using 32K XTAL");
LOG_DEBUG("Switch RTC Source to 32.768Khz succeeded, using 32K XTAL");
CALIBRATE_ONE(RTC_CAL_RTC_MUX);
CALIBRATE_ONE(RTC_CAL_32K_XTAL);
}
@@ -97,7 +101,7 @@ void esp32Setup()
/* We explicitly don't want to do call randomSeed,
// as that triggers the esp32 core to use a less secure pseudorandom function.
uint32_t seed = esp_random();
LOG_DEBUG("Setting random seed %u", seed);
LOG_DEBUG("Set random seed %u", seed);
randomSeed(seed);
*/
@@ -166,26 +170,6 @@ void esp32Setup()
#endif
}
#if 0
// Turn off for now
uint32_t axpDebugRead()
{
axp.debugCharging();
LOG_DEBUG("vbus current %f", axp.getVbusCurrent());
LOG_DEBUG("charge current %f", axp.getBattChargeCurrent());
LOG_DEBUG("bat voltage %f", axp.getBattVoltage());
LOG_DEBUG("batt pct %d", axp.getBattPercentage());
LOG_DEBUG("is battery connected %d", axp.isBatteryConnect());
LOG_DEBUG("is USB connected %d", axp.isVBUSPlug());
LOG_DEBUG("is charging %d", axp.isChargeing());
return 30 * 1000;
}
Periodic axpDebugOutput(axpDebugRead);
#endif
/// loop code specific to ESP32 targets
void esp32Loop()
{
@@ -263,4 +247,4 @@ void cpuDeepSleep(uint32_t msecToWake)
esp_sleep_enable_timer_wakeup(msecToWake * 1000ULL); // call expects usecs
esp_deep_sleep_start(); // TBD mA sleep current (battery)
}
}