Skip to content

Jonny branch #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonnydyer wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Jonny branch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd3322c
Fixed c structure definition in add_version_info.py and fixed example…
jonnydyer Nov 3, 2020
64ac738
limited length of host name to 16 bytes to fit within packed struct
jonnydyer Aug 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ struct version_info {

extern volatile const struct version_info version_info;

void print_version_info(int verbose);
void print_version_info(const struct version_info *v);
```

#### `version.c`
Expand All @@ -74,15 +74,19 @@ volatile const struct version_info version_info = {
void print_version_info(const struct version_info *v)
{
printf(
"%s v%d.%d.%d %s %s %s\n"
" Compiled %s %s by %s on %s\n"
"%s v%d.%d.%d %s\n\r"
"Compiled %s %s by %s on %s\n\r"
"Image Start: 0x%x Size: %d\n\r"
"Image CRC: 0x%x\n",
v->product_name,
v->major, v->minor, v->patch,
v->vcs_id,
v->build_date, v->build_time,
v->build_date, v->build_time,
v->build_user, v->build_host
v->build_user, v->build_host,
v->image_start, v->image_size,
v->image_crc
);

}

void main(void)
Expand Down
7 changes: 6 additions & 1 deletion add_version_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import ctypes
import datetime
import os
import struct

import elf_reader
from crc32_forge import CRC32
Expand All @@ -60,6 +61,10 @@ class version_info(ctypes.LittleEndianStructure):
("build_host" , ctypes.c_char * 16),
("build_date" , ctypes.c_char * 16),
("build_time" , ctypes.c_char * 16),
("product_name" , ctypes.c_char * 32),
("major" , ctypes.c_int32),
("minor" , ctypes.c_int32),
("patch" , ctypes.c_int32),

("vcs_info_end" , ctypes.c_char * 16)
]
Expand All @@ -79,7 +84,7 @@ def fill_version_info(info):
dprint(info.vcs_id.decode(ENCODING))

info.build_user = bytes(getpass.getuser(), ENCODING)
info.build_host = bytes(platform.node(), ENCODING)
info.build_host = bytes(platform.node()[0:16], ENCODING)

mtime = datetime.datetime.fromtimestamp( os.path.getmtime(args.source) )
info.build_date = bytes(mtime.strftime("%Y-%m-%d"), ENCODING)
Expand Down