From df81c1c5640a8e3970bc1fd8cc67b8c224fdd232 Mon Sep 17 00:00:00 2001 From: JeremyB Date: Wed, 24 Jan 2018 11:48:28 -0600 Subject: [PATCH] firmware version numbers bumped to v1.0 --- configurations/chromatron.config | 2 +- python/catbus/catbus/client.py | 8 ++++---- src/chromatron/buildnumber.txt | 2 +- src/chromatron/settings.json | 2 +- src/chromatron_recovery/buildnumber.txt | 2 +- src/chromatron_recovery/settings.json | 2 +- src/chromatron_wifi/src/version.h | 4 ++-- src/hal/xmega128a4u/buildnumber.txt | 2 +- src/hal/xmega128a4u/lib_asf_usb/conf_usb.h | 4 ++-- src/lib_chromatron/buildnumber.txt | 2 +- src/lib_chromatron/settings.json | 2 +- src/lib_dns/buildnumber.txt | 2 +- src/lib_sntp/buildnumber.txt | 2 +- src/lib_sntp/settings.json | 2 +- src/sapphireos/buildnumber.txt | 2 +- src/sapphireos/settings.json | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/configurations/chromatron.config b/configurations/chromatron.config index 7ea6e7cd2..511b6073e 100644 --- a/configurations/chromatron.config +++ b/configurations/chromatron.config @@ -1,4 +1,4 @@ [chromatron] -proj_version=0.9 +proj_version=1.0 base_proj=chromatron_app full_name=Chromatron diff --git a/python/catbus/catbus/client.py b/python/catbus/catbus/client.py index eb00fb361..c685bd935 100644 --- a/python/catbus/catbus/client.py +++ b/python/catbus/catbus/client.py @@ -683,12 +683,12 @@ def list_files(self): c = Client() - c.discover() + # c.discover() - # for node in c.discover('arc2').values(): - # pprint(node) + # for node in c.discover().values(): + # pprint(node) - # c.connect(('10.0.0.137', 44632)) + c.connect(('10.0.0.122', 44632)) # c.delete_file('rainbow.fxb') diff --git a/src/chromatron/buildnumber.txt b/src/chromatron/buildnumber.txt index 218011b60..8df4f0e8f 100644 --- a/src/chromatron/buildnumber.txt +++ b/src/chromatron/buildnumber.txt @@ -1 +1 @@ -3667 \ No newline at end of file +3672 \ No newline at end of file diff --git a/src/chromatron/settings.json b/src/chromatron/settings.json index fe3889cfc..3b9eef012 100644 --- a/src/chromatron/settings.json +++ b/src/chromatron/settings.json @@ -5,7 +5,7 @@ "PROJ_NAME": "chromatron_app", "_comment": "Project version", - "PROJ_VERSION": "0.9", + "PROJ_VERSION": "1.0", "_comment": "Firmware ID", "_comment": "This is automatically generated", diff --git a/src/chromatron_recovery/buildnumber.txt b/src/chromatron_recovery/buildnumber.txt index ae4ee13c0..e0d1ea1e9 100644 --- a/src/chromatron_recovery/buildnumber.txt +++ b/src/chromatron_recovery/buildnumber.txt @@ -1 +1 @@ -200 \ No newline at end of file +205 \ No newline at end of file diff --git a/src/chromatron_recovery/settings.json b/src/chromatron_recovery/settings.json index b60299814..e620b9d2c 100644 --- a/src/chromatron_recovery/settings.json +++ b/src/chromatron_recovery/settings.json @@ -5,7 +5,7 @@ "PROJ_NAME": "chromatron_recovery", "_comment": "Project version", - "PROJ_VERSION": "0.9", + "PROJ_VERSION": "1.0", "_comment": "Firmware ID", "_comment": "This is automatically generated", diff --git a/src/chromatron_wifi/src/version.h b/src/chromatron_wifi/src/version.h index a38252846..e86771043 100644 --- a/src/chromatron_wifi/src/version.h +++ b/src/chromatron_wifi/src/version.h @@ -23,8 +23,8 @@ #ifndef _VERSION_H #define _VERSION_H -#define VERSION_MAJOR 0 -#define VERSION_MINOR 9 +#define VERSION_MAJOR 1 +#define VERSION_MINOR 0 #define VERSION_PATCH 0 diff --git a/src/hal/xmega128a4u/buildnumber.txt b/src/hal/xmega128a4u/buildnumber.txt index 47a888eff..453fd1fad 100644 --- a/src/hal/xmega128a4u/buildnumber.txt +++ b/src/hal/xmega128a4u/buildnumber.txt @@ -1 +1 @@ -9175 \ No newline at end of file +9180 \ No newline at end of file diff --git a/src/hal/xmega128a4u/lib_asf_usb/conf_usb.h b/src/hal/xmega128a4u/lib_asf_usb/conf_usb.h index c057e7079..17fccfaa5 100644 --- a/src/hal/xmega128a4u/lib_asf_usb/conf_usb.h +++ b/src/hal/xmega128a4u/lib_asf_usb/conf_usb.h @@ -65,8 +65,8 @@ #define USB_DEVICE_VENDOR_ID USB_VID_ATMEL #define USB_DEVICE_PRODUCT_ID USB_PID_ATMEL_ASF_CDC #endif -#define USB_DEVICE_MAJOR_VERSION 0 -#define USB_DEVICE_MINOR_VERSION 2 +#define USB_DEVICE_MAJOR_VERSION 1 +#define USB_DEVICE_MINOR_VERSION 0 #define USB_DEVICE_POWER 500 // Consumption on Vbus line (mA) #define USB_DEVICE_ATTR \ (USB_CONFIG_ATTR_SELF_POWERED) diff --git a/src/lib_chromatron/buildnumber.txt b/src/lib_chromatron/buildnumber.txt index 9a0a33e74..8dae74232 100644 --- a/src/lib_chromatron/buildnumber.txt +++ b/src/lib_chromatron/buildnumber.txt @@ -1 +1 @@ -2934 \ No newline at end of file +2939 \ No newline at end of file diff --git a/src/lib_chromatron/settings.json b/src/lib_chromatron/settings.json index 89f371827..71c65c8cf 100644 --- a/src/lib_chromatron/settings.json +++ b/src/lib_chromatron/settings.json @@ -5,7 +5,7 @@ "PROJ_NAME": "lib_chromatron", "_comment": "Project version", - "PROJ_VERSION": "0.9", + "PROJ_VERSION": "1.0", "_comment": "Firmware ID", "_comment": "This is automatically generated", diff --git a/src/lib_dns/buildnumber.txt b/src/lib_dns/buildnumber.txt index 71c565cd0..f4c577372 100644 --- a/src/lib_dns/buildnumber.txt +++ b/src/lib_dns/buildnumber.txt @@ -1 +1 @@ -2774 \ No newline at end of file +2779 \ No newline at end of file diff --git a/src/lib_sntp/buildnumber.txt b/src/lib_sntp/buildnumber.txt index 6f7f6dd23..2e8bf645b 100644 --- a/src/lib_sntp/buildnumber.txt +++ b/src/lib_sntp/buildnumber.txt @@ -1 +1 @@ -2161 \ No newline at end of file +2166 \ No newline at end of file diff --git a/src/lib_sntp/settings.json b/src/lib_sntp/settings.json index 59aab066b..fa792567c 100644 --- a/src/lib_sntp/settings.json +++ b/src/lib_sntp/settings.json @@ -5,7 +5,7 @@ "PROJ_NAME": "lib_sntp", "_comment": "Project version", - "PROJ_VERSION": "0.1", + "PROJ_VERSION": "1.0", "_comment": "Firmware ID", "_comment": "This is automatically generated", diff --git a/src/sapphireos/buildnumber.txt b/src/sapphireos/buildnumber.txt index 4688a1425..46bcf1459 100644 --- a/src/sapphireos/buildnumber.txt +++ b/src/sapphireos/buildnumber.txt @@ -1 +1 @@ -17588 \ No newline at end of file +17593 \ No newline at end of file diff --git a/src/sapphireos/settings.json b/src/sapphireos/settings.json index 325ca412a..8d76ff88a 100644 --- a/src/sapphireos/settings.json +++ b/src/sapphireos/settings.json @@ -2,7 +2,7 @@ "FULL_NAME": "SapphireOS", "PROJ_NAME": "sapphire", - "PROJ_VERSION": "0.9", + "PROJ_VERSION": "1.0", "BUILD_TYPE": "os",