Merge pull request 'fix: drop extern "C" on main to clear -Wpedantic warning (-S4)' (#6) from fix/main-extern-c-pedantic-warning into main
Build Firmware / Build stm32-teslacharger (push) Successful in 1m0s
Build Firmware / Build stm32-teslacharger (push) Successful in 1m0s
This commit was merged in pull request #6.
This commit is contained in:
@@ -4,3 +4,4 @@ stm32_charger*
|
||||
linker.map
|
||||
*.layout
|
||||
*.out
|
||||
.DS_Store
|
||||
|
||||
+2
-2
@@ -126,9 +126,9 @@
|
||||
#define CAT_COMM "Communication"
|
||||
|
||||
// SKUDAK customization suffix: bump on every Skudak-side change so the OpenInverter
|
||||
// web UI shows a distinct version (e.g. "4=1.20.R-S3") and we can visually confirm
|
||||
// web UI shows a distinct version (e.g. "4=1.20.R-S4") and we can visually confirm
|
||||
// the right firmware is flashed. Match the stm32-sine -S<N> convention.
|
||||
#define VERSTR STRINGIFY(4=VER-S3)
|
||||
#define VERSTR STRINGIFY(4=VER-S4)
|
||||
|
||||
/***** enums ******/
|
||||
|
||||
|
||||
+5
-1
@@ -158,7 +158,11 @@ extern "C" void tim2_isr(void)
|
||||
scheduler->Run();
|
||||
}
|
||||
|
||||
extern "C" int main(void)
|
||||
// C++ forbids a linkage specification on `main` (-Wpedantic). The reset_handler
|
||||
// in libopencm3's vector.c forward-declares `int main(void)` with default
|
||||
// linkage and resolves it at link time by symbol name, so dropping `extern "C"`
|
||||
// here doesn't affect how main is invoked at boot.
|
||||
int main(void)
|
||||
{
|
||||
extern const TERM_CMD termCmds[];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user