Commit 1faf409
committed
Complete MZTC build blockers exposed by enabling USE_MZTC in SITL
Enabling the feature in SITL (previous commit) surfaced two latent
issues in the feature code that only manifest when USE_MZTC is actually
compiled in:
- mztc_camera.c used fprintf(stderr, ...) via the SD() macro without
including <stdio.h> (6 'stderr undeclared' compile errors).
- mztc_camera_osd.c declared mztcOsdConfig via PG_DECLARE and used
PG_MZTC_OSD_CONFIG (1047) but never registered the parameter group
(undefined reference to mztcOsdConfig_System at link time). Added
PG_REGISTER_WITH_RESET_TEMPLATE + PG_RESET_TEMPLATE following the
mztcConfig pattern, with the MZTC_OSD_DEFAULT_* defines moved above
the template so the macros resolve.
SITL now compiles and links with the camera code active (verified via
fresh cmake -DSITL=ON + make SITL build).1 parent 612779a commit 1faf409
2 files changed
Lines changed: 16 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| 20 | + | |
20 | 21 | | |
21 | 22 | | |
22 | 23 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | | - | |
44 | | - | |
45 | 43 | | |
46 | 44 | | |
47 | 45 | | |
| |||
53 | 51 | | |
54 | 52 | | |
55 | 53 | | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
56 | 69 | | |
57 | 70 | | |
58 | 71 | | |
| |||
0 commit comments