Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions BacNetDllforVc/Src/tsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ bool dll_offline_mode = false;
bool set_offline_mode(bool offline)
{
dll_offline_mode = offline;
return dll_offline_mode;
}

/** Check if the invoke ID has been made free by the Transaction State Machine.
Expand Down
1 change: 1 addition & 0 deletions ISP/BacnetMstp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,7 @@ int Bacnet_PrivateData_Deal(char * bacnet_apud_point, uint32_t len_value_type, b
default:
break;
}
return 0;
}


Expand Down
1 change: 1 addition & 0 deletions ISP/ComWriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1977,6 +1977,7 @@ int CComWriter::Fix_Tstat10_76800_baudrate()
}


return 0;
}

int CComWriter::UpdataDeviceInformation(int& ID)
Expand Down
1 change: 1 addition & 0 deletions ISP/FlashSN.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ unsigned long CFlashSN::Get_SerialNumber_From_Server(CString nipaddress,
//m_nHardWareVersion = nHardWareVersion;
//m_nProductModel=nProductID;

return 0;
}


Expand Down
1 change: 1 addition & 0 deletions ISP/global_function.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1185,6 +1185,7 @@ int mudbus_read_one(unsigned char device_var, unsigned short address, int retry_
return value;
}
}
return -2;
}


Expand Down
4 changes: 2 additions & 2 deletions Modbus Poll/global_struct.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ typedef struct T3_Register
int regID;
CString regName;
}T3Register;
typedef struct RegPoint{
struct RegPoint{
unsigned short Time_offset;
unsigned short Value_offset;
};
typedef struct Registers_Infor
struct Registers_Infor
{
vector<RegPoint> Reg_Point;
COLORREF Point_Color;
Expand Down
1 change: 1 addition & 0 deletions ModbusDllforVc/ModbusDllforVc/common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11065,6 +11065,7 @@ OUTPUT int write_ptp_data(unsigned char device_var, char *to_write, unsigned sho
}


return -1;
}
#endif

Expand Down
3 changes: 3 additions & 0 deletions T3000/BacnetScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ int write_webview_data(int device_instance,int panel_id,int nsel_serialnumber,in
}

delete temp_buffer;
return 0;
}

extern int save_button_click ;
Expand Down Expand Up @@ -638,6 +639,7 @@ bool BacnetScreen::run_old_graphic_screen()
{
h_read_screenlabel_thread = CreateThread(NULL, NULL, ReadScreenThreadfun, this, NULL, NULL);
}
return true;
}

LRESULT BacnetScreen::OnHotKey(WPARAM wParam,LPARAM lParam)
Expand Down Expand Up @@ -2243,6 +2245,7 @@ int Write_Webview_Data_Special(int panelid, UINT nserialnumber, int nscreenindex
//}


return 0;
}


Expand Down
1 change: 1 addition & 0 deletions T3000/BacnetWebView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,7 @@ HRESULT BacnetWebViewAppWindow::OnCreateCoreWebView2ControllerCompleted(

m_webView->Navigate(cacheBustUri.c_str());
}
return S_OK;
}
bool ParseString2Json(CString strIn, Json::Value& jsonOut)
{
Expand Down
2 changes: 1 addition & 1 deletion T3000/BuildingConfigration.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "../SQLiteDriver/CppSQLite3.h"
// CBuildingConfigration dialog

typedef struct Building_Config
struct Building_Config
{
bool b_selected;
int ID;
Expand Down
3 changes: 2 additions & 1 deletion T3000/CM5/BacNetProgram_transplant.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1630,7 +1630,7 @@ char* intervaltotext_old(char* textbuf, long seconds, unsigned minutes, unsigned
itoa(seconds, textbuffer, 10);

if (textbuf) strcpy(textbuf, buf);
return(buf);
return(textbuf);
}
/*******************intervaltotext ********************/

Expand Down Expand Up @@ -8380,6 +8380,7 @@ int get_key_name(int nfunction,CString &temp_cs)
(int)strlen((char*)ptr_panel.info[nfunction].name) + 1,
temp_cs.GetBuffer(MAX_PATH), MAX_PATH);
temp_cs.ReleaseBuffer();
return 1;
}

void init_info_table( void )
Expand Down
10 changes: 5 additions & 5 deletions T3000/CM5/ud_str.h
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,7 @@ typedef union
}reg;
}Str_Setting_Info;

typedef enum
enum
{
NOUSE, BACNET_MSTP,MAIN_MODBUS,MAIN_PTP,SUB_GSM,MAIN_ZIG,SUB_ZIG,SUB_MODBUS, RS232_METER, MSTP_MASTER,MAX_COM_TYPE
};
Expand Down Expand Up @@ -1244,20 +1244,20 @@ typedef struct
#pragma pack(push) //�������״̬
#pragma pack(1)

typedef struct str_viewportTransform
struct str_viewportTransform
{
unsigned short scale;
unsigned short x;
unsigned short y;
};
typedef struct str_t3Entry
struct str_t3Entry
{
unsigned char pid;
unsigned char ntype;
unsigned char index;
};

typedef struct str_settings
struct str_settings
{
unsigned char active;
char bgColor[JSON_COLOR_LENGTH];
Expand All @@ -1277,7 +1277,7 @@ typedef struct str_settings
};


typedef struct myitems
struct myitems
{
unsigned char ntranslate_count;// ���ƽṹ�� translate ����
unsigned char item_belong_screen;
Expand Down
2 changes: 1 addition & 1 deletion T3000/MainFrm.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ typedef struct _BUILDING_TAG
CString strConnectionType;
}Building_info;

typedef struct ext_info
struct ext_info
{
int virtual_device; // 0 default 1 verture device
//Corresponds to mini_type in Settings interface
Expand Down
1 change: 1 addition & 0 deletions T3000/ModbusToBacnetRouterDlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1214,4 +1214,5 @@ LRESULT CModbusToBacnetRouterDlg::Fresh_Input_Item(WPARAM wParam, LPARAM lParam)
{
m_vecMd2BT[Changed_Item].Update_On_Reconnect = New_CString;
}
return 0;
}
2 changes: 2 additions & 0 deletions T3000/ProductRegisterListView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1159,6 +1159,7 @@ int CProductRegisterListView::GetFunctionCode(CString FunctionName)
return 16;
}

return 0;
}

CString CProductRegisterListView::GetFunctionName(int FunctionCode)
Expand Down Expand Up @@ -1196,6 +1197,7 @@ CString CProductRegisterListView::GetFunctionName(int FunctionCode)
{
return m_vecVariableType[7];
}
return _T("");
}

int CProductRegisterListView::GetCaculateCode(CString CalName)
Expand Down
2 changes: 1 addition & 1 deletion T3000/WorkspaceBar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ void CWorkspaceBar::OnMouseMove(UINT nFlags, CPoint point)
// // GetDlgItem(IDC_EXPAND)->ModifyStyle(0,preStyle);
//}

CWorkspaceBar::OnMouseMove(nFlags, point);
CDockablePane::OnMouseMove(nFlags, point);
}
CWorkspaceBar::CWorkspaceBar()
{
Expand Down
14 changes: 7 additions & 7 deletions T3000/global_define.h
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ typedef struct
#pragma pack(pop)//�ָ�����״̬


typedef enum
enum
{
GET_SERIAL_NUMBER = 1,
DOWNLOAD_FILE = 2,
Expand Down Expand Up @@ -1302,7 +1302,7 @@ const int KEY_INSERT = 1020;
const int KEY_INSERT_CONTROL = 1021;


typedef enum
enum
{
PRODUCT_CM5 = 0, //10A + 8 D //10D //IN //OUT
BIG_MINIPANEL = 1, //32 A //12D 12A
Expand Down Expand Up @@ -2174,15 +2174,15 @@ enum sub_io_type


//�ӻ� ����� FF 55 ����� ����λ;
typedef enum
enum
{
SEND_MINIPANEL_INFO = 1,
GET_MINIPANEL_INFO = 2
};


//����Ӧ���FF 55 ���������λ;
typedef enum
enum
{
RECEIVE_DATA_LEBGTH_ERROR = 1,
RECEIVE_MINI_DATA = 2,
Expand Down Expand Up @@ -2469,7 +2469,7 @@ const CString Wifi_Module_Status[] =
_T("Wifi SSID Password Error")
};

typedef enum
enum
{
WIFI_NONE,
WIFI_NO_WIFI,
Expand Down Expand Up @@ -2676,13 +2676,13 @@ const CString Airlab_Unit_String[] =
_T("Lux")
};

typedef struct FloorInfo
struct FloorInfo
{
CString csName;
int xindex;
};

typedef struct RoomInfo
struct RoomInfo
{
FloorInfo nFloor;
CString csName;
Expand Down
2 changes: 1 addition & 1 deletion T3000/global_function.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7891,7 +7891,7 @@ char * intervaltotextfull(char *textbuf, long seconds , unsigned minutes , unsig
itoa(seconds,textbuffer,10) ;

if(textbuf) strcpy(textbuf, buf);
return( buf ) ;
return( textbuf ) ;
}
void LocalBacnetRejectHandler(BACNET_ADDRESS* src,uint8_t invoke_id,uint8_t reject_reason)
{
Expand Down
2 changes: 1 addition & 1 deletion T3000/schedule.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#define MAX_AR 16

#define MAX_INTERVALS_PER_DAY 4
typedef enum
enum
{
WR_DESCRIPTION ,
AR_DESCRIPTION ,
Expand Down