diff --git a/ise_display/Images/mvp-v1/set1/touched/airOff.png b/ise_display/Images/mvp-v1/set1/touched/airOff.png new file mode 100644 index 0000000..f671e2c Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/airOff.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/airOn.png b/ise_display/Images/mvp-v1/set1/touched/airOn.png new file mode 100644 index 0000000..03d7a1d Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/airOn.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/fanAuto.png b/ise_display/Images/mvp-v1/set1/touched/fanAuto.png new file mode 100644 index 0000000..151efe4 Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/fanAuto.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/fanHigh.png b/ise_display/Images/mvp-v1/set1/touched/fanHigh.png new file mode 100644 index 0000000..715f24f Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/fanHigh.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/fanLow.png b/ise_display/Images/mvp-v1/set1/touched/fanLow.png new file mode 100644 index 0000000..fff8efb Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/fanLow.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/fanMid.png b/ise_display/Images/mvp-v1/set1/touched/fanMid.png new file mode 100644 index 0000000..fff5cb9 Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/fanMid.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/lightoff.png b/ise_display/Images/mvp-v1/set1/touched/lightoff.png new file mode 100644 index 0000000..2f57e37 Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/lightoff.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/lighton.png b/ise_display/Images/mvp-v1/set1/touched/lighton.png new file mode 100644 index 0000000..c5d4410 Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/lighton.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/lv1off.png b/ise_display/Images/mvp-v1/set1/touched/lv1off.png new file mode 100644 index 0000000..0b2159b Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/lv1off.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/lv1on.png b/ise_display/Images/mvp-v1/set1/touched/lv1on.png new file mode 100644 index 0000000..55d4e96 Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/lv1on.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/lv2off.png b/ise_display/Images/mvp-v1/set1/touched/lv2off.png new file mode 100644 index 0000000..67ebc5f Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/lv2off.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/lv2on.png b/ise_display/Images/mvp-v1/set1/touched/lv2on.png new file mode 100644 index 0000000..19273ba Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/lv2on.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/modeCool.png b/ise_display/Images/mvp-v1/set1/touched/modeCool.png new file mode 100644 index 0000000..5064db1 Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/modeCool.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/modeDry.png b/ise_display/Images/mvp-v1/set1/touched/modeDry.png new file mode 100644 index 0000000..aeaf26d Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/modeDry.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/modeFan.png b/ise_display/Images/mvp-v1/set1/touched/modeFan.png new file mode 100644 index 0000000..e7664a6 Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/modeFan.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/row1off.png b/ise_display/Images/mvp-v1/set1/touched/row1off.png new file mode 100644 index 0000000..c1aa916 Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/row1off.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/row1on.png b/ise_display/Images/mvp-v1/set1/touched/row1on.png new file mode 100644 index 0000000..5f8e18e Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/row1on.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/row2off.png b/ise_display/Images/mvp-v1/set1/touched/row2off.png new file mode 100644 index 0000000..f073e21 Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/row2off.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/row2on.png b/ise_display/Images/mvp-v1/set1/touched/row2on.png new file mode 100644 index 0000000..75afd74 Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/row2on.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/row3off.png b/ise_display/Images/mvp-v1/set1/touched/row3off.png new file mode 100644 index 0000000..90ad169 Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/row3off.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/row3on.png b/ise_display/Images/mvp-v1/set1/touched/row3on.png new file mode 100644 index 0000000..4e4fbff Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/row3on.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/row4off.png b/ise_display/Images/mvp-v1/set1/touched/row4off.png new file mode 100644 index 0000000..95e3e00 Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/row4off.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/row4on.png b/ise_display/Images/mvp-v1/set1/touched/row4on.png new file mode 100644 index 0000000..3ebd51b Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/row4on.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/tempNeg-touched.png b/ise_display/Images/mvp-v1/set1/touched/tempNeg-touched.png new file mode 100644 index 0000000..c7578cd Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/tempNeg-touched.png differ diff --git a/ise_display/Images/mvp-v1/set1/touched/tempPlus-touched.png b/ise_display/Images/mvp-v1/set1/touched/tempPlus-touched.png new file mode 100644 index 0000000..dd3f092 Binary files /dev/null and b/ise_display/Images/mvp-v1/set1/touched/tempPlus-touched.png differ diff --git a/ise_display/mvp_display_v1.HMI b/ise_display/mvp_display_v1.HMI index b1cba51..64d9747 100644 Binary files a/ise_display/mvp_display_v1.HMI and b/ise_display/mvp_display_v1.HMI differ diff --git a/src/user_code.cpp b/src/user_code.cpp index 17ec3a4..eda0bce 100644 --- a/src/user_code.cpp +++ b/src/user_code.cpp @@ -282,7 +282,7 @@ void update_lcd_row1() elcd.print(master_state ? 10 : 9); elcd_send_stop_bit(); elcd.print("row1_master.pic2="); - elcd.print(master_state ? 10 : 9); + elcd.print(master_state ? 46 : 45); elcd_send_stop_bit(); bool lt1_state = pwm_get_state(ROW1_LIGHT1); @@ -291,16 +291,16 @@ void update_lcd_row1() // row1_lv1.Set_background_image_pic(lt1_state?6:5); // row1_lv2.Set_background_image_pic(lt2_state?8:7); elcd.print("row1_lv1.pic="); - elcd.print(lt1_state ? 6 : 5); + elcd.print(lt1_state ? 6 : 5); // 6 on ; 5 off elcd_send_stop_bit(); elcd.print("row1_lv2.pic="); elcd.print(lt2_state ? 8 : 7); elcd_send_stop_bit(); elcd.print("row1_lv1.pic2="); - elcd.print(lt1_state ? 6 : 5); + elcd.print(lt1_state ? 38 : 37); elcd_send_stop_bit(); elcd.print("row1_lv2.pic2="); - elcd.print(lt2_state ? 8 : 7); + elcd.print(lt2_state ? 40 : 39); elcd_send_stop_bit(); } @@ -313,7 +313,7 @@ void update_lcd_row2() elcd.print(master_state ? 12 : 11); elcd_send_stop_bit(); elcd.print("row2_master.pic2="); - elcd.print(master_state ? 12 : 11); + elcd.print(master_state ? 48 : 47); elcd_send_stop_bit(); bool lt1_state = pwm_get_state(ROW2_LIGHT1); bool lt2_state = pwm_get_state(ROW2_LIGHT2); @@ -327,10 +327,10 @@ void update_lcd_row2() elcd.print(lt2_state ? 8 : 7); elcd_send_stop_bit(); elcd.print("row2_lv1.pic2="); - elcd.print(lt1_state ? 6 : 5); + elcd.print(lt1_state ? 38 : 37); elcd_send_stop_bit(); elcd.print("row2_lv2.pic2="); - elcd.print(lt2_state ? 8 : 7); + elcd.print(lt2_state ? 40 : 39); elcd_send_stop_bit(); } @@ -343,7 +343,7 @@ void update_lcd_row3() elcd.print(master_state ? 14 : 13); elcd_send_stop_bit(); elcd.print("row3_master.pic2="); - elcd.print(master_state ? 14 : 13); + elcd.print(master_state ? 50 : 49); elcd_send_stop_bit(); bool lt1_state = pwm_get_state(ROW3_LIGHT1); bool lt2_state = pwm_get_state(ROW3_LIGHT2); @@ -357,10 +357,10 @@ void update_lcd_row3() elcd.print(lt2_state ? 8 : 7); elcd_send_stop_bit(); elcd.print("row3_lv1.pic2="); - elcd.print(lt1_state ? 6 : 5); + elcd.print(lt1_state ? 38 : 37); elcd_send_stop_bit(); elcd.print("row3_lv2.pic2="); - elcd.print(lt2_state ? 8 : 7); + elcd.print(lt2_state ? 40 : 39); elcd_send_stop_bit(); } @@ -373,7 +373,7 @@ void update_lcd_row4() elcd.print(master_state ? 16 : 15); elcd_send_stop_bit(); elcd.print("row4_master.pic2="); - elcd.print(master_state ? 16 : 15); + elcd.print(master_state ? 52 : 51); elcd_send_stop_bit(); bool lt1_state = pwm_get_state(ROW4_LIGHT1); bool lt2_state = pwm_get_state(ROW4_LIGHT2); @@ -387,10 +387,10 @@ void update_lcd_row4() elcd.print(lt2_state ? 8 : 7); elcd_send_stop_bit(); elcd.print("row4_lv1.pic2="); - elcd.print(lt1_state ? 6 : 5); + elcd.print(lt1_state ? 38 : 37); elcd_send_stop_bit(); elcd.print("row4_lv2.pic2="); - elcd.print(lt2_state ? 8 : 7); + elcd.print(lt2_state ? 40 : 39); elcd_send_stop_bit(); } @@ -404,7 +404,7 @@ void update_toggle_button() elcd.print(current_state ? 4 : 3); elcd_send_stop_bit(); elcd.print("light_toggle.pic2="); - elcd.print(current_state ? 4 : 3); + elcd.print(current_state ? 44 : 43); elcd_send_stop_bit(); } @@ -423,7 +423,7 @@ void update_lcd_ac() elcd_send_stop_bit(); elcd.print("fan.pic=18"); elcd_send_stop_bit(); - elcd.print("fan.pic2=18"); + elcd.print("fan.pic2=30"); elcd_send_stop_bit(); } else if (fan_speed == 1) @@ -432,7 +432,7 @@ void update_lcd_ac() elcd_send_stop_bit(); elcd.print("fan.pic=19"); elcd_send_stop_bit(); - elcd.print("fan.pic2=19"); + elcd.print("fan.pic2=31"); elcd_send_stop_bit(); } else if (fan_speed == 2) @@ -441,7 +441,7 @@ void update_lcd_ac() elcd_send_stop_bit(); elcd.print("fan.pic=21"); elcd_send_stop_bit(); - elcd.print("fan.pic2=21"); + elcd.print("fan.pic2=33"); elcd_send_stop_bit(); } else if (fan_speed == 3) @@ -450,7 +450,7 @@ void update_lcd_ac() elcd_send_stop_bit(); elcd.print("fan.pic=20"); elcd_send_stop_bit(); - elcd.print("fan.pic2=20"); + elcd.print("fan.pic2=32"); elcd_send_stop_bit(); } else @@ -459,7 +459,7 @@ void update_lcd_ac() elcd_send_stop_bit(); elcd.print("fan.pic=18"); elcd_send_stop_bit(); - elcd.print("fan.pic2=18"); + elcd.print("fan.pic2=30"); elcd_send_stop_bit(); } // update the mode cool is 22, fan mode is 24, for off the toggle button act as indicator @@ -472,11 +472,11 @@ void update_lcd_ac() elcd_send_stop_bit(); elcd.print("air_toggle.pic=2"); elcd_send_stop_bit(); - elcd.print("air_toggle.pic2=2"); + elcd.print("air_toggle.pic2=42"); elcd_send_stop_bit(); elcd.print("mode.pic=22"); elcd_send_stop_bit(); - elcd.print("mode.pic2=22"); + elcd.print("mode.pic2=34"); elcd_send_stop_bit(); } else if (ac_get_mode() == 2) @@ -484,11 +484,11 @@ void update_lcd_ac() elcd_send_stop_bit(); elcd.print("air_toggle.pic=2"); elcd_send_stop_bit(); - elcd.print("air_toggle.pic2=2"); + elcd.print("air_toggle.pic2=42"); elcd_send_stop_bit(); elcd.print("mode.pic=24"); elcd_send_stop_bit(); - elcd.print("mode.pic2=24"); + elcd.print("mode.pic2=36"); elcd_send_stop_bit(); } else if (ac_get_mode() == 0) @@ -496,13 +496,13 @@ void update_lcd_ac() elcd_send_stop_bit(); elcd.print("air_toggle.pic=1"); elcd_send_stop_bit(); - elcd.print("air_toggle.pic2=1"); + elcd.print("air_toggle.pic2=41"); if (user_acmode == 1) { elcd_send_stop_bit(); elcd.print("mode.pic=22"); elcd_send_stop_bit(); - elcd.print("mode.pic2=22"); + elcd.print("mode.pic2=34"); elcd_send_stop_bit(); } else @@ -510,7 +510,7 @@ void update_lcd_ac() elcd_send_stop_bit(); elcd.print("mode.pic=24"); elcd_send_stop_bit(); - elcd.print("mode.pic2=24"); + elcd.print("mode.pic2=36"); elcd_send_stop_bit(); } }