Review fixes

Author: jeremypoulter

src/screens/screen_charge.cpp

@@ -6,7 +6,6 @@
 #include "screens/screen_charge.h"
 #include "lcd_common.h"
 #include <WiFi.h>
-#include "emonesp.h"
 #include <sys/time.h>
 
 #define BUTTON_BAR_X            0

src/screens/screen_factory.h

@@ -1,18 +1,19 @@
 #ifndef __SCREEN_FACTORY_H
 #define __SCREEN_FACTORY_H
 
+#include "screen_manager.h"
 #include "screen_base.h"
 #include "screen_boot.h"
 #include "screen_charge.h"
 
 class ScreenFactory {
 public:
-  static ScreenBase* createScreen(int screenType, TFT_eSPI &screen, EvseManager *evse,
+  static ScreenBase* createScreen(ScreenType screenType, TFT_eSPI &screen, EvseManager *evse,
                                   Scheduler *scheduler, ManualOverride *manual) {
     switch (screenType) {
-      case 0: // SCREEN_BOOT
+      case SCREEN_BOOT:
         return new BootScreen(screen, evse, scheduler, manual);
-      case 1: // SCREEN_CHARGE
+      case SCREEN_CHARGE:
         return new ChargeScreen(screen, evse, scheduler, manual);
       // Add additional screen types here
       default: