diff --git a/src/W800_SDK_v1.00.10/app/app_drivers/lcd/lcd.c b/src/W800_SDK_v1.00.10/app/app_drivers/lcd/lcd.c
index f2394d1..4bfd523 100644
--- a/src/W800_SDK_v1.00.10/app/app_drivers/lcd/lcd.c
+++ b/src/W800_SDK_v1.00.10/app/app_drivers/lcd/lcd.c
@@ -80,7 +80,7 @@ const uint8_t gc9a01_init_seq[] = {
             0x03, 0, 0xB6, 0x00, 0x00,
 #if HARDWARE_PLATFORM == SMART_WATCH_BREADBOARD
             0x02, 0, 0x36, 0x88,
-#elif HARDWARE_PLATFORM == SMART_WATCH_PCB
+#elif HARDWARE_PLATFORM == SMART_WATCH_PCB_DEV || HARDWARE_PLATFORM == SMART_WATCH_PCB_RELEASE
             0x02, 0, 0x36, 0x48,
 #endif
             0x02, 0, 0x3A, 0x55,
@@ -449,7 +449,7 @@ void lcd_orientation(LCDConfig_t *const LCDConfig, LCDOrientation_e orientation)
             break;
         default: //Is default orientation eg : 0
             mmc_sdio_driver_write_one(0x88);
-#elif HARDWARE_PLATFORM == SMART_WATCH_PCB
+#elif HARDWARE_PLATFORM == SMART_WATCH_PCB_DEV || HARDWARE_PLATFORM == SMART_WATCH_PCB_RELEASE
         case LCD_ORIENTATION_90:
             mmc_sdio_driver_write_one(0x28);
             break;
diff --git a/src/W800_SDK_v1.00.10/app/app_drivers/watch_peripherals/watch_peripherals.c b/src/W800_SDK_v1.00.10/app/app_drivers/watch_peripherals/watch_peripherals.c
index 16464c0..1dee650 100644
--- a/src/W800_SDK_v1.00.10/app/app_drivers/watch_peripherals/watch_peripherals.c
+++ b/src/W800_SDK_v1.00.10/app/app_drivers/watch_peripherals/watch_peripherals.c
@@ -99,7 +99,7 @@ static void vibration_motor_timer_irq_cb(void *p)
     }    
 }
 
-#if BATTERY_CONTROLLER_STATUS_DETECTION_POLICY == POLL_POLICY && HARDWARE_PLATFORM == SMART_WATCH_PCB
+#if BATTERY_CONTROLLER_STATUS_DETECTION_POLICY == POLL_POLICY && (HARDWARE_PLATFORM == SMART_WATCH_PCB_DEV || HARDWARE_PLATFORM == SMART_WATCH_PCB_RELEASE)
 static uint8_t _battery_status_timer_id = WM_TIMER_ID_INVALID;
 
 static void battery_status_timer_irq_cb(void *p)
@@ -128,7 +128,7 @@ static void battery_status_timer_irq_cb(void *p)
         if(_BatteryControllerStatusChangeCb) _BatteryControllerStatusChangeCb(old_battery_status, _battery_fsm);
     }
 }
-#elif BATTERY_CONTROLLER_STATUS_DETECTION_POLICY == INTERRUPT_POLICY && HARDWARE_PLATFORM == SMART_WATCH_PCB
+#elif BATTERY_CONTROLLER_STATUS_DETECTION_POLICY == INTERRUPT_POLICY && (HARDWARE_PLATFORM == SMART_WATCH_PCB_DEV || HARDWARE_PLATFORM == SMART_WATCH_PCB_RELEASE)
 static void battery_controller_irq_cb(void *p)
 {
     enum tls_io_name gpio_pin = (enum tls_io_name)p;
@@ -209,7 +209,7 @@ static void watch_peripherals_io_init(void)
     tls_gpio_cfg(BATTERY_CONTROLLER_CHARGED_STATUS, WM_GPIO_DIR_INPUT, WM_GPIO_ATTR_FLOATING);
     tls_gpio_cfg(BATTERY_CONTROLLER_CHARGING_STATUS, WM_GPIO_DIR_INPUT, WM_GPIO_ATTR_FLOATING);
 
-#if BATTERY_CONTROLLER_STATUS_DETECTION_POLICY == INTERRUPT_POLICY && HARDWARE_PLATFORM == SMART_WATCH_PCB
+#if BATTERY_CONTROLLER_STATUS_DETECTION_POLICY == INTERRUPT_POLICY && (HARDWARE_PLATFORM == SMART_WATCH_PCB_DEV || HARDWARE_PLATFORM == SMART_WATCH_PCB_RELEASE)
     tls_gpio_isr_register(BATTERY_CONTROLLER_CHARGED_STATUS, &(battery_controller_irq_cb), (int*) BATTERY_CONTROLLER_CHARGED_STATUS);
 	tls_gpio_irq_enable(BATTERY_CONTROLLER_CHARGED_STATUS, WM_GPIO_IRQ_TRIG_DOUBLE_EDGE); // Enabled when level is changing edge
 
@@ -262,7 +262,7 @@ void watch_peripherals_init(int8_t adcOffset)
         if(WM_TIMER_ID_INVALID == _vibration_motor_timer_id)
             APP_LOG_ERROR("Failed to create vibration motor timer");
     }
-#if BATTERY_CONTROLLER_STATUS_DETECTION_POLICY == POLL_POLICY && HARDWARE_PLATFORM == SMART_WATCH_PCB
+#if BATTERY_CONTROLLER_STATUS_DETECTION_POLICY == POLL_POLICY && (HARDWARE_PLATFORM == SMART_WATCH_PCB_DEV || HARDWARE_PLATFORM == SMART_WATCH_PCB_RELEASE)
     if(WM_TIMER_ID_INVALID == _battery_status_timer_id)
     {
         struct tls_timer_cfg battery_status_timer_cfg = 
diff --git a/src/W800_SDK_v1.00.10/app/gfx/compass_screen.c b/src/W800_SDK_v1.00.10/app/gfx/compass_screen.c
index 6d03f48..2ed5c32 100644
--- a/src/W800_SDK_v1.00.10/app/gfx/compass_screen.c
+++ b/src/W800_SDK_v1.00.10/app/gfx/compass_screen.c
@@ -94,7 +94,7 @@ static void rotate_cardinal(CompassCardinal_t *cardinal, uint16_t azimuth)
 #if HARDWARE_PLATFORM == SMART_WATCH_BREADBOARD
     rotated_x = (float)(cardinal->position.x-120+cardinal->offset.x)*cos(azimuth_in_rads) - (float)(cardinal->position.y-120+cardinal->offset.y)*sin(azimuth_in_rads) + 120-cardinal->offset.x;
     rotated_y = (float)(cardinal->position.y-120+cardinal->offset.y)*cos(azimuth_in_rads) + (float)(cardinal->position.x-120+cardinal->offset.x)*sin(azimuth_in_rads) + 120-cardinal->offset.y;
-#elif HARDWARE_PLATFORM == SMART_WATCH_PCB
+#elif HARDWARE_PLATFORM == SMART_WATCH_PCB_DEV || HARDWARE_PLATFORM == SMART_WATCH_PCB_RELEASE
     rotated_x = (float)(cardinal->position.x-120+cardinal->offset.x)*cos(azimuth_in_rads) + (float)(cardinal->position.y-120+cardinal->offset.y)*sin(azimuth_in_rads) + 120-cardinal->offset.x;
     rotated_y = (float)(cardinal->position.y-120+cardinal->offset.y)*cos(azimuth_in_rads) - (float)(cardinal->position.x-120+cardinal->offset.x)*sin(azimuth_in_rads) + 120-cardinal->offset.y;
 #endif
@@ -151,7 +151,7 @@ void compass_screen_set_azimuth(CompassScreen_t * const compassScreen, uint16_t
     azimuth %= 360;
 #if HARDWARE_PLATFORM == SMART_WATCH_BREADBOARD
     uint16_t azimuthAdjusted = 359 - azimuth;
-#elif HARDWARE_PLATFORM == SMART_WATCH_PCB
+#elif HARDWARE_PLATFORM == SMART_WATCH_PCB_DEV || HARDWARE_PLATFORM == SMART_WATCH_PCB_RELEASE
     uint16_t azimuthAdjusted = azimuth; 
 #endif
 
@@ -182,7 +182,7 @@ void compass_screen_set_azimuth(CompassScreen_t * const compassScreen, uint16_t
     rotate_cardinal(&compassScreen->northCardinal, azimuth);
 #if HARDWARE_PLATFORM == SMART_WATCH_BREADBOARD
     lv_img_set_angle(compassScreen->northMarker, azimuth*10);
-#elif HARDWARE_PLATFORM == SMART_WATCH_PCB
+#elif HARDWARE_PLATFORM == SMART_WATCH_PCB_DEV || HARDWARE_PLATFORM == SMART_WATCH_PCB_RELEASE
     lv_img_set_angle(compassScreen->northMarker, -azimuth*10);
 #endif
     //lv_meter_set_scale_range(compassScreen->compassGraduation.meter, compassScreen->compassGraduation.scale, 0, 330, 330, azimuth-90);
diff --git a/src/W800_SDK_v1.00.10/lvgl/lvgl_port/lv_port_indev.c b/src/W800_SDK_v1.00.10/lvgl/lvgl_port/lv_port_indev.c
index a6b2ac0..5197d3e 100644
--- a/src/W800_SDK_v1.00.10/lvgl/lvgl_port/lv_port_indev.c
+++ b/src/W800_SDK_v1.00.10/lvgl/lvgl_port/lv_port_indev.c
@@ -152,7 +152,7 @@ static void touchpad_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data)
             data->point.x = 239-last_x;
             data->point.y = 239-last_y;
             break;
-#elif HARDWARE_PLATFORM == SMART_WATCH_PCB
+#elif HARDWARE_PLATFORM == SMART_WATCH_PCB_DEV || HARDWARE_PLATFORM == SMART_WATCH_PCB_RELEASE
         case LCD_ORIENTATION_90:
             data->point.x = last_y;
             data->point.y = 239-last_x;