thooge
/
esp32-nmea2000-obp60
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git
1
0
Fork 0
Code Releases Activity

revert back for chip id in app info

This commit is contained in:
andreas 2023-09-09 17:11:32 +02:00
parent 4fcf6b753f
commit c87c38fca4
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/appinfo/GwAppInfo.h
View File

@ -16,8 +16,4 @@
#endif #endif
#define FIRMWARE_TYPE GWSTRINGIFY(PIO_ENV_BUILD) #define FIRMWARE_TYPE GWSTRINGIFY(PIO_ENV_BUILD)
#ifdef PIO_ENV_BOARD #define IDF_VERSION GWSTRINGIFY(ESP_IDF_VERSION_MAJOR) "." GWSTRINGIFY(ESP_IDF_VERSION_MINOR) "." GWSTRINGIFY(ESP_IDF_VERSION_PATCH)
#define BOARD_INFO "@@" GWSTRINGIFY(PIO_ENV_BOARD)
#else
#define BOARD_INFO ""
#endif

7
post.py
View File

@ -42,11 +42,16 @@ def post(source,target,env):
print("found fwname=%s, fwversion=%s"%(fwname,version)) print("found fwname=%s, fwversion=%s"%(fwname,version))
python=env.subst("$PYTHONEXE") python=env.subst("$PYTHONEXE")
print("base=%s,esptool=%s,appoffset=%s,uploaderflags=%s"%(base,esptool,appoffset,uploaderflags)) print("base=%s,esptool=%s,appoffset=%s,uploaderflags=%s"%(base,esptool,appoffset,uploaderflags))
chip="esp32"
uploadparts=uploaderflags.split(" ") uploadparts=uploaderflags.split(" ")
#currently hardcoded last 8 parameters... #currently hardcoded last 8 parameters...
if len(uploadparts) < 6: if len(uploadparts) < 6:
print("uploaderflags does not have enough parameter") print("uploaderflags does not have enough parameter")
return return
for i in range(0,len(uploadparts)):
if uploadparts[i]=="--chip":
if i < (len(uploadparts) -1):
chip=uploadparts[i+1]
uploadfiles=uploadparts[-6:] uploadfiles=uploadparts[-6:]
for i in range(1,len(uploadfiles),2): for i in range(1,len(uploadfiles),2):
if not os.path.isfile(uploadfiles[i]): if not os.path.isfile(uploadfiles[i]):
@ -64,7 +69,7 @@ def post(source,target,env):
versionedFile=os.path.join(outdir,"%s%s-update.bin"%(base,ofversion)) versionedFile=os.path.join(outdir,"%s%s-update.bin"%(base,ofversion))
shutil.copyfile(firmware,versionedFile) shutil.copyfile(firmware,versionedFile)
outfile=os.path.join(outdir,"%s%s-all.bin"%(base,ofversion)) outfile=os.path.join(outdir,"%s%s-all.bin"%(base,ofversion))
cmd=[python,esptool,"--chip","esp32","merge_bin","--target-offset",offset,"-o",outfile] cmd=[python,esptool,"--chip",chip,"merge_bin","--target-offset",offset,"-o",outfile]
cmd+=uploadfiles cmd+=uploadfiles
cmd+=[appoffset,firmware] cmd+=[appoffset,firmware]
print("running %s"%" ".join(cmd)) print("running %s"%" ".join(cmd))

7
src/main.cpp
View File

@ -76,7 +76,7 @@ const unsigned long HEAP_REPORT_TIME=2000; //set to 0 to disable heap reporting
//assert length of firmware name and version //assert length of firmware name and version
CASSERT(strlen(FIRMWARE_TYPE) <= 32, "environment name (FIRMWARE_TYPE) must not exceed 32 chars"); CASSERT(strlen(FIRMWARE_TYPE) <= 32, "environment name (FIRMWARE_TYPE) must not exceed 32 chars");
CASSERT(strlen(VERSION) <= 32, "VERSION must not exceed 32 chars"); CASSERT(strlen(VERSION) <= 32, "VERSION must not exceed 32 chars");
CASSERT(strlen(BOARD_INFO) <= 32,"BOARD_INFO must not exceed 32 chars"); CASSERT(strlen(IDF_VERSION) <= 32,"IDF_VERSION must not exceed 32 chars");
//https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/system/app_image_format.html //https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/system/app_image_format.html
//and removed the bugs in the doc... //and removed the bugs in the doc...
__attribute__((section(".rodata_custom_desc"))) esp_app_desc_t custom_app_desc = { __attribute__((section(".rodata_custom_desc"))) esp_app_desc_t custom_app_desc = {
@ -87,14 +87,13 @@ __attribute__((section(".rodata_custom_desc"))) esp_app_desc_t custom_app_desc =
FIRMWARE_TYPE, FIRMWARE_TYPE,
"00:00:00", "00:00:00",
"2021/12/13", "2021/12/13",
BOARD_INFO, IDF_VERSION,
{}, {},
{} {}
}; };
String firmwareType(FIRMWARE_TYPE); String firmwareType(FIRMWARE_TYPE);
String chipType(BOARD_INFO);
typedef std::map<String,String> StringMap; typedef std::map<String,String> StringMap;
@ -387,7 +386,7 @@ protected:
GwConfigHandler::toHex(base,buffer,bsize); GwConfigHandler::toHex(base,buffer,bsize);
status["salt"] = buffer; status["salt"] = buffer;
status["fwtype"]= firmwareType; status["fwtype"]= firmwareType;
status["chiptype"]=chipType.substring(2); status["chipid"]=CONFIG_IDF_FIRMWARE_CHIP_ID;
status["heap"]=(long)xPortGetFreeHeapSize(); status["heap"]=(long)xPortGetFreeHeapSize();
Nmea2kTwai::Status n2kState=NMEA2000.getStatus(); Nmea2kTwai::Status n2kState=NMEA2000.getStatus();
Nmea2kTwai::STATE driverState=n2kState.state; Nmea2kTwai::STATE driverState=n2kState.state;