Collected luna-files in one place, removed some old files

Author: vedderb

appconf/appconf_example_ppm.h

@@ -89,8 +89,8 @@
 //#define HW_SOURCE "hw_axiom.c"
 //#define HW_HEADER "hw_axiom.h"
 
-//#define HW_SOURCE "hw_luna_bbshd.c"
-//#define HW_HEADER "hw_luna_bbshd.h"
+//#define HW_SOURCE "luna/hw_luna_bbshd.c"
+//#define HW_HEADER "luna/hw_luna_bbshd.h"
 
 //#define HW_SOURCE "hw_rh.c"
 //#define HW_HEADER "hw_rh.h"

conf_general.h

@@ -3,7 +3,8 @@ HWSRC =	hwconf/hw.c \
 	hwconf/drv8305.c \
 	hwconf/drv8320s.c \
 	hwconf/drv8323s.c \
-	hwconf/luna_display_serial.c \
+	hwconf/luna/luna_display_serial.c \
 	hwconf/si8900.c
 
-HWINC = hwconf
+HWINC = hwconf \
+		hwconf/luna

hwconf/hwconf.mk

@@ -23,11 +23,11 @@
 
 #define HW_NAME				"LUNA_BBSHD"
 #include "mcconf_luna_bbshd_52v.h"
-#include "appconf_luna_bbshd.h"
+//#include "appconf_luna_bbshd.h" // Missing from pull request?
 
-#define QMLUI_SOURCE_APP	"qmlui/app/qmlui_luna_v1.c"
-#define QMLUI_HEADER_APP	"qmlui/app/qmlui_luna_v1.h"
-#define QMLUI_APP_FULLSCREEN
+#define QMLUI_SOURCE_HW		"hwconf/luna/qmlui_luna_v1.c"
+#define QMLUI_HEADER_HW		"hwconf/luna/qmlui_luna_v1.h"
+#define QMLUI_HW_FULLSCREEN
 
 // HW properties
 #define HW_HAS_3_SHUNTS

hwconf/hw_luna_bbshd.c hwconf/luna/hw_luna_bbshd.c

@@ -2,7 +2,7 @@
 
 #include "qmlui_luna_v1.h"
 
-uint8_t data_qml_app[7270] = {
+uint8_t data_qml_hw[7270] = {
 	0x00, 0x01, 0x92, 0x40, 0x78, 0xda, 0xed, 0x3d, 0xdb, 0x72, 0xdb, 0xb8, 0x92, 0xef, 0xfe, 0x0a, 
 	0x44, 0x5b, 0x9b, 0x23, 0x4d, 0x1c, 0x4a, 0xb6, 0x63, 0x67, 0x46, 0x67, 0x73, 0x52, 0xb1, 0x13, 
 	0x67, 0x5c, 0xe5, 0xcc, 0x78, 0x2c, 0x27, 0x79, 0x38, 0x39, 0xe5, 0xa2, 0x45, 0x48, 0x42, 0x85, 

hwconf/hw_luna_bbshd.h hwconf/luna/hw_luna_bbshd.h

@@ -8,10 +8,10 @@
 #include <stdbool.h>
 
 // Constants
-#define DATA_QML_APP_SIZE		7270
+#define DATA_QML_HW_SIZE		7270
 
 // Variables
-extern uint8_t data_qml_app[];
+extern uint8_t data_qml_hw[];
 
 // QMLUI_LUNA_V1_H_
 #endif