b3d7402498
Phase 16 (v0.6 milestone) — supporto Fagor CNC via FTP, riuso pattern Siemens/Mitsubishi (FtpWebRequest + ASCII). Modelli supportati: 8060/8065/8070 (FTP nativo), 8055 (con opzione Ethernet). Modelli 8025-8050 esclusi (solo RS232). Code: - Cnc/Fagor/* — FagorConnectionConfig, IFagorFtpClient, FagorFtpClient, FagorMachine. ProgramExtension configurabile (default .nc), ProgramDirectory /Users/Prg/. - Cnc/Models/CncManufacturer.cs — enum + Fagor. - Cnc/CncMachineFactory.cs — case Fagor, porta default 21. - Cnc/NcProgramValidator.cs — refactor IsRestrictiveDialect(): block-80/no-tab/no-lowercase/nested-parens/comment-32 ora applicati solo a Fanuc+Mitsubishi (Heidenhain/Siemens/Fagor esenti). Fagor name rules: max 24 char, no ñ (escape ñ per safety codepage), stem alphanumerico + spazi (estensione separata). - ArgParser.cs — case "fagor". - Program.cs — help text manufacturer/username/password. Tests: - FagorMachineTests — 12 unit (10 mock + 2 validator reale). - FagorMachineIntegrationTests — 5 stub-based (riusa FtpServerStub) + 1 hardware skip via FAGOR_TEST_IP env var. - NcProgramValidatorTests — 12 nuovi Fagor (8 + 4 extension coverage), 6 lock Siemens/Heidenhain exemption, 3 esistenti Siemens→Fanuc. - CncMachineFactoryTests — Create_Fagor_ReturnsFagorMachine. Docs: - README.md — sezione "Controller Fagor" italiano: modelli supportati/ non supportati, regole nome, env var test. Build: - *.csproj — 4 Compile Include main + 2 test. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
71 lines
2.8 KiB
C#
71 lines
2.8 KiB
C#
using System;
|
|
using NcProgramManager.Cnc.Fagor;
|
|
using NcProgramManager.Cnc.Fanuc;
|
|
using NcProgramManager.Cnc.Heidenhain;
|
|
using NcProgramManager.Cnc.Mitsubishi;
|
|
using NcProgramManager.Cnc.Models;
|
|
using NcProgramManager.Cnc.Siemens;
|
|
|
|
namespace NcProgramManager.Cnc
|
|
{
|
|
internal static class CncMachineFactory
|
|
{
|
|
internal static ICncMachine Create(InputArgs args)
|
|
{
|
|
switch (args.manufacturer)
|
|
{
|
|
case CncManufacturer.Heidenhain:
|
|
return new HeidenhainMachine(new HeidenhainConnectionConfig
|
|
{
|
|
Name = "Heidenhain",
|
|
IpAddress = args.ip,
|
|
Port = string.IsNullOrEmpty(args.porta) ? 19000 : int.Parse(args.porta),
|
|
Username = args.username,
|
|
Password = args.password,
|
|
ConnectTimeout = TimeSpan.FromSeconds(5)
|
|
});
|
|
|
|
case CncManufacturer.Siemens:
|
|
return new SiemensMachine(new SiemensConnectionConfig
|
|
{
|
|
Name = "Siemens",
|
|
IpAddress = args.ip,
|
|
Port = string.IsNullOrEmpty(args.porta) ? 21 : int.Parse(args.porta),
|
|
Username = args.username,
|
|
Password = args.password
|
|
});
|
|
|
|
case CncManufacturer.Mitsubishi:
|
|
return new MitsubishiMachine(new MitsubishiConnectionConfig
|
|
{
|
|
Name = "Mitsubishi",
|
|
IpAddress = args.ip,
|
|
Port = string.IsNullOrEmpty(args.porta) ? 21 : int.Parse(args.porta),
|
|
Username = args.username,
|
|
Password = args.password
|
|
});
|
|
|
|
case CncManufacturer.Fagor:
|
|
return new FagorMachine(new FagorConnectionConfig
|
|
{
|
|
Name = "Fagor",
|
|
IpAddress = args.ip,
|
|
Port = string.IsNullOrEmpty(args.porta) ? 21 : int.Parse(args.porta),
|
|
Username = args.username,
|
|
Password = args.password
|
|
});
|
|
|
|
default: // Fanuc
|
|
return new FanucMachine(new FanucConnectionConfig
|
|
{
|
|
Name = "Fanuc",
|
|
Transport = args.nodoHssb >= 0 ? FanucTransport.Hssb : FanucTransport.Ethernet,
|
|
IpAddress = args.ip,
|
|
Port = string.IsNullOrEmpty(args.porta) ? (ushort)8193 : ushort.Parse(args.porta),
|
|
HssbNode = args.nodoHssb,
|
|
ConnectTimeout = TimeSpan.FromSeconds(4)
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|