[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/imote2/tools/src/iMoteTerm/USB/rev1 iMoteConsole.rc, 1.1, 1.2

Robbie Adler radler at users.sourceforge.net
Mon Jun 11 11:34:10 PDT 2007


Update of /cvsroot/tinyos/tinyos-1.x/contrib/imote2/tools/src/iMoteTerm/USB/rev1
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22698

Modified Files:
	iMoteConsole.rc 
Log Message:
correct missing resource file

Index: iMoteConsole.rc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/imote2/tools/src/iMoteTerm/USB/rev1/iMoteConsole.rc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** iMoteConsole.rc	11 Jun 2007 17:31:17 -0000	1.1
--- iMoteConsole.rc	11 Jun 2007 18:34:07 -0000	1.2
***************
*** 81,93 ****
  FONT 8, "MS Sans Serif", 0, 0, 0x0
  BEGIN
!     LTEXT           "iMoteConsole Version 1.1b",IDC_STATIC_ABOUT_VER,21,19,119,8,SS_NOPREFIX,WS_EX_TRANSPARENT
!     LTEXT           "Copyright (C) 2002, 2005",IDC_STATIC_ABOUT_COPY,21,37,119,8
      DEFPUSHBUTTON   "OK",IDOK,178,7,50,14,WS_GROUP
!     LTEXT           "Developed by Robbie Adler, Josh Herbach",IDC_STATIC_ABOUT_DEV,21,28,142,9
!     ICON            IDI_IMOTE,IDC_STATIC_ABOUT_IMOTE,5,1,21,20,0,WS_EX_TRANSPARENT
  END
  
  IDD_IMOTECONSOLE_DIALOG DIALOGEX 0, 0, 320, 52
! STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
  EXSTYLE WS_EX_APPWINDOW
  CAPTION "iMoteConsole"
--- 81,98 ----
  FONT 8, "MS Sans Serif", 0, 0, 0x0
  BEGIN
!     LTEXT           "iMoteConsole Version 1.1b",IDC_STATIC_ABOUT_VER,21,19,
!                     119,8,SS_NOPREFIX,WS_EX_TRANSPARENT
!     LTEXT           "Copyright (C) 2002, 2005",IDC_STATIC_ABOUT_COPY,21,37,
!                     119,8
      DEFPUSHBUTTON   "OK",IDOK,178,7,50,14,WS_GROUP
!     LTEXT           "Developed by Robbie Adler, Josh Herbach",
!                     IDC_STATIC_ABOUT_DEV,21,28,142,9
!     ICON            IDI_IMOTE,IDC_STATIC_ABOUT_IMOTE,5,1,21,20,0,
!                     WS_EX_TRANSPARENT
  END
  
  IDD_IMOTECONSOLE_DIALOG DIALOGEX 0, 0, 320, 52
! STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | 
!     WS_CAPTION | WS_SYSMENU
  EXSTYLE WS_EX_APPWINDOW
  CAPTION "iMoteConsole"
***************
*** 97,115 ****
      DEFPUSHBUTTON   "Close",IDOK,263,6,50,14
      LTEXT           "Selected iMote 2",IDC_STATIC_DISPLAYED_IMOTE,7,6,98,9
!     COMBOBOX        IDC_COMBO_DISPLAYED_IMOTE,7,18,107,56,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
      LTEXT           "COM 1",IDC_STATIC_COM_NUM,117,18,34,11
!     LTEXT           "Detached",IDC_STATIC_DETACHED,117,29,49,10,NOT WS_VISIBLE
!     PUSHBUTTON      "View Buffer In Window",IDC_BUTTON_WINDOW_BUFFER,179,6,79,15
  END
  
  IDD_PP_CONFIGURATION DIALOGEX 0, 0, 254, 172
! STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Configuration"
  FONT 8, "MS Shell Dlg", 400, 0, 0x1
  BEGIN
!     GROUPBOX        "Channel Assignment",IDC_STATIC_ASSIGNMENTBOX,16,76,222,81
      GROUPBOX        "COM Port Configuration",-1,14,17,92,50
      PUSHBUTTON      "Settings",IDC_BUTTON_SETTINGS,24,43,50,14
!     COMBOBOX        IDC_COMBO_COMPORT,23,26,48,65,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
      LTEXT           "# of Channels",-1,149,30,47,8
      EDITTEXT        IDC_EDIT1,196,28,40,14,ES_AUTOHSCROLL
--- 102,126 ----
      DEFPUSHBUTTON   "Close",IDOK,263,6,50,14
      LTEXT           "Selected iMote 2",IDC_STATIC_DISPLAYED_IMOTE,7,6,98,9
!     COMBOBOX        IDC_COMBO_DISPLAYED_IMOTE,7,18,107,56,CBS_DROPDOWNLIST | 
!                     CBS_SORT | WS_VSCROLL | WS_TABSTOP
      LTEXT           "COM 1",IDC_STATIC_COM_NUM,117,18,34,11
!     LTEXT           "Detached",IDC_STATIC_DETACHED,117,29,49,10,NOT 
!                     WS_VISIBLE
!     PUSHBUTTON      "View Buffer In Window",IDC_BUTTON_WINDOW_BUFFER,179,6,
!                     79,15
  END
  
  IDD_PP_CONFIGURATION DIALOGEX 0, 0, 254, 172
! STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
!     WS_SYSMENU
  CAPTION "Configuration"
  FONT 8, "MS Shell Dlg", 400, 0, 0x1
  BEGIN
!     GROUPBOX        "Channel Assignment",IDC_STATIC_ASSIGNMENTBOX,16,76,222,
!                     81
      GROUPBOX        "COM Port Configuration",-1,14,17,92,50
      PUSHBUTTON      "Settings",IDC_BUTTON_SETTINGS,24,43,50,14
!     COMBOBOX        IDC_COMBO_COMPORT,23,26,48,65,CBS_DROPDOWN | CBS_SORT | 
!                     WS_VSCROLL | WS_TABSTOP
      LTEXT           "# of Channels",-1,149,30,47,8
      EDITTEXT        IDC_EDIT1,196,28,40,14,ES_AUTOHSCROLL
***************
*** 117,121 ****
  
  IDD_PP_DATAFORMAT DIALOGEX 0, 0, 254, 172
! STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Data Format"
  FONT 8, "MS Shell Dlg", 400, 0, 0x1
--- 128,133 ----
  
  IDD_PP_DATAFORMAT DIALOGEX 0, 0, 254, 172
! STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
!     WS_SYSMENU
  CAPTION "Data Format"
  FONT 8, "MS Shell Dlg", 400, 0, 0x1
***************
*** 124,137 ****
      GROUPBOX        "Attributes",IDC_STATIC,14,17,224,87
      LTEXT           "Value",IDC_STATIC,186,26,47,8
!     LISTBOX         IDC_LIST1,34,117,111,40,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
      PUSHBUTTON      "Move Up",IDC_BUTTON1,171,117,50,14
      PUSHBUTTON      "Move Down",IDC_BUTTON2,172,135,50,14
!     CONTROL         "Magiic Number",IDC_CHECK_MAGICNUMBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,35,35,65,10
!     CONTROL         "Fragment Length",IDC_CHECK_FRAGMENTLENGTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,35,67,71,10
!     CONTROL         "Channel ID",IDC_CHECK_CHANNELID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,35,49,51,10
!     CONTROL         "16 bit data",IDC_CHECK_16BITDATA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,35,86,51,10
!     COMBOBOX        IDC_COMBO_MAGICNUMBER,113,34,48,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
!     COMBOBOX        IDC_COMBO_CHANNELID,113,54,48,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
!     COMBOBOX        IDC_COMBO_FRAGMENTLENGTH,113,68,48,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
      LTEXT           "Length (bytes)",IDC_STATIC,119,24,47,8
      EDITTEXT        IDC_EDIT_MAGICNUMBER_VALUE,172,35,40,14,ES_AUTOHSCROLL
--- 136,157 ----
      GROUPBOX        "Attributes",IDC_STATIC,14,17,224,87
      LTEXT           "Value",IDC_STATIC,186,26,47,8
!     LISTBOX         IDC_LIST1,34,117,111,40,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
!                     WS_VSCROLL | WS_TABSTOP
      PUSHBUTTON      "Move Up",IDC_BUTTON1,171,117,50,14
      PUSHBUTTON      "Move Down",IDC_BUTTON2,172,135,50,14
!     CONTROL         "Magiic Number",IDC_CHECK_MAGICNUMBER,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,35,35,65,10
!     CONTROL         "Fragment Length",IDC_CHECK_FRAGMENTLENGTH,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,35,67,71,10
!     CONTROL         "Channel ID",IDC_CHECK_CHANNELID,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,35,49,51,10
!     CONTROL         "16 bit data",IDC_CHECK_16BITDATA,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,35,86,51,10
!     COMBOBOX        IDC_COMBO_MAGICNUMBER,113,34,48,30,CBS_DROPDOWN | 
!                     CBS_SORT | WS_VSCROLL | WS_TABSTOP
!     COMBOBOX        IDC_COMBO_CHANNELID,113,54,48,30,CBS_DROPDOWN | CBS_SORT | 
!                     WS_VSCROLL | WS_TABSTOP
!     COMBOBOX        IDC_COMBO_FRAGMENTLENGTH,113,68,48,30,CBS_DROPDOWN | 
!                     CBS_SORT | WS_VSCROLL | WS_TABSTOP
      LTEXT           "Length (bytes)",IDC_STATIC,119,24,47,8
      EDITTEXT        IDC_EDIT_MAGICNUMBER_VALUE,172,35,40,14,ES_AUTOHSCROLL
***************
*** 139,143 ****
  
  IDD_PP_SAVESETTINGS DIALOGEX 0, 0, 254, 172
! STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Save Settings"
  FONT 8, "MS Shell Dlg", 400, 0, 0x1
--- 159,164 ----
  
  IDD_PP_SAVESETTINGS DIALOGEX 0, 0, 254, 172
! STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
!     WS_SYSMENU
  CAPTION "Save Settings"
  FONT 8, "MS Shell Dlg", 400, 0, 0x1
***************
*** 146,150 ****
      GROUPBOX        "COM Port Configuration",IDC_STATIC,14,17,92,50
      PUSHBUTTON      "Settings",IDC_BUTTON_SETTINGS,24,43,50,14
!     COMBOBOX        IDC_COMBO_COMPORT,23,26,48,65,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
      LTEXT           "# of Channels",IDC_STATIC,149,30,47,8
      EDITTEXT        IDC_EDIT1,196,28,40,14,ES_AUTOHSCROLL
--- 167,172 ----
      GROUPBOX        "COM Port Configuration",IDC_STATIC,14,17,92,50
      PUSHBUTTON      "Settings",IDC_BUTTON_SETTINGS,24,43,50,14
!     COMBOBOX        IDC_COMBO_COMPORT,23,26,48,65,CBS_DROPDOWN | CBS_SORT | 
!                     WS_VSCROLL | WS_TABSTOP
      LTEXT           "# of Channels",IDC_STATIC,149,30,47,8
      EDITTEXT        IDC_EDIT1,196,28,40,14,ES_AUTOHSCROLL
***************
*** 152,156 ****
  
  IDD_DIALOG_MAPPINGFUNCTION DIALOGEX 0, 0, 170, 62
! STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Set Mapping Function"
  FONT 8, "MS Shell Dlg", 400, 0, 0x1
--- 174,179 ----
  
  IDD_DIALOG_MAPPINGFUNCTION DIALOGEX 0, 0, 170, 62
! STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
!     WS_SYSMENU
  CAPTION "Set Mapping Function"
  FONT 8, "MS Shell Dlg", 400, 0, 0x1
***************
*** 165,169 ****
  
  IDD_IMOTETERMINAL DIALOGEX 0, 0, 320, 172
! STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
  MENU IDR_MENU_TERM
  FONT 8, "MS Sans Serif", 0, 0, 0x0
--- 188,193 ----
  
  IDD_IMOTETERMINAL DIALOGEX 0, 0, 320, 172
! STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | 
!     WS_SYSMENU | WS_THICKFRAME
  MENU IDR_MENU_TERM
  FONT 8, "MS Sans Serif", 0, 0, 0x0
***************
*** 171,203 ****
      PUSHBUTTON      "Clear Buffer",IDC_BUTTON_TERM_CLEAR_BUFFER,7,25,50,14
      PUSHBUTTON      "Connect",IDC_BUTTON_TERM_CONNECT,7,7,50,14
      LTEXT           "COM 1",IDC_STATIC_TERM_COM_NUM,7,92,34,11
!     LTEXT           "Detached",IDC_STATIC_TERM_DETACHED,7,103,49,10,NOT WS_VISIBLE
  END
  
  IDD_IMOTESTATUS DIALOGEX 0, 0, 179, 59
! STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "% Complete"
  FONT 8, "MS Shell Dlg", 400, 0, 0x1
  BEGIN
!     CONTROL         "",IDC_PROGRESS_STATUS_VERIFY,"msctls_progress32",WS_BORDER,7,41,165,11
      LTEXT           "0 / 0 Burned",IDC_STATIC_STATUS_BNUMBER,7,7,143,10
      LTEXT           "0 / 0 Verified",IDC_STATIC_STATUS_VNUMBER,7,31,144,9
!     CONTROL         "",IDC_PROGRESS_STATUS_BURN,"msctls_progress32",WS_BORDER,7,18,165,11
  END
  
  IDD_IMOTEBATCH DIALOGEX 0, 0, 276, 249
! STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Batch Program"
  MENU IDR_MENU_BATCH
  FONT 8, "MS Shell Dlg", 400, 0, 0x1
  BEGIN
!     CONTROL         "",IDC_PROGRESS_BATCH_VERIFY,"msctls_progress32",WS_BORDER,7,231,262,11
      LTEXT           "0 / 0 Burned",IDC_STATIC_BATCH_BNUMBER,7,196,143,10
      LTEXT           "0 / 0 Verified",IDC_STATIC_BATCH_VNUMBER,7,220,144,9
!     CONTROL         "",IDC_PROGRESS_BATCH_BURN,"msctls_progress32",WS_BORDER,7,207,262,11
!     CONTROL         "",IDC_RICHEDIT_BATCH_FILE,"RichEdit20A",ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP,62,7,207,14
      PUSHBUTTON      "Burn",IDC_BUTTON_BATCH_BURN,7,7,50,14
      LTEXT           "0 / 0 Total",IDC_STATIC_BATCH_TNUMBER,7,173,143,10
!     CONTROL         "",IDC_PROGRESS_BATCH_TOTAL,"msctls_progress32",WS_BORDER,7,183,262,11
      PUSHBUTTON      "Abort",IDC_BUTTON_BATCH_ABORT,7,23,50,14,NOT WS_VISIBLE
  END
--- 195,248 ----
      PUSHBUTTON      "Clear Buffer",IDC_BUTTON_TERM_CLEAR_BUFFER,7,25,50,14
      PUSHBUTTON      "Connect",IDC_BUTTON_TERM_CONNECT,7,7,50,14
+     PUSHBUTTON      "Send Break",IDC_BUTTON_TERM_SENDBREAK,7,74,50,14
      LTEXT           "COM 1",IDC_STATIC_TERM_COM_NUM,7,92,34,11
!     LTEXT           "Detached",IDC_STATIC_TERM_DETACHED,7,103,49,10,NOT 
!                     WS_VISIBLE
!     PUSHBUTTON      "Send File",IDC_BUTTON_TERM_SENDFILE,7,43,50,14
!     CONTROL         "Text file",IDC_CHECK_TERM_TEXT_FILE,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,7,60,41,10
!     CONTROL         "",IDC_RICHEDIT_TERM_FILE,"RichEdit20A",ES_AUTOHSCROLL | 
!                     WS_BORDER | WS_TABSTOP,66,7,247,14
!     CONTROL         "",IDC_RICHEDIT_TERM_ADDR,"RichEdit20A",ES_AUTOHSCROLL | 
!                     NOT WS_VISIBLE | WS_BORDER | WS_TABSTOP,149,24,164,14
!     LTEXT           "Write / Execute Address",IDC_STATIC_TERM_ADDR,68,26,79,
!                     10,NOT WS_VISIBLE
!     PUSHBUTTON      "Execute",IDC_BUTTON_TERM_EXECUTE,7,74,50,14,NOT 
!                     WS_VISIBLE
  END
  
  IDD_IMOTESTATUS DIALOGEX 0, 0, 179, 59
! STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | 
!     WS_SYSMENU
  CAPTION "% Complete"
  FONT 8, "MS Shell Dlg", 400, 0, 0x1
  BEGIN
!     CONTROL         "",IDC_PROGRESS_STATUS_VERIFY,"msctls_progress32",
!                     WS_BORDER,7,41,165,11
      LTEXT           "0 / 0 Burned",IDC_STATIC_STATUS_BNUMBER,7,7,143,10
      LTEXT           "0 / 0 Verified",IDC_STATIC_STATUS_VNUMBER,7,31,144,9
!     CONTROL         "",IDC_PROGRESS_STATUS_BURN,"msctls_progress32",
!                     WS_BORDER,7,18,165,11
  END
  
  IDD_IMOTEBATCH DIALOGEX 0, 0, 276, 249
! STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | 
!     WS_SYSMENU
  CAPTION "Batch Program"
  MENU IDR_MENU_BATCH
  FONT 8, "MS Shell Dlg", 400, 0, 0x1
  BEGIN
!     CONTROL         "",IDC_PROGRESS_BATCH_VERIFY,"msctls_progress32",
!                     WS_BORDER,7,231,262,11
      LTEXT           "0 / 0 Burned",IDC_STATIC_BATCH_BNUMBER,7,196,143,10
      LTEXT           "0 / 0 Verified",IDC_STATIC_BATCH_VNUMBER,7,220,144,9
!     CONTROL         "",IDC_PROGRESS_BATCH_BURN,"msctls_progress32",WS_BORDER,
!                     7,207,262,11
!     CONTROL         "",IDC_RICHEDIT_BATCH_FILE,"RichEdit20A",ES_AUTOHSCROLL | 
!                     WS_BORDER | WS_TABSTOP,62,7,207,14
      PUSHBUTTON      "Burn",IDC_BUTTON_BATCH_BURN,7,7,50,14
      LTEXT           "0 / 0 Total",IDC_STATIC_BATCH_TNUMBER,7,173,143,10
!     CONTROL         "",IDC_PROGRESS_BATCH_TOTAL,"msctls_progress32",
!                     WS_BORDER,7,183,262,11
      PUSHBUTTON      "Abort",IDC_BUTTON_BATCH_ABORT,7,23,50,14,NOT WS_VISIBLE
  END
***************
*** 423,427 ****
      "O",            ID_TERM_FILE_OPENFILE,  VIRTKEY, CONTROL, NOINVERT
      "S",            ID_TERM_FILE_SAVE,      VIRTKEY, CONTROL, NOINVERT
!     "S",            ID_TERM_FILE_SAVEAS,    VIRTKEY, SHIFT, CONTROL, NOINVERT
      "C",            ID_TERM_EDIT_COPY,      VIRTKEY, CONTROL, NOINVERT
  END
--- 468,473 ----
      "O",            ID_TERM_FILE_OPENFILE,  VIRTKEY, CONTROL, NOINVERT
      "S",            ID_TERM_FILE_SAVE,      VIRTKEY, CONTROL, NOINVERT
!     "S",            ID_TERM_FILE_SAVEAS,    VIRTKEY, SHIFT, CONTROL, 
!                                                     NOINVERT
      "C",            ID_TERM_EDIT_COPY,      VIRTKEY, CONTROL, NOINVERT
  END



More information about the Tinyos-contrib-commits mailing list