Merge remote-tracking branch 'origin/main' into 228-cloning-an-object-ending-with-a-number-create-an-exception

Author: nimrof

EDSEditorGUI/DevicePDOView2.cs

@@ -499,6 +499,12 @@ public void UpdatePDOinfo(bool updatechoices = true)
                        MessageBox.Show(string.Format("Invalid TXPDO mapping parameters in 0x{0:X}!\r\nTrying to map more than the maximum lenght of a CAN message (8 bytes).\r\n\r\nMembers are:\r\n{1}", slot.ConfigurationIndex,toDisplay));
                         break;
                     }
+                    if ((bitoff + mappingentry.width) <= 0)
+                    {
+                        string toDisplay = string.Join(Environment.NewLine, slot.Mapping);
+                        MessageBox.Show(string.Format("Invalid TXPDO mapping parameters in 0x{0:X}!\r\nTrying to map less than the minimum lenght of a CAN message (0 bytes).\r\n\r\nMembers are:\r\n{1}", slot.ConfigurationIndex, toDisplay));
+                        break;
+                    }
                     string target = slot.getTargetName(mappingentry.entry);
                     grid1[row + 2, bitoff + INFO_COLS_COUNT] = new SourceGrid.Cells.Cell(target, comboStandard);
                     grid1[row + 2, bitoff + INFO_COLS_COUNT].ColumnSpan = mappingentry.width;

EDSEditorGUI2/EDSEditorGUI2.csproj

@@ -36,6 +36,6 @@
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.5" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
     <PackageReference Include="DialogHost.Avalonia" Version="0.8.1" />
-    <PackageReference Include="AutoMapper" Version="13.0.1" />
+    <PackageReference Include="AutoMapper" Version="16.2.0" />
   </ItemGroup>
 </Project>

EDSEditorGUI2/Mapper/ProtobufferViewModelMapper.cs

@@ -1,6 +1,7 @@
 using AutoMapper;
 using Google.Protobuf.WellKnownTypes;
 using LibCanOpen;
+using Microsoft.Extensions.Logging;
 using System;
 
 namespace EDSEditorGUI2.Mapper
@@ -27,7 +28,7 @@ public static ViewModels.Device MapFromProtobuffer(CanOpenDevice source)
                 .ForMember(dest => dest.Objects, opt => opt.MapFrom(src => src.Objects));
                 cfg.CreateMap<CanOpen_DeviceInfo, ViewModels.DeviceInfo>();
                 cfg.CreateMap<CanOpen_DeviceCommissioning, ViewModels.DeviceCommissioning>();
-            });
+            }, LoggerFactory.Create(builder => { builder.AddDebug(); }));
             config.AssertConfigurationIsValid();
             var mapper = config.CreateMapper();
             var result = mapper.Map<ViewModels.Device>(source);
@@ -42,7 +43,7 @@ public ViewModels.ObjectDictionary Convert(Google.Protobuf.Collections.MapField<
                 {
                     cfg.CreateMap<OdObject, ViewModels.OdObject>();
                     cfg.CreateMap<OdSubObject, ViewModels.OdSubObject>();
-                });
+                }, LoggerFactory.Create(builder => { builder.AddDebug(); }));
                 config.AssertConfigurationIsValid();
                 var mapper = config.CreateMapper();
 
@@ -59,7 +60,7 @@ public Google.Protobuf.Collections.MapField<string, OdObject> Convert(ViewModels
                 {
                     cfg.CreateMap<ViewModels.OdObject, OdObject>();
                     cfg.CreateMap<ViewModels.OdSubObject, OdSubObject>();
-                });
+                }, LoggerFactory.Create(builder => { builder.AddDebug(); }));
                 config.AssertConfigurationIsValid();
                 var mapper = config.CreateMapper();
 
@@ -77,7 +78,7 @@ public static CanOpenDevice MapToProtobuffer(ViewModels.Device source)
             var config = new MapperConfiguration(cfg =>
             {
                 //TODO
-            });
+            }, LoggerFactory.Create(builder => { builder.AddDebug(); }));
             config.AssertConfigurationIsValid();
             var mapper = config.CreateMapper();
             var result = mapper.Map<CanOpenDevice>(source);

libEDSsharp/CanOpenEDSMapping.cs

@@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License
 using AutoMapper;
 using Google.Protobuf.WellKnownTypes;
 using LibCanOpen;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -167,7 +168,7 @@ public static EDSsharp MapFromProtobuffer(CanOpenDevice source)
                 .ForMember(dest => dest.objecttype, opt => opt.Ignore())
                 .ForMember(dest => dest.Description, opt => opt.Ignore())
                 .ForMember(dest => dest.subobjects, opt => opt.Ignore());
-            });
+            }, LoggerFactory.Create(builder => { builder.AddDebug(); }));
             config.AssertConfigurationIsValid();
             var mapper = config.CreateMapper();
 
@@ -236,7 +237,7 @@ public static CanOpenDevice MapToProtobuffer(EDSsharp source)
                 .ForMember(dest => dest.Pdo, opt => opt.MapFrom(src => src.accesstype))
                 .ForMember(dest => dest.Srdo, opt => opt.MapFrom(src => src.prop.CO_accessSRDO))
                 .ForMember(dest => dest.StringLengthMin, opt => opt.MapFrom(src => src.prop.CO_stringLengthMin));
-            });
+            }, LoggerFactory.Create(builder => { builder.AddDebug(); }));
 
             config.AssertConfigurationIsValid();
             var mapper = config.CreateMapper();

libEDSsharp/libEDSsharp.csproj

@@ -47,8 +47,8 @@
     <PackageReference Include="System.CodeDom" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
     <PackageReference Include="Google.Protobuf" Version="3.27.2" />
     <PackageReference Include="Google.Protobuf.Tools" Version="3.27.2" />
-    <PackageReference Include="AutoMapper" Version="10.0.0" Condition="'$(TargetFramework)' == 'net481'" />
-    <PackageReference Include="AutoMapper" Version="13.0.1" Condition="'$(TargetFramework)' == 'net8.0'" />
+    <PackageReference Include="AutoMapper" Version="16.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.10" />
   </ItemGroup>
 
   <ItemGroup>