فهرست منبع

esp32: log esp32 Arduino core and ESP32-IDF version numbers

H. Peter Anvin 1 سال پیش
والد
کامیت
5b243dc301

+ 2 - 0
common/sysvars.vars

@@ -41,6 +41,8 @@ wifi.ssid		str
 hostname		str
 max80.fpga		bool
 max80.fw.date		str
+max80.fw.esp32.arduino	str
+max80.fw.esp32.idf	str
 max80.hw.serial		str
 max80.hw.ver		str
 net.ap.clients		uint

+ 1 - 1
esp32/Makefile

@@ -23,7 +23,7 @@ ARDUINO_OPTS  = -b $(BOARD) \
 		--build-property 'build.defines=$(build_defines)' \
 		--build-property 'build.cdc_on_boot=1' \
 		--build-property 'build.msc_on_boot=0' \
-		--build-property 'build.dfu_on_boot=1' \
+		--build-property 'build.dfu_on_boot=0' \
 		--build-property 'build.partitions=min_spiffs'
 
 all: $(TARGET)

+ 15 - 2
esp32/max80/max80.ino

@@ -18,6 +18,7 @@
 
 #include <USB.h>
 #include <HardwareSerial.h>
+#include <core_version.h>
 
 #define PIN_USB_PWR_EN		7
 #define PIN_USB_PWR_SINK	8
@@ -106,8 +107,20 @@ static void init_hw()
     led_set(LED_BLUE, LED_FLASH);	// ESP32 software initializing
 }
 
+#define _tostring(x) #x
+#define tostring(x) _tostring(x)
+
+static const char fwdate[] = __DATE__ " " __TIME__;
+static const char arduino_esp32_ver[] = tostring(ARDUINO_ESP32_GIT_DESC);
+
+static void set_build_status_info()
+{
+    setvar_str(status_max80_fw_date, fwdate);
+    setvar_str(status_max80_fw_esp32_arduino, arduino_esp32_ver);
+    setvar_str(status_max80_fw_esp32_idf, IDF_VER);
+}
+
 void setup() {
-    const char *fwdate = __DATE__ " " __TIME__;
     init_hw();
 
     // Enable external PSRAM for heap
@@ -127,7 +140,7 @@ void setup() {
     Serial.println("MAX80 start");
 
     init_config();
-    setvar_str(status_max80_fw_date, fwdate);
+    set_build_status_info();
     fpga_service_init();
     fpga_service_enable(true);
     SetupWiFi();

BIN
esp32/output/max80.ino.bin


+ 3 - 3
fpga/max80.qpf

@@ -19,15 +19,15 @@
 #
 # Quartus Prime
 # Version 22.1std.2 Build 922 07/20/2023 SC Lite Edition
-# Date created = 18:58:57  September 30, 2023
+# Date created = 19:17:55  September 30, 2023
 #
 # -------------------------------------------------------------------------- #
 
 QUARTUS_VERSION = "22.1"
-DATE = "18:58:57  September 30, 2023"
+DATE = "19:17:55  September 30, 2023"
 
 # Revisions
 
-PROJECT_REVISION = "v2"
 PROJECT_REVISION = "v1"
+PROJECT_REVISION = "v2"
 PROJECT_REVISION = "bypass"

BIN
fpga/output/bypass.jic


BIN
fpga/output/max80.fw


BIN
fpga/output/v1.fw


BIN
fpga/output/v1.jic


BIN
fpga/output/v1.sof


BIN
fpga/output/v2.fw


BIN
fpga/output/v2.jic


BIN
fpga/output/v2.sof


+ 1 - 1
rv32/checksum.h

@@ -1,4 +1,4 @@
 #ifndef CHECKSUM_H
 #define CHECKSUM_H
-#define SDRAM_SUM 0x858c32df
+#define SDRAM_SUM 0x60fea695
 #endif