Skip to content

Commit b23595b

Browse files
author
Francois Normandin
committed
Updated Base 64 with mergeVI
built json, xml and base64
1 parent 92838fa commit b23595b

9 files changed

+43
-39
lines changed

Serializer Addons.lvproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
</Item>
1919
<Item Name="Base64" Type="Folder">
2020
<Item Name="Serializer.Base64.lvclass" Type="LVClass" URL="../source-base64/Serializer.Base64.lvclass"/>
21+
<Item Name="Base64 Serializer.vi" Type="VI" URL="../source-base64/Base64 Serializer.vi"/>
2122
</Item>
2223
<Item Name="template" Type="Folder">
2324
<Item Name="OpenSerializer.Template.lvlib" Type="Library" URL="../source-template/OpenSerializer.Template.lvlib"/>
@@ -424,12 +425,6 @@
424425
<Item Name="Trim Whitespace__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/string/string.llb/Trim Whitespace__ogtk.vi"/>
425426
<Item Name="Set Enum String Value__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Set Enum String Value__ogtk.vi"/>
426427
</Item>
427-
<Item Name="Base64_Encode.vi" Type="VI" URL="../source/Base64_Encode.vi"/>
428-
<Item Name="Base64_Decode.vi" Type="VI" URL="../source/Base64_Decode.vi"/>
429-
<Item Name="Base64_CharSet.vi" Type="VI" URL="../source/Base64_CharSet.vi"/>
430-
<Item Name="Base64_ByteLUT.vi" Type="VI" URL="../source/Base64_ByteLUT.vi"/>
431-
<Item Name="Base64_EncodeAnything.vi" Type="VI" URL="../source/Base64_EncodeAnything.vi"/>
432-
<Item Name="Base64_DecodeAnything.vi" Type="VI" URL="../source/Base64_DecodeAnything.vi"/>
433428
</Item>
434429
<Item Name="Build Specifications" Type="Build"/>
435430
</Item>

Serializer Base64.vipb

Lines changed: 37 additions & 28 deletions
Large diffs are not rendered by default.

Serializer JKI-JSON.vipb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<VI_Package_Builder_Settings Version="2018" Created_Date="2019-04-01 18:34:00" Modified_Date="2020-11-03 17:26:25" Creator="normandinf" Comments="" ID="ae534f60087fdc304e67c3b68eb6f1c1">
1+
<VI_Package_Builder_Settings Version="2018" Created_Date="2019-04-01 18:34:00" Modified_Date="2020-11-03 17:37:02" Creator="normandinf" Comments="" ID="f1f5c65309a9299de9b27fb37c54f205">
22
<Library_General_Settings>
33
<Package_File_Name>LabVIEW_Open_Source_Project_lib_Serializer_JKI_JSON</Package_File_Name>
4-
<Library_Version>1.0.0.1</Library_Version>
4+
<Library_Version>1.0.0.2</Library_Version>
55
<Auto_Increment_Version>false</Auto_Increment_Version>
66
<Library_Source_Folder>source-jki-json</Library_Source_Folder>
77
<Library_Output_Folder>.</Library_Output_Folder>
@@ -366,7 +366,7 @@
366366
<Path>source-jki-json\_jki-json_Unmarshal.vi</Path>
367367
<VI_Title>Unmarshal</VI_Title>
368368
</Items_Data>
369-
<GUID>A68116701CA60933434E6AF5C4C7723D</GUID>
369+
<GUID>32669819B89615428997C96E0F19181F</GUID>
370370
</Functions_Palette_Data>
371371
</Library_Palette_Definition>
372372
</VI_Package_Builder_Settings>

Serializer easyXML.vipb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<VI_Package_Builder_Settings Version="2018" Created_Date="2019-04-01 18:34:00" Modified_Date="2020-11-03 17:34:22" Creator="normandinf" Comments="" ID="0b1c12c8383c8b5f7b123e53757e329e">
1+
<VI_Package_Builder_Settings Version="2018" Created_Date="2019-04-01 18:34:00" Modified_Date="2020-11-03 17:35:55" Creator="normandinf" Comments="" ID="390bdd7b33efcb0b474b76c7f5f56a34">
22
<Library_General_Settings>
33
<Package_File_Name>LabVIEW_Open_Source_Project_lib_Serializer_easyXML</Package_File_Name>
4-
<Library_Version>1.0.0.1</Library_Version>
4+
<Library_Version>1.0.0.2</Library_Version>
55
<Auto_Increment_Version>false</Auto_Increment_Version>
66
<Library_Source_Folder>source-easyXML</Library_Source_Folder>
77
<Library_Output_Folder>.</Library_Output_Folder>

source-base64/Base64 Serializer.vi

7.08 KB
Binary file not shown.
-4 Bytes
Binary file not shown.

source-base64/unmarshalling.vi

-8 Bytes
Binary file not shown.

unit tests/Benchmark 800kB Input.vi

64 Bytes
Binary file not shown.
76 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)