x

soburi · soburi · commit 3b01fde80841 · 2026-02-23T12:21:34.000+09:00
diff --git a/alt_arduinocore_api/api/ArduinoAPI.h b/alt_arduinocore_api/api/ArduinoAPI.h
@@ -12,7 +12,6 @@
 #include <zephyr/drivers/gpio.h>
 
 #include "api/HardwareSerial.h"
-#include "common_types.h"
 
 #define lowByte(w) ((uint8_t) ((w) & 0xff))
 #define highByte(w) ((uint8_t) ((w) >> 8))
diff --git a/alt_arduinocore_api/idl/proto/arduino_opts.proto b/alt_arduinocore_api/idl/proto/arduino_opts.proto
@@ -35,4 +35,6 @@ extend google.protobuf.ServiceOptions {
   string service_impl_class_name = 50214;
   string api_member_name = 50215;
   repeated string base_services = 50216;
+  string ifc_header_name = 50217;
+  repeated string extra_includes = 50218;
 }
diff --git a/alt_arduinocore_api/idl/proto/client.proto b/alt_arduinocore_api/idl/proto/client.proto
@@ -13,6 +13,8 @@ import "google/protobuf/empty.proto";
 import "google/protobuf/wrappers.proto";
 
 service Client {
+  option (arduino.extra_includes) = "api/IPAddress.h";
+
   rpc ConnectAddress(google.protobuf.Empty) returns (google.protobuf.Empty) {
     option (arduino.cpp_decl) = "int connect(IPAddress ip, uint16_t port)";
   }
diff --git a/alt_arduinocore_api/idl/proto/common.proto b/alt_arduinocore_api/idl/proto/common.proto
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2026 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+syntax = "proto3";
+
+package arduino.idl;
+
+enum PinStatus {
+  LOW = 0;
+  HIGH = 1;
+  CHANGE = 2;
+  FALLING = 3;
+  RISING = 4;
+}
+
+enum PinMode {
+  INPUT = 0;
+  OUTPUT = 1;
+  INPUT_PULLUP = 2;
+  INPUT_PULLDOWN = 3;
+  OUTPUT_OPENDRAIN = 4;
+}
+
+enum BitOrder {
+  LSBFIRST = 0;
+  MSBFIRST = 1;
+}
+
+enum IPType {
+  IPv4 = 0;
+  IPv6 = 1;
+}
diff --git a/alt_arduinocore_api/idl/proto/hardware_can.proto b/alt_arduinocore_api/idl/proto/hardware_can.proto
@@ -21,6 +21,8 @@ enum CanBitRate {
 }
 
 service HardwareCAN {
+  option (arduino.extra_includes) = "api/HardwareCAN.h";
+
   rpc Begin(google.protobuf.Empty) returns (google.protobuf.BoolValue) {
     option (arduino.cpp_decl) = "bool begin(CanBitRate const can_bitrate)";
   }
diff --git a/alt_arduinocore_api/idl/proto/hardware_i2c.proto b/alt_arduinocore_api/idl/proto/hardware_i2c.proto
@@ -7,6 +7,8 @@ import "google/protobuf/empty.proto";
 import "google/protobuf/wrappers.proto";
 
 service HardwareI2C {
+  option (arduino.ifc_header_name) = "hardware_i2c_ifc.hpp";
+
   rpc Begin(google.protobuf.Empty) returns (google.protobuf.Empty) {
     option (arduino.cpp_decl) = "void begin()";
   }
diff --git a/alt_arduinocore_api/idl/proto/hardware_spi.proto b/alt_arduinocore_api/idl/proto/hardware_spi.proto
@@ -25,6 +25,8 @@ enum SPIBusMode {
 }
 
 service HardwareSPI {
+  option (arduino.extra_includes) = "api/HardwareSPI.h";
+
   rpc Transfer(google.protobuf.UInt32Value) returns (google.protobuf.UInt32Value) {
     option (arduino.cpp_decl) = "uint8_t transfer(uint8_t data)";
   }
diff --git a/alt_arduinocore_api/idl/proto/pluggable_usb_module.proto b/alt_arduinocore_api/idl/proto/pluggable_usb_module.proto
@@ -13,6 +13,8 @@ import "google/protobuf/empty.proto";
 import "google/protobuf/wrappers.proto";
 
 service PluggableUSBModule {
+  option (arduino.extra_includes) = "api/PluggableUSB.h";
+
   rpc Setup(google.protobuf.Empty) returns (google.protobuf.BoolValue) {
     option (arduino.cpp_decl) = "bool setup(USBSetup& setup)";
   }
diff --git a/alt_arduinocore_api/idl/proto/printable.proto b/alt_arduinocore_api/idl/proto/printable.proto
@@ -13,6 +13,8 @@ import "google/protobuf/empty.proto";
 import "google/protobuf/wrappers.proto";
 
 service Printable {
+  option (arduino.extra_includes) = "api/Print.h";
+
   rpc PrintTo(google.protobuf.Empty) returns (google.protobuf.UInt64Value) {
     option (arduino.cpp_decl) = "size_t printTo(Print& p) const";
   }
diff --git a/alt_arduinocore_api/idl/proto/udp.proto b/alt_arduinocore_api/idl/proto/udp.proto
@@ -13,6 +13,8 @@ import "google/protobuf/empty.proto";
 import "google/protobuf/wrappers.proto";
 
 service UDP {
+  option (arduino.extra_includes) = "api/IPAddress.h";
+
   rpc Begin(google.protobuf.UInt32Value) returns (google.protobuf.UInt32Value) {
     option (arduino.cpp_decl) = "uint8_t begin(uint16_t port)";
   }
diff --git a/tools/protoc-gen-arduinoif b/tools/protoc-gen-arduinoif
@@ -9,7 +9,11 @@ from pathlib import PurePosixPath
 from typing import Dict, List, NamedTuple, Optional, Tuple
 
 from google.protobuf.compiler import plugin_pb2
-from google.protobuf.descriptor_pb2 import DescriptorProto, EnumDescriptorProto, FieldDescriptorProto
+from google.protobuf.descriptor_pb2 import (
+    DescriptorProto,
+    EnumDescriptorProto,
+    FieldDescriptorProto,
+)
 
 
 FIELD_CPP_TYPE_TAG = 50001
@@ -30,29 +34,9 @@ SERVICE_SERVICE_CLASS_NAME_TAG = 50213
 SERVICE_SERVICE_IMPL_CLASS_NAME_TAG = 50214
 SERVICE_API_MEMBER_NAME_TAG = 50215
 SERVICE_BASE_SERVICES_TAG = 50216
+SERVICE_IFC_HEADER_NAME_TAG = 50217
+SERVICE_EXTRA_INCLUDES_TAG = 50218
 
-SERVICE_HEADER_NAMES = {
-    "Print": "print_ifc.hpp",
-    "Stream": "stream_ifc.hpp",
-    "Client": "client_ifc.hpp",
-    "Server": "server_ifc.hpp",
-    "HardwareSerial": "hardware_serial_ifc.hpp",
-    "HardwareI2C": "hardware_i2c_ifc.hpp",
-    "HardwareSPI": "hardware_spi_ifc.hpp",
-    "HardwareCAN": "hardware_can_ifc.hpp",
-    "UDP": "udp_ifc.hpp",
-    "PluggableUSBModule": "pluggable_usb_module_ifc.hpp",
-    "Printable": "printable_ifc.hpp",
-}
-
-SERVICE_EXTRA_INCLUDES = {
-    "Client": ["api/IPAddress.h"],
-    "HardwareSPI": ["api/HardwareSPI.h"],
-    "HardwareCAN": ["api/HardwareCAN.h"],
-    "UDP": ["api/IPAddress.h"],
-    "PluggableUSBModule": ["api/PluggableUSB.h"],
-    "Printable": ["api/Print.h"],
-}
 
 def _read_varint(data: bytes, index: int) -> Tuple[int, int]:
     value = 0
@@ -176,7 +160,9 @@ class MethodSpec(NamedTuple):
 
 
 def _snake_case(name: str) -> str:
-    return re.sub(r"(?<!^)(?=[A-Z])", "_", name).lower()
+    first_pass = re.sub(r"(.)([A-Z][a-z]+)", r"\1_\2", name)
+    second_pass = re.sub(r"([a-z0-9])([A-Z])", r"\1_\2", first_pass)
+    return second_pass.lower()
 
 
 def _collect_message_types(
@@ -357,7 +343,9 @@ def _collect_lineage_includes(
     includes: List[str] = []
     for service_full_name in lineage:
         service, _ = service_index[service_full_name]
-        includes.extend(SERVICE_EXTRA_INCLUDES.get(service.name, []))
+        includes.extend(
+            _get_string_list_option(service.options, SERVICE_EXTRA_INCLUDES_TAG)
+        )
     return _dedupe_ordered(includes)
 
 
@@ -401,10 +389,11 @@ def _field_type(field: FieldDescriptorProto) -> str:
     return default_types.get(field.type, "int32_t")
 
 
-def _service_header_name(service_name: str) -> str:
-    if service_name in SERVICE_HEADER_NAMES:
-        return SERVICE_HEADER_NAMES[service_name]
-    return f"{_snake_case(service_name)}_ifc.hpp"
+def _service_header_name(service) -> str:
+    header_name = _get_string_option(service.options, SERVICE_IFC_HEADER_NAME_TAG).strip()
+    if header_name:
+        return header_name
+    return f"{_snake_case(service.name)}_ifc.hpp"
 
 
 def _cpp_namespace_from_package(package_name: str) -> str:
@@ -643,8 +632,8 @@ def _append_grouped_methods(
         first_section = False
 
 
-def _service_header_stem(service_name: str) -> str:
-    ifc_header = _service_header_name(service_name)
+def _service_header_stem(service) -> str:
+    ifc_header = _service_header_name(service)
     suffix = "_ifc.hpp"
     if ifc_header.endswith(suffix):
         return ifc_header[: -len(suffix)]
@@ -770,13 +759,11 @@ def _generate_service_headers(
     for ancestor_full_name in ancestor_services:
         ancestor_service, _ = service_index[ancestor_full_name]
         service_base_ifc_class_names.append(_ifc_class_name(ancestor_service))
-        service_base_ifc_header_names.append(
-            _service_header_name(ancestor_service.name)
-        )
+        service_base_ifc_header_names.append(_service_header_name(ancestor_service))
     service_base_ifc_class_names = _dedupe_ordered(service_base_ifc_class_names)
     service_base_ifc_header_names = _dedupe_ordered(service_base_ifc_header_names)
-    stem = _service_header_stem(service.name)
-    ifc_header_name = _service_header_name(service.name)
+    stem = _service_header_stem(service)
+    ifc_header_name = _service_header_name(service)
     api_header_name = f"{stem}_api.hpp"
     service_header_name = f"{stem}_service.hpp"
     service_impl_header_name = f"{stem}_service_impl.hpp"
@@ -794,9 +781,7 @@ def _generate_service_headers(
         lambda spec: body_lines.append(f"  virtual {spec.decl} = 0;"),
     )
     body_lines.append("};")
-    outputs[ifc_header_name] = _render_header(
-        include_list, namespace_name, body_lines
-    )
+    outputs[ifc_header_name] = _render_header(include_list, namespace_name, body_lines)
 
     if generate_api_class:
         api_includes = [ifc_header_name, *include_list]

Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,6 @@ extend google.protobuf.ServiceOptions {`
`35`	`35`	`string service_impl_class_name = 50214;`
`36`	`36`	`string api_member_name = 50215;`
`37`	`37`	`repeated string base_services = 50216;`
	`38`	`+ string ifc_header_name = 50217;`
	`39`	`+ repeated string extra_includes = 50218;`
`38`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ import "google/protobuf/empty.proto";`
`13`	`13`	`import "google/protobuf/wrappers.proto";`
`14`	`14`
`15`	`15`	`service Client {`
	`16`	`+ option (arduino.extra_includes) = "api/IPAddress.h";`
	`17`	`+`
`16`	`18`	`rpc ConnectAddress(google.protobuf.Empty) returns (google.protobuf.Empty) {`
`17`	`19`	`option (arduino.cpp_decl) = "int connect(IPAddress ip, uint16_t port)";`
`18`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ enum CanBitRate {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`service HardwareCAN {`
	`24`	`+ option (arduino.extra_includes) = "api/HardwareCAN.h";`
	`25`	`+`
`24`	`26`	`rpc Begin(google.protobuf.Empty) returns (google.protobuf.BoolValue) {`
`25`	`27`	`option (arduino.cpp_decl) = "bool begin(CanBitRate const can_bitrate)";`
`26`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ import "google/protobuf/empty.proto";`
`7`	`7`	`import "google/protobuf/wrappers.proto";`
`8`	`8`
`9`	`9`	`service HardwareI2C {`
	`10`	`+ option (arduino.ifc_header_name) = "hardware_i2c_ifc.hpp";`
	`11`	`+`
`10`	`12`	`rpc Begin(google.protobuf.Empty) returns (google.protobuf.Empty) {`
`11`	`13`	`option (arduino.cpp_decl) = "void begin()";`
`12`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ enum SPIBusMode {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`service HardwareSPI {`
	`28`	`+ option (arduino.extra_includes) = "api/HardwareSPI.h";`
	`29`	`+`
`28`	`30`	`rpc Transfer(google.protobuf.UInt32Value) returns (google.protobuf.UInt32Value) {`
`29`	`31`	`option (arduino.cpp_decl) = "uint8_t transfer(uint8_t data)";`
`30`	`32`	`}`