Bump version to 1.1.0

Crayon2000 · Feb 26, 2023 · f85928c · f85928c
1 parent 723b754
commit f85928c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,9 @@
 
 All notable changes to this project will be documented in this file.
 
-## [Unreleased]
+## [1.1.0] - 2023-02-26
 
-- TBD.
+- Send Wii U Pro Controller button states to UsendMii.
 
 ## [1.0.0] - 2021-11-13
 
@@ -38,7 +38,7 @@ All notable changes to this project will be documented in this file.
 
 - Initial release.
 
-[unreleased]: https://github.com/Crayon2000/MiisendU-Wii-U/compare/v1.0.0...HEAD
+[1.1.0]: https://github.com/Crayon2000/MiisendU-Wii-U/compare/v1.0.0...v1.1.0
 [1.0.0]: https://github.com/Crayon2000/MiisendU-Wii-U/compare/v0.3.0...v1.0.0
 [0.3.0]: https://github.com/Crayon2000/MiisendU-Wii-U/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/Crayon2000/MiisendU-Wii-U/compare/v0.1.0...v0.2.0

diff --git a/meta/meta.xml b/meta/meta.xml
@@ -2,8 +2,8 @@
 <app version="1">
   <name>MiisendU Wii U</name>
   <coder>Crayon</coder>
-  <version>1.0.0</version>
-  <release_date>20211113000000</release_date>
+  <version>1.1.0</version>
+  <release_date>20230226000000</release_date>
   <short_description>A UsendMii client</short_description>
   <long_description>A UsendMii client for Wii U.
 

diff --git a/source/main.c b/source/main.c
@@ -62,7 +62,7 @@ static void PrintHeader(OSScreenID bufferNum)
     OSScreenPutFontEx(bufferNum, -4, 0, " __  __ _ _                 _ _   _  __      ___ _   _   _ ");
     OSScreenPutFontEx(bufferNum, -4, 1, "|  \\/  (_|_)___ ___ _ _  __| | | | | \\ \\    / (_|_) | | | |");
     OSScreenPutFontEx(bufferNum, -4, 2, "| |\\/| | | (_-</ -_) ' \\/ _` | |_| |  \\ \\/\\/ /| | | | |_| |");
-    OSScreenPutFontEx(bufferNum, -4, 3, "|_|  |_|_|_/__/\\___|_||_\\__,_|\\___/    \\_/\\_/ |_|_|  \\___/  v1.0.0");
+    OSScreenPutFontEx(bufferNum, -4, 3, "|_|  |_|_|_/__/\\___|_||_\\__,_|\\___/    \\_/\\_/ |_|_|  \\___/  v1.1.0");
 }
 
 /**

diff --git a/source/vpad_to_json.cpp b/source/vpad_to_json.cpp
@@ -54,9 +54,7 @@ void pad_to_json(PADData pad_data, char* out, uint32_t out_size)
        pad_data.kpad[3] != NULL)
     {
         json_t *wiiremotes = json_array();
-        json_object_set_new_nocheck(root, "wiiRemotes", wiiremotes);
         json_t *wiiuprocontrollers = json_array();
-        json_object_set_new_nocheck(root, "wiiUProControllers", wiiuprocontrollers);
         for(int i = 0; i < 4; ++i)
         {
             if(pad_data.kpad[i] != NULL)
@@ -116,6 +114,22 @@ void pad_to_json(PADData pad_data, char* out, uint32_t out_size)
                 }
             }
         }
+        if(json_array_size(wiiremotes) > 0)
+        {
+            json_object_set_new_nocheck(root, "wiiRemotes", wiiremotes);
+        }
+        else
+        {
+            json_delete(wiiremotes);
+        }
+        if(json_array_size(wiiuprocontrollers) > 0)
+        {
+            json_object_set_new_nocheck(root, "wiiUProControllers", wiiuprocontrollers);
+        }
+        else
+        {
+            json_delete(wiiuprocontrollers);
+        }
     }
 
     // Convert to string