From 2886009d4d76e83fed1ad6be096a152c360d58e6 Mon Sep 17 00:00:00 2001
From: mapleafgo <mapleafgo@163.com>
Date: Thu, 21 Nov 2024 17:29:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=8C=87=E9=92=88=E9=85=8D=E7=BD=AEna?=
 =?UTF-8?q?me=E4=B9=9F=E8=AE=BE=E5=AE=9A=E4=B8=BA=E5=8F=AF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.yml                                     | 3 ++-
 internal/routes/play/card_device/device.go     | 4 ++--
 internal/routes/play/card_device/line_group.go | 1 +
 internal/routes/play/push_card.go              | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config.yml b/config.yml
index 5198a44..e4da68f 100755
--- a/config.yml
+++ b/config.yml
@@ -19,7 +19,8 @@ aliyun:
 game:
   maxTimeout: 60 # 单位 s
   cardGroups:
-    - outOK: 6
+    - name: gpiochip0
+      outOK: 6
       lower: 13
       error: 19
       empty: 26
diff --git a/internal/routes/play/card_device/device.go b/internal/routes/play/card_device/device.go
index b4388d3..9d62cbf 100644
--- a/internal/routes/play/card_device/device.go
+++ b/internal/routes/play/card_device/device.go
@@ -123,12 +123,12 @@ func (d *Device) GetEmpty() int {
 	return d.status[d.lines.Empty].Get()
 }
 
-func New(name string, lines *LineGroup) (*Device, error) {
+func New(lines *LineGroup) (*Device, error) {
 	if !lines.Ok() {
 		return nil, fmt.Errorf("针脚配置错误")
 	}
 
-	chip, err := gpiocdev.NewChip(name, gpiocdev.AsActiveLow)
+	chip, err := gpiocdev.NewChip(lines.Name, gpiocdev.AsActiveLow)
 	if err != nil {
 		return nil, fmt.Errorf("打开 GPIO 设备失败: %w", err)
 	}
diff --git a/internal/routes/play/card_device/line_group.go b/internal/routes/play/card_device/line_group.go
index 3aab56d..92e07d0 100644
--- a/internal/routes/play/card_device/line_group.go
+++ b/internal/routes/play/card_device/line_group.go
@@ -1,6 +1,7 @@
 package card_device
 
 type LineGroup struct {
+	Name  string
 	OutOK int
 	Lower int
 	Error int
diff --git a/internal/routes/play/push_card.go b/internal/routes/play/push_card.go
index f830312..91a517e 100644
--- a/internal/routes/play/push_card.go
+++ b/internal/routes/play/push_card.go
@@ -28,7 +28,7 @@ func PushCard(ctx context.Context) leaf.HandlerFunc {
 		gv, _ := json.Marshal(group)
 		zap.S().Info("发卡指针初始化:", string(gv))
 
-		device, err := card_device.New("gpiochip0", group)
+		device, err := card_device.New(group)
 		if err != nil {
 			zap.S().Panicln("初始化发卡器失败: ", err)
 		}