Skip to content

Commit

Permalink
copyright notice cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
mvladic committed Sep 13, 2019
1 parent 590aa2a commit 6fc9b35
Show file tree
Hide file tree
Showing 234 changed files with 377 additions and 378 deletions.
2 changes: 1 addition & 1 deletion src/eez/apps/home/data.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ Home Application
* Copyright (C) 2018-present, Envox d.o.o.
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/home/home.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ Home Application
* Copyright (C) 2018-present, Envox d.o.o.
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/home/home.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ Home Application
* Copyright (C) 2018-present, Envox d.o.o.
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/home/touch_calibration.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* / mcu / sound.h
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/home/touch_calibration.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/board.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/calibration.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/calibration.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/channel.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* / mcu / sound.h
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/channel.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/channel_dispatcher.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/channel_dispatcher.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ PSU Firmware
* Copyright (C) 2016-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/conf.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/conf_advanced.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/conf_all.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
15 changes: 7 additions & 8 deletions src/eez/apps/psu/conf_channel.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand All @@ -18,21 +18,24 @@

#pragma once


#define CH_BOARD_REVISION_NONE 0

#define CH_BOARD_REVISION_DCP505_R1B3 1

#define CH_BOARD_REVISION_DCP405_R1B1 2
#define CH_BOARD_REVISION_DCP405_R2B5 3

#define CH_BOARD_REVISION_DCM220_R1B1 4

// OVP_DEFAULT_STATE, OVP_MIN_DELAY, OVP_DEFAULT_DELAY, OVP_MAX_DELAY

// OVP_DEFAULT_STATE, OVP_MIN_DELAY, OVP_DEFAULT_DELAY, OVP_MAX_DELAY
#define CH_PARAMS_OVP false, 0.0f, 0.005f, 10.0f

// U_MIN, U_DEF, U_MAX, U_MAX_CONF, U_MIN_STEP, U_DEF_STEP, U_MAX_STEP, U_CAL_VAL_MIN, U_CAL_VAL_MID, U_CAL_VAL_MAX, U_CURR_CAL
#define CH_PARAMS_U_50V 0.0f, 0.0f, 50.0f, 50.0f, 0.01f, 0.1f, 5.0f, 0.15f, 24.1f, 48.0f, 25.0f, CH_PARAMS_OVP

// U_MIN, U_DEF, U_MAX, U_MAX_CONF, U_MIN_STEP, U_DEF_STEP, U_MAX_STEP, U_CAL_VAL_MIN, U_CAL_VAL_MID, U_CAL_VAL_MAX, U_CURR_CAL
#define CH_PARAMS_U_40V 0.0f, 0.0f, 40.0f, 40.0f, 0.01f, 0.1f, 5.0f, 0.15f, 20.0f, 38.0f, 20.0f, CH_PARAMS_OVP

// U_MIN, U_DEF, U_MAX, U_MAX_CONF, U_MIN_STEP, U_DEF_STEP, U_MAX_STEP, U_CAL_VAL_MIN, U_CAL_VAL_MID, U_CAL_VAL_MAX, U_CURR_CAL
#define CH_PARAMS_U_20V 0.0f, 0.0f, 20.0f, 20.0f, 0.01f, 0.1f, 5.0f, 0.15f, 10.0f, 18.0f, 10.0f, CH_PARAMS_OVP

Expand All @@ -41,7 +44,6 @@

// I_MIN, I_DEF, I_MAX, I_MAX_CONF, I_MIN_STEP, I_DEF_STEP, I_MAX_STEP, I_CAL_VAL_MIN, I_CAL_VAL_MID, I_CAL_VAL_MAX, I_VOLT_CAL
#define CH_PARAMS_I_5A 0.0f, 0.0f, 5.0f, 5.0f, 0.01f, 0.01f, 1.0f, 0.05f, 2.425f, 4.8f, 0.1f, CH_PARAMS_OCP

// I_MIN, I_DEF, I_MAX, I_MAX_CONF, I_MIN_STEP, I_DEF_STEP, I_MAX_STEP, I_CAL_VAL_MIN, I_CAL_VAL_MID, I_CAL_VAL_MAX, I_VOLT_CAL
#define CH_PARAMS_I_4A 0.0f, 0.0f, 4.0f, 4.0f, 0.01f, 0.01f, 1.0f, 0.05f, 1.95f, 3.8f, 0.1f, CH_PARAMS_OCP

Expand All @@ -50,12 +52,9 @@

// OPP_DEFAULT_STATE, OPP_MIN_LEVEL, SOA_VIN, OPP_DEFAULT_LEVEL, SOA_PREG_CURR, OPP_MAX_LEVEL, SOA_POSTREG_PTOT, PTOT, U_RESOLUTION, I_RESOLUTION, I_LOW_RESOLUTION, P_RESOLUTION
#define CH_PARAMS_NONE CH_PARAMS_U_50V, CH_PARAMS_I_5A, true, CH_PARAMS_OPP_DELAY, 0.0f, 160.0f, 155.0f, 58.0f, 5.0f, 25.0f, 155.0f, 0, 0, 0, 0

// OPP_DEFAULT_STATE, OPP_MIN_LEVEL, SOA_VIN, OPP_DEFAULT_LEVEL, SOA_PREG_CURR, OPP_MAX_LEVEL, SOA_POSTREG_PTOT, PTOT, U_RESOLUTION, I_RESOLUTION, I_LOW_RESOLUTION, P_RESOLUTION
#define CH_PARAMS_50V_5A CH_PARAMS_U_50V, CH_PARAMS_I_5A, true, CH_PARAMS_OPP_DELAY, 0.0f, 160.0f, 155.0f, 58.0f, 5.0f, 25.0f, 155.0f, 0.005f, 0.0005f, 0.000005f, 0.001f

// OPP_DEFAULT_STATE, OPP_MIN_LEVEL, SOA_VIN, OPP_DEFAULT_LEVEL, SOA_PREG_CURR, OPP_MAX_LEVEL, SOA_POSTREG_PTOT, PTOT, U_RESOLUTION, I_RESOLUTION, I_LOW_RESOLUTION, P_RESOLUTION
#define CH_PARAMS_40V_5A CH_PARAMS_U_40V, CH_PARAMS_I_5A, true, CH_PARAMS_OPP_DELAY, 0.0f, 160.0f, 155.0f, 58.0f, 5.0f, 25.0f, 155.0f, 0.005f, 0.0005f, 0.000005f, 0.001f

// OPP_DEFAULT_STATE, OPP_MIN_LEVEL, SOA_VIN, OPP_DEFAULT_LEVEL, SOA_PREG_CURR, OPP_MAX_LEVEL, SOA_POSTREG_PTOT, PTOT, U_RESOLUTION, I_RESOLUTION, I_LOW_RESOLUTION, P_RESOLUTION
#define CH_PARAMS_20V_4A CH_PARAMS_U_20V, CH_PARAMS_I_4A, true, CH_PARAMS_OPP_DELAY, 0.0f, 70.0f, 80.0f, 58.0f, 5.0f, 25.0f, 80.0f, 0.01f, 0.02f, 0, 0.001f
4 changes: 2 additions & 2 deletions src/eez/apps/psu/conf_user.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ PSU Firmware
* Copyright (C) 2015 Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/datetime.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/datetime.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/debug.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/debug.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/devices.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ PSU Firmware
* Copyright (C) 2016-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/devices.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ PSU Firmware
* Copyright (C) 2016-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/eeprom.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/eeprom.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/ethernet.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/ethernet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/event_queue.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* / mcu / sound.h
* EEZ PSU Firmware
* Copyright (C) 2016-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/event_queue.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ PSU Firmware
* Copyright (C) 2016-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/fan.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ PSU Firmware
* Copyright (C) 2016-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/gui/calibration.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* / mcu / sound.h
* EEZ PSU Firmware
* Copyright (C) 2016-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/gui/calibration.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ PSU Firmware
* Copyright (C) 2016-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/gui/edit_mode_slider.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/eez/apps/psu/gui/edit_mode_slider.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* EEZ PSU Firmware
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/gui/keypad.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* / mcu / sound.h
* EEZ PSU Firmware
* Copyright (C) 2016-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/gui/keypad.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ PSU Firmware
* Copyright (C) 2016-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/gui/numeric_keypad.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* / mcu / sound.h
* EEZ PSU Firmware
* Copyright (C) 2016-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/gui/numeric_keypad.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ PSU Firmware
* Copyright (C) 2016-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/gui/page_ch_settings_adv.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ PSU Firmware
* Copyright (C) 2016-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/gui/page_ch_settings_adv.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ PSU Firmware
* Copyright (C) 2016-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/gui/page_ch_settings_protection.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ PSU Firmware
* Copyright (C) 2016-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/gui/page_ch_settings_protection.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ PSU Firmware
* Copyright (C) 2016-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/gui/page_ch_settings_trigger.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ PSU Firmware
* Copyright (C) 2017-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions src/eez/apps/psu/gui/page_ch_settings_trigger.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EEZ PSU Firmware
* Copyright (C) 2017-present, Envox d.o.o.
* EEZ Modular Firmware
* Copyright (C) 2015-present, Envox d.o.o.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Loading

0 comments on commit 6fc9b35

Please sign in to comment.