From 853fda9814a4c4d3f62f4d79e23a80a9aed71cec Mon Sep 17 00:00:00 2001 From: simon Date: Mon, 19 May 2025 20:59:15 +0200 Subject: [PATCH] Build Output File Select --- main.go | 39 +++++++++++++++++++++++++++++++++++--- proto/proto.go | 4 ++++ templates/cpartSource.tmpl | 2 +- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/main.go b/main.go index ded4418..02d8155 100644 --- a/main.go +++ b/main.go @@ -2,6 +2,8 @@ package main import ( "encoding/json" + "flag" + "fmt" "log" "os" @@ -14,7 +16,12 @@ import ( var appConfig = koanf.New(".") func main() { - if err := appConfig.Load(file.Provider("testdata/conf.yaml"), yaml.Parser()); err != nil { + confPath := flag.String("c", "testdata/conf.yaml", "Config File") + outFileName := flag.String("o", "", "Name of the Output File") + + flag.Parse() + + if err := appConfig.Load(file.Provider(*confPath), yaml.Parser()); err != nil { log.Printf("error loading config: %v", err) } else { log.Printf("CONF: %v", appConfig) @@ -24,17 +31,43 @@ func main() { var cfg proto.Proto json.Unmarshal(file, &cfg) + // if outFileName is set use it, if is not set set it to default value + if *outFileName != "" { + cfg.FileName = *outFileName + } else { + *outFileName = "proto" + } + + // If filename not set in json take it from cli or default + if cfg.FileName != "" { + cfg.FileName = *outFileName + } + proto.InitTemplates() header, err := proto.CreateCStyleHeader(&cfg) if err != nil { log.Printf("ERROR: %v", err) } - log.Printf("TEMPLATE HEADER: \n%v", header) + err = os.MkdirAll("build", 0755) + if err != nil { + log.Printf("ERROR: %v", err) + return + } + + err = os.WriteFile(fmt.Sprintf("build/%s.h", *outFileName), []byte(header), 0666) + if err != nil { + log.Printf("ERROR: %v", err) + return + } source, err := proto.CreateCStyleSource(&cfg) if err != nil { log.Printf("ERROR: %v", err) } - log.Printf("TEMPLATE SOURCE: \n%v", source) + err = os.WriteFile(fmt.Sprintf("build/%s.c", *outFileName), []byte(source), 0666) + if err != nil { + log.Printf("ERROR: %v", err) + return + } } diff --git a/proto/proto.go b/proto/proto.go index 5685185..b3f3ff2 100644 --- a/proto/proto.go +++ b/proto/proto.go @@ -34,6 +34,7 @@ type Proto struct { ProtocolHeader ProtocolHeader `json:"protocol"` ESP_TO_PC []ProtoMessage `json:"messages_esp_to_pc"` PC_TO_ESP []ProtoMessage `json:"messages_pc_to_esp"` + FileName string `json:"filename,omitempty"` } func (h *HexByte) UnmarshalJSON(data []byte) error { @@ -62,6 +63,7 @@ type PayloadStruct struct { } type CStyleData struct { + FileName string CenumPCTOESP Cenum CenumESPTOPC Cenum PayloadStructs []PayloadStruct @@ -105,6 +107,7 @@ func CreateCStyleHeader(proto *Proto) (string, error) { } var data = CStyleData{ + FileName: proto.FileName, CenumPCTOESP: Cenum{ EnumName: "PC_TO_ESP_MESSAGE_IDS", Entries: proto.PC_TO_ESP, @@ -148,6 +151,7 @@ func CreateCStyleSource(proto *Proto) (string, error) { } var data = CStyleData{ + FileName: proto.FileName, CenumPCTOESP: Cenum{ EnumName: "PC_TO_ESP_MESSAGE_IDS", Entries: proto.PC_TO_ESP, diff --git a/templates/cpartSource.tmpl b/templates/cpartSource.tmpl index 74a706a..b6ec84e 100644 --- a/templates/cpartSource.tmpl +++ b/templates/cpartSource.tmpl @@ -1,7 +1,7 @@ {{- define "cpartSource" -}} // AUTO GENERATED DO NOT EDIT!!! -#include "uart_prot.h" +#include "{{.FileName}}.h" #include // Message Dispatcher