diff --git a/avr/devices/c03/main/main.asm b/avr/devices/c03/main/main.asm index 2ec46b2..579df2d 100644 --- a/avr/devices/c03/main/main.asm +++ b/avr/devices/c03/main/main.asm @@ -252,6 +252,27 @@ test: ldi xl, LOW(2000) ldi xh, HIGH(2000) bigcall OBJ_HandleSignal + + + + ldi zl, LOW(winSensorWatch2*2) + ldi zh, HIGH(winSensorWatch2*2) + ; set source + ldi r16, SENSORWATCH_SIGNAL_SETSOURCE + clr r17 + ldi xl, 9 ; node address + ldi xh, 1 ; value 0x01 (SI7021_TEMP) + bigcall OBJ_HandleSignal + + + ldi zl, LOW(winSensorWatch3*2) + ldi zh, HIGH(winSensorWatch3*2) + ; set source + ldi r16, SENSORWATCH_SIGNAL_SETSOURCE + clr r17 + ldi xl, 9 ; node address + ldi xh, 2 ; value 0x02 (SI7021_HUM) + bigcall OBJ_HandleSignal ret diff --git a/avr/devices/c03/main/testwin.asm b/avr/devices/c03/main/testwin.asm index 993bfaa..f06baa3 100644 --- a/avr/devices/c03/main/testwin.asm +++ b/avr/devices/c03/main/testwin.asm @@ -49,6 +49,31 @@ winSensorWatch1Image_ramdata: winSensorWatch1Value_ramdata: .byte VLABEL_SD_SIZE +winSensorWatch2_ramdata: + .byte SENSORWATCH_SD_SIZE + +winSensorWatch2Title_ramdata: + .byte WIDGET_SD_SIZE + +winSensorWatch2Image_ramdata: + .byte IMGVIEW_SD_SIZE + +winSensorWatch2Value_ramdata: + .byte VLABEL_SD_SIZE + + +winSensorWatch3_ramdata: + .byte SENSORWATCH_SD_SIZE + +winSensorWatch3Title_ramdata: + .byte WIDGET_SD_SIZE + +winSensorWatch3Image_ramdata: + .byte IMGVIEW_SD_SIZE + +winSensorWatch3Value_ramdata: + .byte VLABEL_SD_SIZE + @@ -194,7 +219,7 @@ testWinBody_signalmap: winSensorWatch1: ; OBJECT .db 0x55, 0xaa ; magic - .dw 0 ; next + .dw winSensorWatch2*2 ; next .dw testWinBody_flashdata*2 ; parent .dw winSensorWatch1Title*2 ; first child .dw 0 ; target @@ -317,6 +342,258 @@ winSensorWatch1Value_signalmap: +winSensorWatch2: + ; OBJECT + .db 0x55, 0xaa ; magic + .dw winSensorWatch3*2 ; next + .dw testWinBody_flashdata*2 ; parent + .dw winSensorWatch2Title*2 ; first child + .dw 0 ; target + .dw 0 ; selector (ony lower 8 bits used) + .dw winSensorWatch2_signalmap*2 ; signal map + ; WIDGET + .db (1<