Commitf2ad1a3

authored and

committed

Write version info to boot_out.txt.

1 parent43650b6 commitf2ad1a3Copy full SHA for f2ad1a3

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`#include<stdint.h>`
`28`	`28`	`#include<string.h>`
`29`	`29`
	`30`	`+#include"genhdr/mpversion.h"`
`30`	`31`	`#include"py/nlr.h"`
`31`	`32`	`#include"py/compile.h"`
`32`	`33`	`#include"py/frozenmod.h"`
`@@ -700,6 +701,9 @@ int main(void) {`
`700`	`701`	`f_open(&((fs_user_mount_t*)MP_STATE_VM(vfs_mount_table)->obj)->fatfs,`
`701`	`702`	`boot_output_file,CIRCUITPY_BOOT_OUTPUT_FILE,FA_WRITE \|FA_CREATE_ALWAYS);`
`702`	`703`	`flash_set_usb_writeable(true);`
	`704`	`+// Write version info to boot_out.txt.`
	`705`	`+mp_hal_stdout_tx_str(MICROPY_FULL_VERSION_INFO);`
	`706`	`+mp_hal_stdout_tx_str("\r\n");`
`703`	`707`	`#endif`
`704`	`708`
`705`	`709`	`// TODO(tannewt): Re-add support for flashing boot error output.`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,8 @@ STATIC int pyexec_friendly_repl_process_char(int c) {`
`256`	`256`	`}elseif (ret==CHAR_CTRL_B) {`
`257`	`257`	`// reset friendly REPL`
`258`	`258`	`mp_hal_stdout_tx_str("\r\n");`
`259`		`-mp_hal_stdout_tx_str("Adafruit CircuitPython "MICROPY_GIT_TAG" on "MICROPY_BUILD_DATE"; "MICROPY_HW_BOARD_NAME" with "MICROPY_HW_MCU_NAME"\r\n");`
	`259`	`+mp_hal_stdout_tx_str(MICROPY_FULL_VERSION_INFO);`
	`260`	`+mp_hal_stdout_tx_str("\r\n");`
`260`	`261`	`// mp_hal_stdout_tx_str("Type \"help()\" for more information.\r\n");`
`261`	`262`	`gotoinput_restart;`
`262`	`263`	`}elseif (ret==CHAR_CTRL_C) {`
`@@ -395,7 +396,9 @@ int pyexec_friendly_repl(void) {`
`395`	`396`	`#endif`
`396`	`397`
`397`	`398`	`friendly_repl_reset:`
`398`		`-mp_hal_stdout_tx_str("\r\nAdafruit CircuitPython "MICROPY_GIT_TAG" on "MICROPY_BUILD_DATE"; "MICROPY_HW_BOARD_NAME" with "MICROPY_HW_MCU_NAME"\r\n");`
	`399`	`+mp_hal_stdout_tx_str("\r\n");`
	`400`	`+mp_hal_stdout_tx_str(MICROPY_FULL_VERSION_INFO);`
	`401`	`+mp_hal_stdout_tx_str("\r\n");`
`399`	`402`	`// mp_hal_stdout_tx_str("Type \"help()\" for more information.\r\n");`
`400`	`403`
`401`	`404`	`// to test ctrl-C`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ def make_version_header(filename):`
`86`	`86`	`#define MICROPY_VERSION_MINOR (%s)`
`87`	`87`	`#define MICROPY_VERSION_MICRO (%s)`
`88`	`88`	`#define MICROPY_VERSION_STRING "%s"`
	`89`	`+#define MICROPY_FULL_VERSION_INFO ("Adafruit CircuitPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME)`
`89`	`90`	`"""% (git_tag,git_hash,datetime.date.today().strftime("%Y-%m-%d"),`
`90`	`91`	`ver[0].replace('v',''),ver[1],ver[2],version_string)`
`91`	`92`

Comments

(0)