From d80b1abc62a416b00b1d0b099d286d82fbd79761 Mon Sep 17 00:00:00 2001
From: "K.Ohta" <whatisthis.sowhat@gmail.com>
Date: Thu, 10 Oct 2013 16:14:07 +0900
Subject: [PATCH] [POWER][v1.0] Fix order of shutdown.

---
 menu_setup.c |  1 +
 power.c      | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/menu_setup.c b/menu_setup.c
index 6b341b8..3a25500 100644
--- a/menu_setup.c
+++ b/menu_setup.c
@@ -79,6 +79,7 @@ void setup_menu(void)
                 if(val > 255) val = 255;
                 if(val < 10) val = 15;
                 setup.backlight_level = (unsigned char)val;
+                lcd_setbacklight(0xff, val);
             }
             break;
         case charcode_4:
diff --git a/power.c b/power.c
index a87854c..681e0a8 100644
--- a/power.c
+++ b/power.c
@@ -92,9 +92,9 @@ void power_on_inthook(void)
 void power_on(unsigned char f)
 {
     if(f == 0x00){
-        set_examp_mute(0xff);
-        idle_time_ms(200);
         set_radiopower(0x00);
+//        idle_time_ms(200);
+        set_examp_mute(0xff);
     } else {
         set_examp_mute(0x00);
         idle_time_ms(100);
@@ -137,26 +137,26 @@ unsigned char chk_powerbutton(void)
     return 0; // Not pressed
 }
 
-void shutdown(unsigned char save)
+void shutdown(unsigned char save_v)
 {
     rfamp_power(RFAMP_OFF);
+    power_on(0);
     acm1602_suspend(LCD_I2CADDR);
-    power_off(save);
+    lcd_setbacklight(0, 0);
+    power_off(save_v);
 }
 
-void power_off(unsigned char save)
+void power_off(unsigned char save_v)
 {
     unsigned char sts;
 
-    if(save != 0) {
+    if(save_v != 0) {
         save_eeprom();
 //        save_frequencies();
     }
-    lcd_setbacklight(0, 0);
-    set_powerlamp(0);
     _AM_STATLAMP = 0;
     _FM_STATLAMP = 0;
-    power_on(0);
+    set_powerlamp(0);
 
     WDTCONbits.SWDTEN = 0; // Lame WDT OFF.
     sts = 0;
-- 
2.11.0